From 2d57da56b230ab20d11ec975769526621b5d215c Mon Sep 17 00:00:00 2001 From: marc Date: Sat, 9 May 2026 19:26:48 +0200 Subject: [PATCH] Flake upgrade --- flake.lock | 551 ++++--------------------------- flake.nix | 22 +- hosts/reykjavik/default.nix | 2 +- modules/desktop/grapheio.nix | 2 +- modules/desktop/tools/greetd.nix | 4 +- modules/desktop/tools/rofi.nix | 22 +- modules/desktop/wm/hyprland.nix | 13 +- modules/dev/git.nix | 12 +- modules/system/gpg.nix | 2 +- 9 files changed, 99 insertions(+), 531 deletions(-) diff --git a/flake.lock b/flake.lock index 0c865ef..a818a81 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -23,39 +23,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1747864449, - "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "base16-schemes": { "flake": false, "locked": { @@ -78,11 +45,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1733127808, - "narHash": "sha256-UJUFsa1jmYSgAhrii1HVEl//ggT3Nzaw6kDN6TnkGXM=", + "lastModified": 1778318532, + "narHash": "sha256-xspmhLgWF1FVYUsfxqTYHxZE9M6nNsfOB/zJKIlMKV8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "51d6aafb5e3bbf10a29bd8ff417b617e35b14d0e", + "rev": "0d43c1b2bf83db3b4376eb8944ea666d67df5c1b", "type": "github" }, "original": { @@ -91,41 +58,24 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "gitignore": { + "flake-parts": { "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", + "nixpkgs-lib": [ + "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { "owner": "hercules-ci", - "repo": "gitignore.nix", + "repo": "flake-parts", "type": "github" } }, @@ -137,11 +87,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -157,69 +107,20 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1777851538, + "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } }, - "hy3": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1747077256, - "narHash": "sha256-ryaXKevnISRiJb93QIAv7tGc6ZJqSkwETKm4oGh8HWI=", - "owner": "outfoxxed", - "repo": "hy3", - "rev": "567dc9dd20e15d95a56a81c516a70dba30bc2c9c", - "type": "github" - }, - "original": { - "owner": "outfoxxed", - "repo": "hy3", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745948457, - "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "ac903e80b33ba6a88df83d02232483d99f327573", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, "hyprcursor-rose-pine": { "inputs": { "hyprlang": "hyprlang", @@ -227,11 +128,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1718180692, - "narHash": "sha256-J5IYvKcdGRL/sBuST5WaoESEIl7KPv8aJK8aLY6C91E=", + "lastModified": 1748096947, + "narHash": "sha256-ouuA8LVBXzrbYwPW2vNjh7fC9H2UBud/1tUiIM5vPvM=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "40ce26cb29206722ff73839ead0d871d94751e90", + "rev": "4b02963d0baf0bee18725cf7c5762b3b3c1392f1", "type": "github" }, "original": { @@ -240,187 +141,6 @@ "type": "github" } }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_4", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1748036495, - "narHash": "sha256-kYyrhoxu8pZ/YHd2Yy2VNaRGeqydOh1OTayvknhweGg=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "81cd526f923f4a9074bbfef59b4c7e9f3350c349", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-plugins": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1748089895, - "narHash": "sha256-XS2inFEyCsA91E2yRUlylHN7DUBwbLpqX1og4JDSXoE=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "c04dee3d0cd92423a2b970614ec4b423cf5a3f9c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745951494, - "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "nixpkgs": [ @@ -443,85 +163,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1747484975, - "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "163c83b3db48a17c113729c220a60b94596c9291", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1746635225, - "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1747584298, - "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -543,11 +184,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -574,16 +215,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1778003029, + "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -606,43 +247,43 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", - "owner": "NixOS", + "lastModified": 1778003029, + "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1747953325, - "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -653,40 +294,21 @@ } }, "nur": { - "locked": { - "lastModified": 1733136078, - "narHash": "sha256-F+gLv1YTOfP5BP0kHPEOLtrJWL1s3XGoaBhfwDsndNw=", - "owner": "nix-community", - "repo": "NUR", - "rev": "aadc32a2305cd303d1866be1d500ad6f7b344b82", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "lastModified": 1778341698, + "narHash": "sha256-q7Br6sEl+LH7+ZwPft/74TNSTlo9pqJIA5qpK9OcMDA=", + "owner": "nix-community", + "repo": "NUR", + "rev": "a67c2a7ec0fe8400ab87bf93e0e45cbd274a1ef1", "type": "github" }, "original": { - "owner": "cachix", - "repo": "git-hooks.nix", + "owner": "nix-community", + "repo": "NUR", "type": "github" } }, @@ -695,12 +317,9 @@ "agenix": "agenix", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager_2", - "hy3": "hy3", "hyprcursor-rose-pine": "hyprcursor-rose-pine", - "hyprland": "hyprland", - "hyprland-plugins": "hyprland-plugins", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nur": "nur", "zen-browser": "zen-browser" } @@ -750,21 +369,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_3" @@ -783,57 +387,16 @@ "type": "github" } }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1745871725, - "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "zen-browser": { "inputs": { "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1739222645, - "narHash": "sha256-6FsTAjrO0TN5+gVxx3hmWqEJWs1sJ1p3E8DKWHdlN6M=", + "lastModified": 1778303188, + "narHash": "sha256-zXFSvK80qpI91B7DU9QSExAtafSrz6vzormh2kUi6kQ=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "7e60ade066a54797b376ebaf554bc2efa255ff8a", + "rev": "9346c84657a9cab472bc4ee5a2d65d42a72d5346", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7cbc662..a42e7f7 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,10 @@ inputs = { # - Nixpkgs ---------------------------------- - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; # - Home Manager ----------------------------- - home-manager.url = "github:nix-community/home-manager/release-25.05"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # - Agenix ----------------------------------- @@ -26,15 +26,15 @@ nix-colors.url = "github:misterio77/nix-colors"; # - Hyprland --------------------------------- - hyprland.url = "github:hyprwm/Hyprland"; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; - hy3 = { - url = "github:outfoxxed/hy3"; - inputs.hyprland.follows = "hyprland"; - }; + # hyprland.url = "github:hyprwm/Hyprland"; + # hyprland-plugins = { + # url = "github:hyprwm/hyprland-plugins"; + # inputs.hyprland.follows = "hyprland"; + # }; + # hy3 = { + # url = "github:outfoxxed/hy3"; + # inputs.hyprland.follows = "hyprland"; + # }; hyprcursor-rose-pine.url = "github:ndom91/rose-pine-hyprcursor"; # - More stuff ------------------------------- diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix index 10b6d1a..faac6f2 100644 --- a/hosts/reykjavik/default.nix +++ b/hosts/reykjavik/default.nix @@ -105,7 +105,7 @@ in # - Gaming ----------------------------------- gaming.lutris.enable = true; gaming.steam.enable = true; - app.discord.enable = true; + app.discord.enable = false; }; # - Extra / Temporary -------------------------- diff --git a/modules/desktop/grapheio.nix b/modules/desktop/grapheio.nix index f6a0a66..9f4adab 100644 --- a/modules/desktop/grapheio.nix +++ b/modules/desktop/grapheio.nix @@ -21,7 +21,7 @@ in rose-pine-gtk-theme rose-pine-icon-theme # - Cursor - inputs.hyprcursor-rose-pine.packages.${pkgs.system}.default + inputs.hyprcursor-rose-pine.packages.${pkgs.stdenv.hostPlatform.system}.default rose-pine-cursor ]; diff --git a/modules/desktop/tools/greetd.nix b/modules/desktop/tools/greetd.nix index d412a18..934f1c2 100644 --- a/modules/desktop/tools/greetd.nix +++ b/modules/desktop/tools/greetd.nix @@ -12,7 +12,7 @@ in { config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ - greetd.gtkgreet + gtkgreet cage ]; @@ -20,7 +20,7 @@ in { enable = true; settings = { default_session = { - command = "${pkgs.cage}/bin/cage -d -s ${pkgs.greetd.gtkgreet}/bin/gtkgreet -- -c ${cfg.wm_cmd} -s /etc/greetd/greetd.css"; + command = "${pkgs.cage}/bin/cage -d -s ${pkgs.gtkgreet}/bin/gtkgreet -- -c ${cfg.wm_cmd} -s /etc/greetd/greetd.css"; user = config.user.name; }; }; diff --git a/modules/desktop/tools/rofi.nix b/modules/desktop/tools/rofi.nix index fc85074..b2309b5 100644 --- a/modules/desktop/tools/rofi.nix +++ b/modules/desktop/tools/rofi.nix @@ -11,12 +11,9 @@ in enable = lib.mkEnableOption "rofi"; }; config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs; - if hyprCfg.enable then [ - rofi-wayland - ] else [ + environment.systemPackages = with pkgs; [ rofi - ]; + ]; hm.xdg.configFile."rofi/menus".source = ../../../config/rofi/menus; hm.xdg.configFile."rofi/nix.png".source = nix-colors-lib.nixWallpaperFromScheme { @@ -39,11 +36,16 @@ in } ''; - samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [ - "${hyprCfg.mod}, SPACE, exec, $HOME/.config/rofi/menus/launcher/launcher.sh" - "${hyprCfg.mod} SHIFT, P, exec, $HOME/.config/rofi/menus/powermenu/powermenu.sh" - "${hyprCfg.mod} SHIFT, W, exec, $HOME/.config/rofi/menus/wifi/wifi.sh" - ]; + samfelag.modules.desktop.wm.hyprland = lib.mkIf hyprCfg.enable { + extraKeybindings = [ + "${hyprCfg.mod}, SPACE, exec, $HOME/.config/rofi/menus/launcher/launcher.sh" + "${hyprCfg.mod} SHIFT, P, exec, $HOME/.config/rofi/menus/powermenu/powermenu.sh" + "${hyprCfg.mod} SHIFT, W, exec, $HOME/.config/rofi/menus/wifi/wifi.sh" + ]; + extraGestures = [ + "3, up, dispatcher, exec, $HOME/.config/rofi/menus/launcher/launcher.sh" + ]; + }; samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable { "${i3Cfg.mod}+space" = "exec $HOME/.config/rofi/menus/launcher/launcher.sh"; diff --git a/modules/desktop/wm/hyprland.nix b/modules/desktop/wm/hyprland.nix index df4ebb4..8b66980 100644 --- a/modules/desktop/wm/hyprland.nix +++ b/modules/desktop/wm/hyprland.nix @@ -10,6 +10,7 @@ in { mod = my.mkOpt' types.str "Mod4" "Main modifier key for hyprland"; kb_layout = my.mkOpt' types.str "es" "Keyboard layout(s) for hyprland"; extraKeybindings = my.mkOpt (types.listOf types.str) [ ]; + extraGestures = my.mkOpt (types.listOf types.str) [ ]; }; config = lib.mkIf cfg.enable { @@ -24,13 +25,14 @@ in { hm.wayland.windowManager.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; xwayland.enable = true; systemd.enable = true; plugins = [ - inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3 + # inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3 + pkgs.hyprlandPlugins.hy3 ]; settings = { @@ -57,10 +59,9 @@ in { rounding = 10; }; - gestures = { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = true; - }; + gesture = [ + "3, horizontal, workspace" + ] ++ cfg.extraGestures; bind = [ diff --git a/modules/dev/git.nix b/modules/dev/git.nix index be55fb4..bea32cf 100644 --- a/modules/dev/git.nix +++ b/modules/dev/git.nix @@ -16,17 +16,19 @@ in hm.programs.git = { enable = true; - userName = cfg.userName; - userEmail = cfg.userEmail; + settings = { + user = { + name = cfg.userName; + email = cfg.userEmail; + }; + init.defaultBranch = "main"; + }; ignores = [ ".direnv" ".project" ]; - extraConfig = { - init.defaultBranch = "main"; - }; }; }; } diff --git a/modules/system/gpg.nix b/modules/system/gpg.nix index b5fe978..b1b211a 100644 --- a/modules/system/gpg.nix +++ b/modules/system/gpg.nix @@ -14,7 +14,7 @@ in pinentryPackage = pkgs.pinentry-qt; }; environment.systemPackages = with pkgs; [ - pinentry + pinentry-gnome3 ]; }; }