From edf822e10fb1931169e2c9f86147bf4bdb0c13c6 Mon Sep 17 00:00:00 2001 From: mrjones2014 <8648891+mrjones2014@users.noreply.github.com> Date: Fri, 30 Aug 2024 16:01:51 +0000 Subject: [PATCH 1/3] flake: update dependencies --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a0229cf1..165cce55 100644 --- a/flake.lock +++ b/flake.lock @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1724440431, - "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", + "lastModified": 1724947644, + "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", + "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1724651993, - "narHash": "sha256-UPASmzd46/5P118t2fg/pIMid5yxEJSmXpPRuKawxUE=", + "lastModified": 1724996444, + "narHash": "sha256-bgDfNsVPleUyx6vNr5INJTLfkLycNmL3yvSBv1OguLs=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e87be8db9b99173d375a9ba3b4fd3a57aaa7386e", + "rev": "d0f68c980e3a0a3a8e63ccca93a01f87fb77937e", "type": "github" }, "original": { @@ -477,11 +477,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1724571360, - "narHash": "sha256-N21pypz02a6jrefeRtwyxWM7ryHPW+MMbxq4aCk5d6Y=", + "lastModified": 1724970905, + "narHash": "sha256-6HqoxweeX3tQbchJpjUNiBKj/2P3oiQBR42B/QuB+a0=", "owner": "neovim", "repo": "neovim", - "rev": "b8135a76b71f1af0d708e3dc58ccb58abad59f7c", + "rev": "4353996d0fa8e5872a334d68196d8088391960cf", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { From 106bf0523e3d682dd58262aa22f4cd48db4e1e9d Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Fri, 30 Aug 2024 12:18:40 -0400 Subject: [PATCH 2/3] fix(nixos): Set missing option --- hosts/pc/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hosts/pc/default.nix b/hosts/pc/default.nix index cb638079..df9c21b0 100644 --- a/hosts/pc/default.nix +++ b/hosts/pc/default.nix @@ -12,10 +12,8 @@ # use proprietary nvidia drivers graphics.enable = true; nvidia = { - # workaround for Steam new UI bug, change this back to `config.boot.kernelPackages.nvidiaPackages.stable` in the future. - # see: https://wiki.archlinux.org/title/Steam/Troubleshooting#Steam_window_does_not_show_on_Nvidia_GPUs_after_the_June_14,_2023_update - # see last answer here: https://discourse.nixos.org/t/using-older-revisions-of-nvidia-drivers/28645 package = config.boot.kernelPackages.nvidiaPackages.latest; + open = false; modesetting.enable = true; nvidiaPersistenced = true; }; From 9461c24f353bd1fb142fec797cbb16067b76aef0 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Fri, 30 Aug 2024 12:33:02 -0400 Subject: [PATCH 3/3] fix(home-manager): Only import gnome module on Linux --- home-manager/modules/gnome/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/modules/gnome/default.nix b/home-manager/modules/gnome/default.nix index 2d112cda..67e38521 100644 --- a/home-manager/modules/gnome/default.nix +++ b/home-manager/modules/gnome/default.nix @@ -1,4 +1,5 @@ -{ +{ isLinux, ... }: +if isLinux then { imports = [ ./dconf.nix ]; # workaround for https://github.com/nix-community/home-manager/issues/3447 # autostart 1Password in the background so I can use the SSH agent without manually opening the app first @@ -27,4 +28,5 @@ MimeType=x-scheme-handler/sgnl;x-scheme-handler/signalcaptcha; Categories=Network;InstantMessaging;Chat; ''; -} +} else + { }