We ball (returning to unstable)

This commit is contained in:
alisceon 2026-04-09 11:38:52 +02:00
parent 4d8de41daf
commit abe8ff6eff
7 changed files with 40 additions and 126 deletions

117
flake.lock generated
View file

@ -122,27 +122,6 @@
} }
}, },
"flake-parts_2": { "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": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"stylix", "stylix",
@ -203,16 +182,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775077333, "lastModified": 1775683737,
"narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -224,11 +202,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1775185059, "lastModified": 1775703388,
"narHash": "sha256-3d9gBmLMfI9d5xwfbd9Zr5JwpQzZ27qw9NiRjJ2aB28=", "narHash": "sha256-q2OBj67rcfKFSuUB1OApJdseF75T7cOpUjPJkZCYN7M=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "f5d7077eb578b9e321b74329bd0625d5569dc90e", "rev": "fffe21e97a9cb0a1ebcf1baa17a423d2517bb1f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,13 +231,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1775036866, "lastModified": 1775423009,
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -269,22 +247,6 @@
"type": "github" "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": { "noctalia": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -295,11 +257,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775309721, "lastModified": 1775689927,
"narHash": "sha256-yZIMJhv1Jg2I1bsag/chncl4nb/5pkrEKVwpkOqJqpI=", "narHash": "sha256-UVL4JnAHXs90AiKfhjXBQ83KhiXHAyZ4TdaPkA/ts/g=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"rev": "819b2d33b04b2180b6ef19dab7f86af7d3603a52", "rev": "0fcaa49875bf0c994bb5c604320454ef72e6ba8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -317,11 +279,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1775135550, "lastModified": 1775491791,
"narHash": "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=", "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-qs", "repo": "noctalia-qs",
"rev": "e7224b756dcd10eec040df818a4c7a0fda5d6eff", "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -338,32 +300,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775321535, "lastModified": 1775726673,
"narHash": "sha256-GC3gqbwvZSUuybzjsr+KrlmDgF0KPWvqG5pjV8UzjUE=", "narHash": "sha256-0dX/lqOM+++P/dNFwFqxge7qxVi4lAtdkz9GTlrIsfQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "77f938ed32135f6e833f9de7694dd758dd1a976f", "rev": "b2808bf49662138a377821820cb069b622bf633f",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +343,9 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"noctalia": "noctalia", "noctalia": "noctalia",
"noctalia-qs": "noctalia-qs", "noctalia-qs": "noctalia-qs",
"nur": "nur", "nur": "nur",
"nur-unstable": "nur-unstable",
"stylix": "stylix" "stylix": "stylix"
} }
}, },
@ -417,7 +356,7 @@
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -430,15 +369,15 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1775247334, "lastModified": 1775429060,
"narHash": "sha256-eVKt8wpQqg6Hq/UdHQkV1izXGloGQxdlE4SSk9/X27s=", "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=",
"owner": "danth", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "6d0502ef7447090abf8b00362b5cda8ac64595b4", "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@ -560,11 +499,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773297127, "lastModified": 1775125835,
"narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "rev": "75925962939880974e3ab417879daffcba36c4a3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,22 +2,17 @@
description = "NixOS configuration for all hosts"; description = "NixOS configuration for all hosts";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nur = { nur = {
url = "github:nix-community/NUR"; url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur-unstable = {
url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix"; url = "github:nix-community/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
noctalia = { noctalia = {
@ -35,7 +30,6 @@
outputs = inputs @ { outputs = inputs @ {
self, self,
nixpkgs, nixpkgs,
nixpkgs-unstable,
... ...
}: }:
let let
@ -53,15 +47,8 @@
overlays = [ inputs.nur.overlays.default ]; 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 = { sharedSpecialArgs = {
inherit pkgs-unstable repoLocalPath; inherit repoLocalPath;
repoRoot = self; repoRoot = self;
}; };
@ -73,7 +60,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit pkgs pkgs-unstable repoLocalPath; inherit pkgs repoLocalPath;
repoRoot = self; repoRoot = self;
}; };
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";

View file

@ -5,5 +5,6 @@
gtk2.enable = true; gtk2.enable = true;
gtk3.enable = true; gtk3.enable = true;
gtk4.enable = true; gtk4.enable = true;
gtk4.theme = null;
}; };
} }

View file

@ -23,8 +23,8 @@ in
"XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +3%"; "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +3%";
"XF86AudioLowerVolume" = "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"; "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 9"; "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 9%+";
"XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 3"; "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 3%-";
"XF86AudioPlay" = "exec playerctl play-pause"; "XF86AudioPlay" = "exec playerctl play-pause";
}; };
}; };

View file

@ -74,6 +74,7 @@
gamemode.enable = true; gamemode.enable = true;
steam = { steam = {
enable = true; enable = true;
gamescopeSession.enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
extraCompatPackages = [ pkgs.proton-ge-bin ]; extraCompatPackages = [ pkgs.proton-ge-bin ];
package = pkgs.steam.override { package = pkgs.steam.override {

View file

@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, ... }: { pkgs, ... }:
{ {
boot = { boot = {
plymouth.enable = true; plymouth.enable = true;
@ -59,7 +59,7 @@
pkgs.steam pkgs.steam
pkgs.krita pkgs.krita
pkgs.edk2-uefi-shell pkgs.edk2-uefi-shell
pkgs-unstable.obsidian pkgs.obsidian
pkgs.gparted pkgs.gparted
pkgs.vlc pkgs.vlc
pkgs.via pkgs.via

View file

@ -16,6 +16,7 @@
seahorse seahorse
nautilus nautilus
gamescope gamescope
brightnessctl
]; ];
programs = { programs = {
@ -50,23 +51,8 @@
binPath = "${pkgs.sway}/bin/sway"; binPath = "${pkgs.sway}/bin/sway";
extraArgs = [ "--unsupported-gpu" ]; 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; dconf.enable = true;
seahorse.enable = true; seahorse.enable = true;
}; };