From abe8ff6effaf568535248f9664efb78b30235e7f Mon Sep 17 00:00:00 2001 From: alisceon Date: Thu, 9 Apr 2026 11:38:52 +0200 Subject: [PATCH] We ball (returning to unstable) --- flake.lock | 117 ++++++------------------ flake.nix | 23 +---- home/modules/wm/sway/gtk.nix | 1 + home/modules/wm/sway/shells/default.nix | 4 +- nixos/hosts/tower/configuration.nix | 1 + nixos/modules/profiles/workstation.nix | 4 +- nixos/modules/wm/sway.nix | 16 +--- 7 files changed, 40 insertions(+), 126 deletions(-) diff --git a/flake.lock b/flake.lock index 33ddbc3..182dbb3 100644 --- a/flake.lock +++ b/flake.lock @@ -122,27 +122,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nur-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -203,16 +182,15 @@ ] }, "locked": { - "lastModified": 1775077333, - "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "lastModified": 1775683737, + "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -224,11 +202,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1775185059, - "narHash": "sha256-3d9gBmLMfI9d5xwfbd9Zr5JwpQzZ27qw9NiRjJ2aB28=", + "lastModified": 1775703388, + "narHash": "sha256-q2OBj67rcfKFSuUB1OApJdseF75T7cOpUjPJkZCYN7M=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "f5d7077eb578b9e321b74329bd0625d5569dc90e", + "rev": "fffe21e97a9cb0a1ebcf1baa17a423d2517bb1f7", "type": "github" }, "original": { @@ -253,13 +231,13 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_2": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -269,22 +247,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -295,11 +257,11 @@ ] }, "locked": { - "lastModified": 1775309721, - "narHash": "sha256-yZIMJhv1Jg2I1bsag/chncl4nb/5pkrEKVwpkOqJqpI=", + "lastModified": 1775689927, + "narHash": "sha256-UVL4JnAHXs90AiKfhjXBQ83KhiXHAyZ4TdaPkA/ts/g=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "819b2d33b04b2180b6ef19dab7f86af7d3603a52", + "rev": "0fcaa49875bf0c994bb5c604320454ef72e6ba8b", "type": "github" }, "original": { @@ -317,11 +279,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775135550, - "narHash": "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=", + "lastModified": 1775491791, + "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "e7224b756dcd10eec040df818a4c7a0fda5d6eff", + "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", "type": "github" }, "original": { @@ -338,32 +300,11 @@ ] }, "locked": { - "lastModified": 1775321535, - "narHash": "sha256-GC3gqbwvZSUuybzjsr+KrlmDgF0KPWvqG5pjV8UzjUE=", + "lastModified": 1775726673, + "narHash": "sha256-0dX/lqOM+++P/dNFwFqxge7qxVi4lAtdkz9GTlrIsfQ=", "owner": "nix-community", "repo": "NUR", - "rev": "77f938ed32135f6e833f9de7694dd758dd1a976f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "nur-unstable": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1775321535, - "narHash": "sha256-GC3gqbwvZSUuybzjsr+KrlmDgF0KPWvqG5pjV8UzjUE=", - "owner": "nix-community", - "repo": "NUR", - "rev": "77f938ed32135f6e833f9de7694dd758dd1a976f", + "rev": "b2808bf49662138a377821820cb069b622bf633f", "type": "github" }, "original": { @@ -402,11 +343,9 @@ "home-manager": "home-manager", "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "noctalia-qs": "noctalia-qs", "nur": "nur", - "nur-unstable": "nur-unstable", "stylix": "stylix" } }, @@ -417,7 +356,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -430,15 +369,15 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775247334, - "narHash": "sha256-eVKt8wpQqg6Hq/UdHQkV1izXGloGQxdlE4SSk9/X27s=", - "owner": "danth", + "lastModified": 1775429060, + "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", + "owner": "nix-community", "repo": "stylix", - "rev": "6d0502ef7447090abf8b00362b5cda8ac64595b4", + "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", "type": "github" }, "original": { - "owner": "danth", + "owner": "nix-community", "repo": "stylix", "type": "github" } @@ -560,11 +499,11 @@ ] }, "locked": { - "lastModified": 1773297127, - "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", + "rev": "75925962939880974e3ab417879daffcba36c4a3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 753ed17..c6fbf49 100644 --- a/flake.nix +++ b/flake.nix @@ -2,22 +2,17 @@ description = "NixOS configuration for all hosts"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nur = { url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; - nur-unstable = { - url = "github:nix-community/NUR"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix"; + url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; noctalia = { @@ -35,7 +30,6 @@ outputs = inputs @ { self, nixpkgs, - nixpkgs-unstable, ... }: let @@ -53,15 +47,8 @@ overlays = [ inputs.nur.overlays.default ]; }; - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - flake.setFlakeRegistry = true; - overlays = [ inputs.nur-unstable.overlays.default ]; - }; - sharedSpecialArgs = { - inherit pkgs-unstable repoLocalPath; + inherit repoLocalPath; repoRoot = self; }; @@ -73,7 +60,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit pkgs pkgs-unstable repoLocalPath; + inherit pkgs repoLocalPath; repoRoot = self; }; home-manager.backupFileExtension = "backup"; diff --git a/home/modules/wm/sway/gtk.nix b/home/modules/wm/sway/gtk.nix index d4845b0..7f150a0 100644 --- a/home/modules/wm/sway/gtk.nix +++ b/home/modules/wm/sway/gtk.nix @@ -5,5 +5,6 @@ gtk2.enable = true; gtk3.enable = true; gtk4.enable = true; + gtk4.theme = null; }; } diff --git a/home/modules/wm/sway/shells/default.nix b/home/modules/wm/sway/shells/default.nix index c463034..eff3cf9 100644 --- a/home/modules/wm/sway/shells/default.nix +++ b/home/modules/wm/sway/shells/default.nix @@ -23,8 +23,8 @@ in "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +3%"; "XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -3%"; "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle"; - "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 9"; - "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 3"; + "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 9%+"; + "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 3%-"; "XF86AudioPlay" = "exec playerctl play-pause"; }; }; diff --git a/nixos/hosts/tower/configuration.nix b/nixos/hosts/tower/configuration.nix index a720b56..05aeffa 100644 --- a/nixos/hosts/tower/configuration.nix +++ b/nixos/hosts/tower/configuration.nix @@ -74,6 +74,7 @@ gamemode.enable = true; steam = { enable = true; + gamescopeSession.enable = true; remotePlay.openFirewall = true; extraCompatPackages = [ pkgs.proton-ge-bin ]; package = pkgs.steam.override { diff --git a/nixos/modules/profiles/workstation.nix b/nixos/modules/profiles/workstation.nix index 48c00b2..a290c7a 100644 --- a/nixos/modules/profiles/workstation.nix +++ b/nixos/modules/profiles/workstation.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable, ... }: +{ pkgs, ... }: { boot = { plymouth.enable = true; @@ -59,7 +59,7 @@ pkgs.steam pkgs.krita pkgs.edk2-uefi-shell - pkgs-unstable.obsidian + pkgs.obsidian pkgs.gparted pkgs.vlc pkgs.via diff --git a/nixos/modules/wm/sway.nix b/nixos/modules/wm/sway.nix index 9139724..0269b6b 100644 --- a/nixos/modules/wm/sway.nix +++ b/nixos/modules/wm/sway.nix @@ -16,6 +16,7 @@ seahorse nautilus gamescope + brightnessctl ]; programs = { @@ -50,23 +51,8 @@ binPath = "${pkgs.sway}/bin/sway"; extraArgs = [ "--unsupported-gpu" ]; }; - big_picture = { - prettyName = "Steam Big Picture"; - comment = "Launch in big picture mode within a gamescope container"; - binPath = "${pkgs.gamescope}/bin/gamescope"; - extraArgs = [ - "-e" - "-W 1920" - "-H 1080" - "--" - "/usr/bin/steam" - "-tenfoot" - ]; - }; }; }; - - light.enable = true; dconf.enable = true; seahorse.enable = true; };