From d4eb17856e72fa53429881a7f08aecc8613895fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 17 Aug 2023 16:26:21 +0200 Subject: [PATCH] build(flake)!: update inputs --- flake.lock | 188 +++++++++++++++----------- modules/profiles/base.nix | 2 +- modules/programs/hyprland/_config.nix | 14 +- modules/programs/hyprland/default.nix | 2 +- 4 files changed, 115 insertions(+), 91 deletions(-) diff --git a/flake.lock b/flake.lock index 93f6319..6a0eb62 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1689334118, - "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=", + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "owner": "ryantm", "repo": "agenix", - "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1689799111, - "narHash": "sha256-JGucBOBTSYBapMrI7GCMAqTFaT1O7Kqw0S3uBtFawIo=", + "lastModified": 1691983650, + "narHash": "sha256-oA1bIpPc27Kk89n3JGpni7RkcIDRVAsTjUfjRHbKS24=", "owner": "arkenfox", "repo": "user.js", - "rev": "6151d664acced94364e7e3a075e6ac3ca555ef48", + "rev": "915f39959c7e077f00477e6ce34a0f9f9e3e7c6b", "type": "github" }, "original": { @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1690933134, + "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", "type": "github" }, "original": { @@ -206,7 +206,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1685518550, @@ -224,7 +224,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1685518550, @@ -363,11 +363,11 @@ ] }, "locked": { - "lastModified": 1689875525, - "narHash": "sha256-fgUrFH3bMZ6R7qgBTfuTRGlkZXIkdyjndl6ZbExbjE8=", + "lastModified": 1692131549, + "narHash": "sha256-MFjI8NL63/6HjMZpvJgnB/Pgg2dht22t45jOYtipZig=", "owner": "nix-community", "repo": "home-manager", - "rev": "1443abd2696ec6bd6fb9701e6c26b277a27b4a3e", + "rev": "75cfe974e2ca05a61b66768674032b4c079e55d4", "type": "github" }, "original": { @@ -381,11 +381,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1688849364, - "narHash": "sha256-gW4x5YiCWFlckFiaLZo+RWJa1IyQ2Cx4jTrJzNy1OzQ=", + "lastModified": 1690635289, + "narHash": "sha256-ec77Yf7mqusmGkxrmYXEG4D0DqEcNRA3vFextWVQOVA=", "owner": "hyprwm", "repo": "contrib", - "rev": "3126196e7ed609e7c427a39dc126ea067de62a65", + "rev": "bef073cff65917ba2d888aa4dc39bd9868e2b0a4", "type": "github" }, "original": { @@ -398,15 +398,16 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs_2", + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1689879667, - "narHash": "sha256-g6XQ1slkxXw1kddaUKBwvYktIPJczSbZVoe4EzjNjD8=", + "lastModified": 1692182360, + "narHash": "sha256-FSJEeAQj0viz52+GE774GiOOtU0X2B2KgXnRCgogSaU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f864b15427b363443e767eb5e78f5dc9603c49f3", + "rev": "78fa8adadc146a7efeebf63438c1140662484fba", "type": "github" }, "original": { @@ -420,14 +421,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -441,11 +446,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1689547456, - "narHash": "sha256-jZQ377LqcazitvH2fVXKiL8kvmpGT3fuqev+yQqvuRw=", + "lastModified": 1691060455, + "narHash": "sha256-V5ulB9CkGh1ghiC4BKvRdoYKZzpaiOKzAOUmJIFkgM0=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "ac5f7b038d5ac589d32f5ae18f9745bfe5200618", + "rev": "e498c438b1e16dcf32ecb3030b20b83f7ed9ff6d", "type": "github" }, "original": { @@ -472,11 +477,11 @@ }, "master": { "locked": { - "lastModified": 1689880801, - "narHash": "sha256-jWeQSVczGNRNs48DWiAwb6ojKXb+woqoXoVsA1KwdUM=", + "lastModified": 1692198797, + "narHash": "sha256-4MwKoXIBfNI85zZ/tHyLT+M7sF2Zb0XoyhdXtlM6g2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ebaae879a74f772ecc827d264e37960087a4b182", + "rev": "c85be71df497312de66b65df8d7ad7b5c0c81d04", "type": "github" }, "original": { @@ -514,11 +519,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1689785735, - "narHash": "sha256-QdjWbe4oNjIazmOrbJ9u5GadaqTV44RiYbiZoLgNKC8=", + "lastModified": 1692141167, + "narHash": "sha256-1My5JBKfHupN9D86eeX8JFr2Wk03qWJObk73NC1/x2s=", "owner": "neovim", "repo": "neovim", - "rev": "86ce3878d662c1dbfec61a5ad8e7c16c4283ed5c", + "rev": "f92bda1dad462de81ec92134dfa9ba637edc7bb7", "type": "github" }, "original": { @@ -537,11 +542,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1689811489, - "narHash": "sha256-rQ1gnq+ApoowEic21nIYIeQ0Qibb3IEEtwv0LgNIYDc=", + "lastModified": 1692144319, + "narHash": "sha256-sJ7KT+dfLEQbsNI2G+ZLKQ0tIS72roMv+xjC+0bTS9k=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "65f2e8da89ba400e7bbad6fe2f51af0ed9f7e968", + "rev": "3632032784ed4a7f761a61a3337f2e1d61210eae", "type": "github" }, "original": { @@ -561,11 +566,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1689759503, - "narHash": "sha256-wFrcae6V58hIlDW+7NDoUXzXBmsU7W/k3V1KIePcwRA=", + "lastModified": 1691372739, + "narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=", "owner": "oxalica", "repo": "nil", - "rev": "59bcad0b13b5d77668c0c125fef71d7b41406d7a", + "rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b", "type": "github" }, "original": { @@ -665,11 +670,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1688500189, - "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", + "lastModified": 1691654369, + "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", + "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "type": "github" }, "original": { @@ -713,11 +718,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1689752456, - "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=", + "lastModified": 1692067901, + "narHash": "sha256-kq8Pf/nmlXECDWMkQSRGQkjWsA6G0pjzZkfUEaTmXJE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f256d7da238cb627ef189d56ed590739f42f13b", + "rev": "ea95c0917609e5c48023cc7c6141bea2fdf13970", "type": "github" }, "original": { @@ -729,11 +734,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1689752456, - "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=", + "lastModified": 1692128808, + "narHash": "sha256-Di1Zm/P042NuwThMiZNrtmaAjd4Tm2qBOKHX7xUOfMk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7f256d7da238cb627ef189d56ed590739f42f13b", + "rev": "4ed9856be002a730234a1a1ed9dcd9dd10cbdb40", "type": "github" }, "original": { @@ -791,11 +796,11 @@ "nvim-treesitter-textsubjects": { "flake": false, "locked": { - "lastModified": 1676144693, - "narHash": "sha256-4jb9v0xpO17wp85dzojKUQ6hUdNBx3T2tB4fSWoANus=", + "lastModified": 1691029837, + "narHash": "sha256-O57pMYtDR713ItAeUfdkcl2IfBLQcLEa2sb+AXhaqDs=", "owner": "RRethy", "repo": "nvim-treesitter-textsubjects", - "rev": "b913508f503527ff540f7fe2dcf1bf1d1f259887", + "rev": "df75fcec548014f158cda6498ac38c4622c221e1", "type": "github" }, "original": { @@ -813,11 +818,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1689668210, - "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=", + "lastModified": 1691747570, + "narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "eb433bff05b285258be76513add6f6c57b441775", + "rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a", "type": "github" }, "original": { @@ -829,11 +834,11 @@ "rofi-wayland": { "flake": false, "locked": { - "lastModified": 1679493688, - "narHash": "sha256-8Hu9k84LNi+Gz8zJNE7AxYxmv8XXQz3cG7CFhv31fz4=", + "lastModified": 1690115482, + "narHash": "sha256-fUneGsSWpi8zYrTbF14e/fuf0vaXF8ckOo4OhL1tInM=", "owner": "lbonn", "repo": "rofi", - "rev": "d06095b5ed40e5d28236b7b7b575ca867696d847", + "rev": "ff2338c38fbf6e7049563acf55f9055bcf882a4e", "type": "github" }, "original": { @@ -896,11 +901,11 @@ "smartcolumn-nvim": { "flake": false, "locked": { - "lastModified": 1679417638, - "narHash": "sha256-DjPWBOLbzdfOQAx+6xgV1CD5NKuP1N6An2lmHNHd39Q=", + "lastModified": 1692020684, + "narHash": "sha256-lNEsAkKRpMgdO6Og0odpTn/t4qkzO7EuTjC5ABJhvXc=", "owner": "m4xshen", "repo": "smartcolumn.nvim", - "rev": "0c572e3eae48874f25b74394a486f38cadb5c958", + "rev": "4aa00ad766f3c0f0e2561e0eb42df3ea3743c135", "type": "github" }, "original": { @@ -911,11 +916,11 @@ }, "stable": { "locked": { - "lastModified": 1689680872, - "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=", + "lastModified": 1692134936, + "narHash": "sha256-Z68O969cioC6I3k/AFBxsuEwpJwt4l9fzwuAMUhCCs0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08700de174bc6235043cb4263b643b721d936bdb", + "rev": "bfd953b2c6de4f550f75461bcc5768b6f966be10", "type": "github" }, "original": { @@ -942,16 +947,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -985,14 +990,29 @@ "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": 1689074017, - "narHash": "sha256-yBw0Ja9xBhHcEdzvKvg6LCDzmIgW9kg0XaXS7hcr958=", + "lastModified": 1691743763, + "narHash": "sha256-zYBMUzanFtjnsUrwxjHLvhRODLj1uwGi18wMUWnrqRA=", "owner": "renerocksai", "repo": "telekasten.nvim", - "rev": "4a5e57eee9c5154ed77423bb7fa6619fdb0784cd", + "rev": "584783fdbdd13bb691a435f86ed10a3717fa9e9a", "type": "github" }, "original": { @@ -1008,11 +1028,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1690749969, - "narHash": "sha256-legyKOJljfuNrY74jsgA641E3q6hle4G6qz8YD55CgI=", + "lastModified": 1692198673, + "narHash": "sha256-kLhdmJ4uI248caVxQhYSq+IA+xQHDcp5in4eI8sJphk=", "ref": "refs/heads/main", - "rev": "e3fd65e98be42b367aef019812375e418ef77448", - "revCount": 18, + "rev": "37dc5c727a3d73778d6ee9d63c1468357cf0ed72", + "revCount": 20, "type": "git", "url": "https://gitea.moritzboeh.me/moritz/timers.git" }, @@ -1023,7 +1043,7 @@ }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1687171271, @@ -1043,18 +1063,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1689611045, - "narHash": "sha256-3RTOlQabkNetQ4O4UzSf57JPco9VGVHhSU1ls5uKBeE=", + "lastModified": 1691073628, + "narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=", "owner": "wlroots", "repo": "wlroots", - "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", + "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", + "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", "type": "gitlab" } }, @@ -1067,14 +1087,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1685385764, - "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", + "lastModified": 1691841170, + "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", + "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b", "type": "github" }, "original": { diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index d6d6523..1717f1f 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -130,7 +130,7 @@ in f ]; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix index 67cd433..7ca6520 100644 --- a/modules/programs/hyprland/_config.nix +++ b/modules/programs/hyprland/_config.nix @@ -7,8 +7,6 @@ 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 @@ -58,12 +56,14 @@ in # See https://wiki.hyprland.org/Configuring/Variables/ for more rounding = 3 - blur = ${boolToYesNo cfg.blur} - blur_size = 3 - blur_passes = 3 - blur_new_optimizations = on + blur { + enabled = ${boolToString cfg.blur} + size = 3 + passes = 3 + new_optimizations = on + } - drop_shadow = ${boolToYesNo cfg.shadows} + drop_shadow = ${boolToString cfg.shadows} shadow_range = 10 shadow_render_power = 2 diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index d75333d..c9b387a 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -9,7 +9,7 @@ with lib; let cfg = config.my.programs.hyprland; - hyprland = pkgs.hyprland.override { nvidiaPatches = cfg.nvidiaSupport; }; + hyprland = pkgs.hyprland.override { enableNvidiaPatches = cfg.nvidiaSupport; }; in { options.my.programs.hyprland = {