From 39b840e41f7ab21a84276c9e66f3f9c8edf0a92d Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 13 Apr 2026 08:54:43 +0000 Subject: [PATCH 1/5] Downgrade nvidia --- flake.lock | 98 +++++++++++++-------------------- modules/nixos/unfree/nvidia.nix | 1 + 2 files changed, 40 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 8a58822..c50ed5c 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1775176642, + "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "179704030c5286c729b5b0522037d1d51341022c", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -210,20 +210,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -233,11 +231,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1775683737, + "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992", "type": "github" }, "original": { @@ -429,11 +427,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -455,11 +453,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1775228139, + "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", "type": "github" }, "original": { @@ -480,11 +478,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1774852850, - "narHash": "sha256-7VK4v7ZbQw5apfgc+FvgRi8BUC45ERlcp8VTTTQ3tko=", + "lastModified": 1775676744, + "narHash": "sha256-p0zYceLcmNEAXY3KzdAocs4mGB6XcxbTpWK67lo+ugM=", "owner": "NotAShelf", "repo": "nvf", - "rev": "b4d6539e7e9948aaba5efd7a67a63672d1fa80ef", + "rev": "ba1fcf1eaa977b4f70bf1df72e7eef371df8c09c", "type": "github" }, "original": { @@ -515,11 +513,11 @@ ] }, "locked": { - "lastModified": 1774910634, - "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", + "lastModified": 1775682595, + "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", + "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", "type": "github" }, "original": { @@ -563,18 +561,17 @@ ], "nur": "nur", "systems": "systems_3", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1774897726, - "narHash": "sha256-k/H2/oyex6GEC6uYXYetrboFQeTmX1Ouwv/zaW7b/Z0=", + "lastModified": 1775429060, + "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", "owner": "danth", "repo": "stylix", - "rev": "9b4a5eb409ceac2dd6ad495c7988e189a418cd30", + "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", "type": "github" }, "original": { @@ -628,23 +625,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -664,11 +644,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1772661346, + "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "13b5b0c299982bb361039601e2d72587d6846294", "type": "github" }, "original": { @@ -680,11 +660,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1772934010, + "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", "type": "github" }, "original": { @@ -696,11 +676,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1772909925, + "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", "type": "github" }, "original": { @@ -738,11 +718,11 @@ ] }, "locked": { - "lastModified": 1775021133, - "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", + "lastModified": 1775699406, + "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", + "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", "type": "github" }, "original": { diff --git a/modules/nixos/unfree/nvidia.nix b/modules/nixos/unfree/nvidia.nix index d67ba90..bc849bf 100644 --- a/modules/nixos/unfree/nvidia.nix +++ b/modules/nixos/unfree/nvidia.nix @@ -28,6 +28,7 @@ in { # enable32Bit = true; # }; + hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_580; services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { From c2fcec9bfbc006beda871f9d6c49303029bf52a3 Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 13 Apr 2026 08:55:00 +0000 Subject: [PATCH 2/5] Update nix --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c50ed5c..ab40dea 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1775683737, - "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=", + "lastModified": 1776046499, + "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992", + "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", "type": "github" }, "original": { @@ -427,11 +427,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -478,11 +478,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1775676744, - "narHash": "sha256-p0zYceLcmNEAXY3KzdAocs4mGB6XcxbTpWK67lo+ugM=", + "lastModified": 1775892726, + "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=", "owner": "NotAShelf", "repo": "nvf", - "rev": "ba1fcf1eaa977b4f70bf1df72e7eef371df8c09c", + "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436", "type": "github" }, "original": { @@ -513,11 +513,11 @@ ] }, "locked": { - "lastModified": 1775682595, - "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", + "lastModified": 1775971308, + "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", + "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4", "type": "github" }, "original": { @@ -567,11 +567,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775429060, - "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", + "lastModified": 1775936757, + "narHash": "sha256-KJO/7qoxJ+hlsb3WlFSl6IGrExBIf1GvKdrhOlnGdKY=", "owner": "danth", "repo": "stylix", - "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", + "rev": "d3e447786b74d62c75f665e17cb3e681c66e90c7", "type": "github" }, "original": { @@ -718,11 +718,11 @@ ] }, "locked": { - "lastModified": 1775699406, - "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", + "lastModified": 1775961625, + "narHash": "sha256-8SjilptVv9dSTvn0Z5j65vHHu+flmPXeyrGaSyRJm7U=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", + "rev": "0eaab249f5ca1c55921e99cfe07187410758c9fa", "type": "github" }, "original": { From c9f91d311ad83b7c169806e7e42fea216e668c7a Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 13 Apr 2026 08:56:47 +0000 Subject: [PATCH 3/5] Fix nv config --- hosts/muon/configuration.nix | 4 +++- modules/nixos/unfree/nvidia.nix | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index 5b19ff4..56853b7 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -102,8 +102,10 @@ in { ''; # Proprietary Date: Mon, 13 Apr 2026 08:57:22 +0000 Subject: [PATCH 4/5] Fix spelling --- hosts/muon/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index 56853b7..890969f 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -103,7 +103,7 @@ in { # Proprietary Date: Mon, 13 Apr 2026 10:42:58 +0000 Subject: [PATCH 5/5] Remove warnings --- flake.nix | 1 - hosts/muon/home.nix | 1 + hosts/muop/configuration.nix | 5 +++-- modules/home/desktop/default.nix | 4 ++++ modules/home/xdg.nix | 1 + modules/nixos/core/home.nix | 5 +++++ modules/nixos/server/audio.nix | 1 - utils.nix | 2 +- 8 files changed, 15 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index bd3ff18..85e9d9c 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,6 @@ valheim-server.inputs.nixpkgs.follows = "nixpkgs"; nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest"; - nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs @ { diff --git a/hosts/muon/home.nix b/hosts/muon/home.nix index 101a66b..8df37b0 100644 --- a/hosts/muon/home.nix +++ b/hosts/muon/home.nix @@ -73,6 +73,7 @@ in { # SSH: auto-add work key to gpg-agent on first use programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks."*" = { identityFile = "~/.ssh/work_ed25519"; addKeysToAgent = "yes"; diff --git a/hosts/muop/configuration.nix b/hosts/muop/configuration.nix index 64a4640..4fcd725 100644 --- a/hosts/muop/configuration.nix +++ b/hosts/muop/configuration.nix @@ -89,7 +89,7 @@ in { graphics = { enable = true; enable32Bit = true; - extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ]; + extraPackages = with pkgs; [ libva-vdpau-driver libvdpau-va-gl ]; }; nvidia = { @@ -110,9 +110,10 @@ in { nvidiaBusId = "PCI:1:0:0"; }; }; - pulseaudio.support32Bit = true; }; + services.pulseaudio.support32Bit = true; + ## Mouse services.libinput.mouse.accelProfile = "flat"; diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index 2184001..6a0fe6e 100644 --- a/modules/home/desktop/default.nix +++ b/modules/home/desktop/default.nix @@ -1,6 +1,7 @@ { pkgs, lib, + config, osConfig, ... }: let @@ -19,4 +20,7 @@ in { mods.hyprland.enable = lib.mkIf cfg.wayland.enable true; mods.i3.enable = lib.mkIf osConfig.services.xserver.windowManager.i3.enable true; + + # Silence stateVersion < 26.05 deprecation warnings by pinning the old defaults. + gtk.gtk4.theme = lib.mkDefault config.gtk.theme; } diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix index 3215032..2ecf08a 100644 --- a/modules/home/xdg.nix +++ b/modules/home/xdg.nix @@ -35,6 +35,7 @@ enable = true; userDirs = { enable = true; + setSessionVariables = true; documents = "$HOME/documents"; download = "$HOME/downloads"; videos = "$HOME/misc/videos"; diff --git a/modules/nixos/core/home.nix b/modules/nixos/core/home.nix index 8829fd5..f76daf3 100644 --- a/modules/nixos/core/home.nix +++ b/modules/nixos/core/home.nix @@ -8,6 +8,11 @@ in { config = { home-manager = { extraSpecialArgs = { inherit system pkgs inputs sources; }; + # When stylix is enabled it injects its own HM module (and followSystem + # copyModules) via homeManagerIntegration.autoImport. Only add it here + # for hosts where stylix is disabled so that stylix options are still + # declared (even if unused) in every home-manager context. + sharedModules = lib.optional (!config.stylix.enable) inputs.stylix.homeModules.stylix; users."${cfg.user.name}" = { imports = [ cfg.home.file inputs.self.outputs.homeManagerModules.default ]; diff --git a/modules/nixos/server/audio.nix b/modules/nixos/server/audio.nix index 7cb6714..2897306 100644 --- a/modules/nixos/server/audio.nix +++ b/modules/nixos/server/audio.nix @@ -39,7 +39,6 @@ in with lib; { enable = true; openFirewall = true; openRPCPort = true; - port = arr.torrent.port; package = pkgs.transmission_4; settings = { download-dir = "/storage1/download"; diff --git a/utils.nix b/utils.nix index b3c1b7d..e1b6890 100644 --- a/utils.nix +++ b/utils.nix @@ -28,7 +28,7 @@ in { modules = [ homeFile inputs.self.outputs.homeManagerModules.default - inputs.stylix.homeManagerModules.stylix + inputs.stylix.homeModules.stylix ({ osConfig, ... }: { home.username = username; home.homeDirectory = "/home/${username}";