diff options
| -rw-r--r-- | config/default.nix | 2 | ||||
| -rw-r--r-- | config/hardware/default.nix | 21 | ||||
| -rw-r--r-- | flake.lock | 50 | ||||
| -rw-r--r-- | flake.nix | 63 |
4 files changed, 71 insertions, 65 deletions
diff --git a/config/default.nix b/config/default.nix index db94c34..e76dbd6 100644 --- a/config/default.nix +++ b/config/default.nix @@ -20,5 +20,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "25.05"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/config/hardware/default.nix b/config/hardware/default.nix index 06555f7..26f503e 100644 --- a/config/hardware/default.nix +++ b/config/hardware/default.nix @@ -7,7 +7,8 @@ # blankscreen {force, poke} let blankscreen = "echo 0 > /sys/class/backlight/intel_backlight/brightness; setterm -term linux -blank </dev/tty1"; -in { +in +{ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -24,24 +25,24 @@ in { sound.enable = false; }; - services.logind = { + services.logind.settings.Login = { # don't suspend on lid close - lidSwitch = "ignore"; - lidSwitchExternalPower = "ignore"; - lidSwitchDocked = "ignore"; + HandleLidSwitchDocked = "ignore"; + HandleLidSwitchExternalPower = "ignore"; + HandleLidSwitch = "ignore"; }; - environment.shellAliases = {inherit blankscreen;}; + environment.shellAliases = { inherit blankscreen; }; systemd = { - suppressedSystemUnits = ["systemd-backlight@.service"]; + suppressedSystemUnits = [ "systemd-backlight@.service" ]; services.blankscreen = { description = "Shut down screen"; - path = [pkgs.util-linux]; + path = [ pkgs.util-linux ]; script = '' ${blankscreen} force ''; - wantedBy = ["default.target"]; - after = ["multi-user.target"]; + wantedBy = [ "default.target" ]; + after = [ "multi-user.target" ]; }; }; } @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1760786153, - "narHash": "sha256-LoAvpP6vyVHWiNpF6DY//Dy5GZN02gi6xuzELk4mVGM=", + "lastModified": 1764534782, + "narHash": "sha256-mk+5T/pgFqDrPyxdH2zhxZNKMdpyeuCTUMgrmK/nzcw=", "owner": "qaristote", "repo": "my-nixpkgs", - "rev": "30117aa8b7d69213d6ab0afbb9f73b905968937d", + "rev": "e6d25dc678fa289ba488907e3cd49f2f8c330680", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760958188, - "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1763464769, + "narHash": "sha256-AJHrsT7VoeQzErpBRlLJM1SODcaayp0joAoEA35yiwM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "6f374686605df381de8541c072038472a5ea2e2d", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -120,16 +120,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "lastModified": 1764494334, + "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "rev": "d542db745310b6929708d9abea513f3ff19b1341", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -140,11 +140,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1759064577, - "narHash": "sha256-v/M19hUHp+FBFAzLx22FejbAQeW7xEAKmEab5Ou+N1s=", + "lastModified": 1763548027, + "narHash": "sha256-Y6ql4MrEMqZOtqYW/1361v47X0FMV37Ae4a5o2fFuyA=", "owner": "nix-community", "repo": "NUR", - "rev": "234a8ff556a8995692152f1b0a7d1ee89096ad54", + "rev": "05225766ee3843d0720554ab1c930606092c24c5", "type": "github" }, "original": { @@ -1,37 +1,42 @@ { inputs = { my-nixpkgs.url = "github:qaristote/my-nixpkgs"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; }; - outputs = { - nixpkgs, - my-nixpkgs, - nixos-hardware, - ... - }: { - nixosConfigurations = let - system = "x86_64-linux"; - commonModules = [ - my-nixpkgs.nixosModules.personal - ({...}: { - nixpkgs.overlays = [ - my-nixpkgs.overlays.personal + outputs = + { + nixpkgs, + my-nixpkgs, + nixos-hardware, + ... + }: + { + nixosConfigurations = + let + system = "x86_64-linux"; + commonModules = [ + my-nixpkgs.nixosModules.personal + ( + { ... }: + { + nixpkgs.overlays = [ + my-nixpkgs.overlays.personal + ]; + } + ) ]; - }) - ]; - in { - hephaistos = nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = {inherit nixos-hardware;}; - modules = - commonModules - ++ [./config]; - }; - hephaistos-test = nixpkgs.lib.nixosSystem { - inherit system; - modules = commonModules ++ [./tests/configuration.nix]; - }; + in + { + hephaistos = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { inherit nixos-hardware; }; + modules = commonModules ++ [ ./config ]; + }; + hephaistos-test = nixpkgs.lib.nixosSystem { + inherit system; + modules = commonModules ++ [ ./tests/configuration.nix ]; + }; + }; }; - }; } |