Compare commits

..

No commits in common. "95cd9c247ea62453e354c13c474713110ceba20e" and "44a21426535aaf7966c967e958213edd317d137e" have entirely different histories.

5 changed files with 102 additions and 117 deletions

View File

@ -9,11 +9,11 @@
]
},
"locked": {
"lastModified": 1690228878,
"narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
"lastModified": 1689334118,
"narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=",
"owner": "ryantm",
"repo": "agenix",
"rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
"rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143",
"type": "github"
},
"original": {
@ -25,11 +25,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1691983650,
"narHash": "sha256-oA1bIpPc27Kk89n3JGpni7RkcIDRVAsTjUfjRHbKS24=",
"lastModified": 1689799111,
"narHash": "sha256-JGucBOBTSYBapMrI7GCMAqTFaT1O7Kqw0S3uBtFawIo=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "915f39959c7e077f00477e6ce34a0f9f9e3e7c6b",
"rev": "6151d664acced94364e7e3a075e6ac3ca555ef48",
"type": "github"
},
"original": {
@ -133,11 +133,11 @@
]
},
"locked": {
"lastModified": 1690933134,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
"lastModified": 1688466019,
"narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
"rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
"type": "github"
},
"original": {
@ -206,7 +206,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1685518550,
@ -224,7 +224,7 @@
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1685518550,
@ -363,11 +363,11 @@
]
},
"locked": {
"lastModified": 1692131549,
"narHash": "sha256-MFjI8NL63/6HjMZpvJgnB/Pgg2dht22t45jOYtipZig=",
"lastModified": 1689875525,
"narHash": "sha256-fgUrFH3bMZ6R7qgBTfuTRGlkZXIkdyjndl6ZbExbjE8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "75cfe974e2ca05a61b66768674032b4c079e55d4",
"rev": "1443abd2696ec6bd6fb9701e6c26b277a27b4a3e",
"type": "github"
},
"original": {
@ -381,11 +381,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1690635289,
"narHash": "sha256-ec77Yf7mqusmGkxrmYXEG4D0DqEcNRA3vFextWVQOVA=",
"lastModified": 1688849364,
"narHash": "sha256-gW4x5YiCWFlckFiaLZo+RWJa1IyQ2Cx4jTrJzNy1OzQ=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "bef073cff65917ba2d888aa4dc39bd9868e2b0a4",
"rev": "3126196e7ed609e7c427a39dc126ea067de62a65",
"type": "github"
},
"original": {
@ -398,16 +398,15 @@
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_2",
"systems": "systems_2",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1692182360,
"narHash": "sha256-FSJEeAQj0viz52+GE774GiOOtU0X2B2KgXnRCgogSaU=",
"lastModified": 1689879667,
"narHash": "sha256-g6XQ1slkxXw1kddaUKBwvYktIPJczSbZVoe4EzjNjD8=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "78fa8adadc146a7efeebf63438c1140662484fba",
"rev": "f864b15427b363443e767eb5e78f5dc9603c49f3",
"type": "github"
},
"original": {
@ -421,18 +420,14 @@
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"lastModified": 1684265364,
"narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"type": "github"
},
"original": {
@ -446,11 +441,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1691060455,
"narHash": "sha256-V5ulB9CkGh1ghiC4BKvRdoYKZzpaiOKzAOUmJIFkgM0=",
"lastModified": 1689547456,
"narHash": "sha256-jZQ377LqcazitvH2fVXKiL8kvmpGT3fuqev+yQqvuRw=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "e498c438b1e16dcf32ecb3030b20b83f7ed9ff6d",
"rev": "ac5f7b038d5ac589d32f5ae18f9745bfe5200618",
"type": "github"
},
"original": {
@ -477,11 +472,11 @@
},
"master": {
"locked": {
"lastModified": 1692198797,
"narHash": "sha256-4MwKoXIBfNI85zZ/tHyLT+M7sF2Zb0XoyhdXtlM6g2c=",
"lastModified": 1689880801,
"narHash": "sha256-jWeQSVczGNRNs48DWiAwb6ojKXb+woqoXoVsA1KwdUM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c85be71df497312de66b65df8d7ad7b5c0c81d04",
"rev": "ebaae879a74f772ecc827d264e37960087a4b182",
"type": "github"
},
"original": {
@ -519,11 +514,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1692141167,
"narHash": "sha256-1My5JBKfHupN9D86eeX8JFr2Wk03qWJObk73NC1/x2s=",
"lastModified": 1689785735,
"narHash": "sha256-QdjWbe4oNjIazmOrbJ9u5GadaqTV44RiYbiZoLgNKC8=",
"owner": "neovim",
"repo": "neovim",
"rev": "f92bda1dad462de81ec92134dfa9ba637edc7bb7",
"rev": "86ce3878d662c1dbfec61a5ad8e7c16c4283ed5c",
"type": "github"
},
"original": {
@ -542,11 +537,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1692144319,
"narHash": "sha256-sJ7KT+dfLEQbsNI2G+ZLKQ0tIS72roMv+xjC+0bTS9k=",
"lastModified": 1689811489,
"narHash": "sha256-rQ1gnq+ApoowEic21nIYIeQ0Qibb3IEEtwv0LgNIYDc=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "3632032784ed4a7f761a61a3337f2e1d61210eae",
"rev": "65f2e8da89ba400e7bbad6fe2f51af0ed9f7e968",
"type": "github"
},
"original": {
@ -566,11 +561,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1691372739,
"narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=",
"lastModified": 1689759503,
"narHash": "sha256-wFrcae6V58hIlDW+7NDoUXzXBmsU7W/k3V1KIePcwRA=",
"owner": "oxalica",
"repo": "nil",
"rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b",
"rev": "59bcad0b13b5d77668c0c125fef71d7b41406d7a",
"type": "github"
},
"original": {
@ -670,11 +665,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1691654369,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"lastModified": 1688500189,
"narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"rev": "78419edadf0fabbe5618643bd850b2f2198ed060",
"type": "github"
},
"original": {
@ -718,11 +713,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1692067901,
"narHash": "sha256-kq8Pf/nmlXECDWMkQSRGQkjWsA6G0pjzZkfUEaTmXJE=",
"lastModified": 1689752456,
"narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ea95c0917609e5c48023cc7c6141bea2fdf13970",
"rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
"type": "github"
},
"original": {
@ -734,11 +729,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1692128808,
"narHash": "sha256-Di1Zm/P042NuwThMiZNrtmaAjd4Tm2qBOKHX7xUOfMk=",
"lastModified": 1689752456,
"narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4ed9856be002a730234a1a1ed9dcd9dd10cbdb40",
"rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
"type": "github"
},
"original": {
@ -796,11 +791,11 @@
"nvim-treesitter-textsubjects": {
"flake": false,
"locked": {
"lastModified": 1691029837,
"narHash": "sha256-O57pMYtDR713ItAeUfdkcl2IfBLQcLEa2sb+AXhaqDs=",
"lastModified": 1676144693,
"narHash": "sha256-4jb9v0xpO17wp85dzojKUQ6hUdNBx3T2tB4fSWoANus=",
"owner": "RRethy",
"repo": "nvim-treesitter-textsubjects",
"rev": "df75fcec548014f158cda6498ac38c4622c221e1",
"rev": "b913508f503527ff540f7fe2dcf1bf1d1f259887",
"type": "github"
},
"original": {
@ -818,11 +813,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1691747570,
"narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=",
"lastModified": 1689668210,
"narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a",
"rev": "eb433bff05b285258be76513add6f6c57b441775",
"type": "github"
},
"original": {
@ -834,11 +829,11 @@
"rofi-wayland": {
"flake": false,
"locked": {
"lastModified": 1690115482,
"narHash": "sha256-fUneGsSWpi8zYrTbF14e/fuf0vaXF8ckOo4OhL1tInM=",
"lastModified": 1679493688,
"narHash": "sha256-8Hu9k84LNi+Gz8zJNE7AxYxmv8XXQz3cG7CFhv31fz4=",
"owner": "lbonn",
"repo": "rofi",
"rev": "ff2338c38fbf6e7049563acf55f9055bcf882a4e",
"rev": "d06095b5ed40e5d28236b7b7b575ca867696d847",
"type": "github"
},
"original": {
@ -901,11 +896,11 @@
"smartcolumn-nvim": {
"flake": false,
"locked": {
"lastModified": 1692020684,
"narHash": "sha256-lNEsAkKRpMgdO6Og0odpTn/t4qkzO7EuTjC5ABJhvXc=",
"lastModified": 1679417638,
"narHash": "sha256-DjPWBOLbzdfOQAx+6xgV1CD5NKuP1N6An2lmHNHd39Q=",
"owner": "m4xshen",
"repo": "smartcolumn.nvim",
"rev": "4aa00ad766f3c0f0e2561e0eb42df3ea3743c135",
"rev": "0c572e3eae48874f25b74394a486f38cadb5c958",
"type": "github"
},
"original": {
@ -916,11 +911,11 @@
},
"stable": {
"locked": {
"lastModified": 1692134936,
"narHash": "sha256-Z68O969cioC6I3k/AFBxsuEwpJwt4l9fzwuAMUhCCs0=",
"lastModified": 1689680872,
"narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bfd953b2c6de4f550f75461bcc5768b6f966be10",
"rev": "08700de174bc6235043cb4263b643b721d936bdb",
"type": "github"
},
"original": {
@ -947,16 +942,16 @@
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"repo": "default",
"type": "github"
}
},
@ -990,29 +985,14 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"telekasten-nvim": {
"flake": false,
"locked": {
"lastModified": 1691743763,
"narHash": "sha256-zYBMUzanFtjnsUrwxjHLvhRODLj1uwGi18wMUWnrqRA=",
"lastModified": 1689074017,
"narHash": "sha256-yBw0Ja9xBhHcEdzvKvg6LCDzmIgW9kg0XaXS7hcr958=",
"owner": "renerocksai",
"repo": "telekasten.nvim",
"rev": "584783fdbdd13bb691a435f86ed10a3717fa9e9a",
"rev": "4a5e57eee9c5154ed77423bb7fa6619fdb0784cd",
"type": "github"
},
"original": {
@ -1028,11 +1008,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1692198673,
"narHash": "sha256-kLhdmJ4uI248caVxQhYSq+IA+xQHDcp5in4eI8sJphk=",
"lastModified": 1690749969,
"narHash": "sha256-legyKOJljfuNrY74jsgA641E3q6hle4G6qz8YD55CgI=",
"ref": "refs/heads/main",
"rev": "37dc5c727a3d73778d6ee9d63c1468357cf0ed72",
"revCount": 20,
"rev": "e3fd65e98be42b367aef019812375e418ef77448",
"revCount": 18,
"type": "git",
"url": "https://gitea.moritzboeh.me/moritz/timers.git"
},
@ -1043,7 +1023,7 @@
},
"utils": {
"inputs": {
"systems": "systems_5"
"systems": "systems_4"
},
"locked": {
"lastModified": 1687171271,
@ -1063,18 +1043,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1691073628,
"narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=",
"lastModified": 1689611045,
"narHash": "sha256-3RTOlQabkNetQ4O4UzSf57JPco9VGVHhSU1ls5uKBeE=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e",
"type": "gitlab"
}
},
@ -1087,18 +1067,14 @@
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691841170,
"narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
"lastModified": 1685385764,
"narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
"rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"type": "github"
},
"original": {

View File

@ -130,7 +130,7 @@ in
f
];
fonts.packages = with pkgs; [
fonts.fonts = with pkgs; [
(nerdfonts.override {
fonts = [ "FiraCode" ];
})

View File

@ -7,6 +7,8 @@ with lib;
let
cfg = config.my.programs.hyprland;
boolToYesNo = bool: if bool then "yes" else "no";
mkRule = rule: windowRegexes: "windowrulev2 = ${rule},${concatStringsSep "," windowRegexes}";
mkRules = rules: windowRegexes: concatStringsSep "\n" (map (flip mkRule windowRegexes) rules);
in
@ -56,14 +58,12 @@ in
# See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 3
blur {
enabled = ${boolToString cfg.blur}
size = 3
passes = 3
new_optimizations = on
}
blur = ${boolToYesNo cfg.blur}
blur_size = 3
blur_passes = 3
blur_new_optimizations = on
drop_shadow = ${boolToString cfg.shadows}
drop_shadow = ${boolToYesNo cfg.shadows}
shadow_range = 10
shadow_render_power = 2
@ -73,7 +73,7 @@ in
animations {
enabled = yes
# see https://wiki.hyprland.org/Configuring/Animations/ for more
# Some default Lanimations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = sine, 0.445, 0.05, 0.55, 0.95
bezier = quad, 0.455, 0.03, 0.515, 0.955
@ -120,6 +120,16 @@ in
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
${optionalString cfg.blur ''
# Kitty
windowrulev2 = opacity 0.95 0.95, class:^kitty$
# Rofi
${mkRules ["float" "opacity 0.85 0.85" "noborder"] ["class:^([rR]ofi)$"]}
windowrulev2 = opacity 0.85 0.85, floating:1
''}
# Firefox Sharing Indicator
${mkRules ["float" "move 49% 40" "noborder" "nofullscreenrequest"] ["title:^(.*Sharing Indicator)$"]}

View File

@ -9,7 +9,7 @@ with lib;
let
cfg = config.my.programs.hyprland;
hyprland = pkgs.hyprland.override { enableNvidiaPatches = cfg.nvidiaSupport; };
hyprland = pkgs.hyprland.override { nvidiaPatches = cfg.nvidiaSupport; };
in
{
options.my.programs.hyprland = {

View File

@ -21,7 +21,6 @@ in
cursor_shape = "underline";
window_padding_width = 3;
confirm_os_window_close = 0;
background_opacity = "0.92";
};
keybindings = {
"ctrl+plus" = "change_font_size all +2.0";