diff --git a/flake.lock b/flake.lock index 6628996..1a6f95b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745921652, + "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index eea0daf..6ac302d 100644 --- a/flake.nix +++ b/flake.nix @@ -24,5 +24,5 @@ nix-flatpak.url = "github:gmodena/nix-flatpak"; }; - outputs = {...}@inArgs: import ./outputs.nix inArgs; + outputs = inArgs: import ./outputs.nix inArgs; } diff --git a/hostHelper.nix b/hostHelper.nix index 500d93b..2bca73c 100644 --- a/hostHelper.nix +++ b/hostHelper.nix @@ -1,9 +1,14 @@ -inArgs: hostname: { - ${hostname} = inArgs.nixpkgs.lib.nixosSystem { +inArgs: hostname: hostOptions: +let + nixosSystem = + if (hostOptions ? unstable && hostOptions.unstable) + then inArgs.nixos-unstable.lib.nixosSystem + else inArgs.nixpkgs.lib.nixosSystem; +in + nixosSystem { specialArgs = {inherit inArgs;}; modules = [ {networking.hostName = hostname;} (./hosts/${hostname}) ]; - }; -} + } diff --git a/hosts/crocoite/default.nix b/hosts/crocoite/default.nix index 1929622..4c9d95e 100644 --- a/hosts/crocoite/default.nix +++ b/hosts/crocoite/default.nix @@ -5,8 +5,6 @@ nixos-unstable, ... }: { - #networking.hostName = "crocoite"; # Define your hostname. - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave @@ -34,9 +32,9 @@ # }); # }) ]; + # Configure your nixpkgs instance config = { - # Disable if you don't want unfree packages allowUnfree = true; }; }; diff --git a/hosts/game-luanti/default.nix b/hosts/game-luanti/default.nix new file mode 100644 index 0000000..4966862 --- /dev/null +++ b/hosts/game-luanti/default.nix @@ -0,0 +1,41 @@ +{ + pkgs, + lib, + modulesPath, + ... +}: { + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # 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? + + nixpkgs.config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + nix.settings.experimental-features = ["nix-command" "flakes"]; + + # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, + # focused on correctness, usability, and growth – + # and committed to doing right by its community. + nix.package = pkgs.lix; + + imports = [ + ./hardware-configuration.nix + + ../../modules/locale.nix + + ../../system_profiles/mini.nix + { + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.ens18.useDHCP = lib.mkDefault true; + } + ]; +} diff --git a/hosts/game-luanti/hardware-configuration.nix b/hosts/game-luanti/hardware-configuration.nix new file mode 100644 index 0000000..1a421a1 --- /dev/null +++ b/hosts/game-luanti/hardware-configuration.nix @@ -0,0 +1,6 @@ +{ + lib, + ... +}: { + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/modules/game/server/luanti/default.nix b/modules/game/server/luanti/default.nix new file mode 100644 index 0000000..06628ea --- /dev/null +++ b/modules/game/server/luanti/default.nix @@ -0,0 +1,5 @@ +{...}: { + services.minetest = { + enable = true; + }; +} diff --git a/modules/software/default.nix b/modules/software/default.nix index 792d1b1..2ffa239 100644 --- a/modules/software/default.nix +++ b/modules/software/default.nix @@ -10,7 +10,6 @@ ./obs-studio.nix ./packages.nix ./programs.nix - ./shell.nix ./virt.nix ]; } diff --git a/modules/software/shells/default.nix b/modules/software/shells/default.nix index 1991480..c042f4d 100644 --- a/modules/software/shells/default.nix +++ b/modules/software/shells/default.nix @@ -1,6 +1,7 @@ { imports = [ - ./zsh.nix ./fish.nix + ./shell.nix + ./zsh.nix ]; } diff --git a/modules/software/shells/fish.nix b/modules/software/shells/fish.nix index b3bb8cd..1d8a994 100644 --- a/modules/software/shells/fish.nix +++ b/modules/software/shells/fish.nix @@ -11,5 +11,4 @@ direnv.enableFishIntegration = true; foot.enableFishIntegration = true; }; - environment.systemPackages = [pkgs.starship]; } diff --git a/modules/software/shell.nix b/modules/software/shells/shell.nix similarity index 100% rename from modules/software/shell.nix rename to modules/software/shells/shell.nix diff --git a/outputs.nix b/outputs.nix index 54c4152..e7e3299 100644 --- a/outputs.nix +++ b/outputs.nix @@ -9,15 +9,18 @@ inArgs: let # pass to it, with each system as an argument forAllSystems = inArgs.nixpkgs.lib.genAttrs systems; + lib = inArgs.nixpkgs.lib; + hostHelper = import ./hostHelper.nix inArgs; in { # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' # to add more append // (host_helper example); - - nixosConfigurations = - (hostHelper "crocoite"); #// (host_helper2 "jitsi"); + nixosConfigurations = builtins.mapAttrs (hostName: hostOptions: (hostHelper hostName hostOptions)) { + crocoite = {}; + game-luanti = {unstable = true;}; + }; # Your custom packages # Accessible through 'nix build', 'nix shell', etc @@ -33,4 +36,6 @@ in { # Formatter for your nix files, available through 'nix fmt' # Other options beside 'alejandra' include 'nixpkgs-fmt' formatter = forAllSystems (system: inArgs.nixpkgs.legacyPackages.${system}.alejandra); + + #checks = forAllSystems (system: inArgs(hostHelper "crocoite").system.build.toplevel); } diff --git a/system_profiles/mini-container.nix b/system_profiles/mini-container.nix new file mode 100644 index 0000000..498bbb2 --- /dev/null +++ b/system_profiles/mini-container.nix @@ -0,0 +1,10 @@ +{ + imports = [ + ./mini.nix + + { + boot.isContainer = true; + boot.kernel.enable = false; + } + ]; +} diff --git a/system_profiles/mini.nix b/system_profiles/mini.nix new file mode 100644 index 0000000..70c1639 --- /dev/null +++ b/system_profiles/mini.nix @@ -0,0 +1,21 @@ +{ + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/minimal.nix") + (modulesPath + "/profiles/perlless.nix") + + { + boot.isContainer = true; + boot.kernel.enable = false; + environment.defaultPackages = []; + nixpkgs.overlays = [(self: super: {})]; + } + ]; + + disabledModules = [ + (modulesPath + "/profiles/all-hardware.nix") + (modulesPath + "/profiles/base.nix") + ]; +}