flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745557122,
-        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
+        "lastModified": 1744743431,
+        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
+        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1745955289,
-        "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
+        "lastModified": 1744633460,
+        "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
+        "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1745930157,
-        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "lastModified": 1744463964,
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745921652,
-        "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
+        "lastModified": 1744440957,
+        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
+        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
         "type": "github"
       },
       "original": {

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;
 }

hostHelper.nix

@@ -1,14 +1,9 @@
-inArgs: hostname: hostOptions:
-let
-  nixosSystem =
-    if (hostOptions ? unstable && hostOptions.unstable)
-      then inArgs.nixos-unstable.lib.nixosSystem
-      else inArgs.nixpkgs.lib.nixosSystem;
-in
-  nixosSystem {
+inArgs: hostname: {
+  ${hostname} = inArgs.nixpkgs.lib.nixosSystem {
     specialArgs = {inherit inArgs;};
     modules = [
       {networking.hostName = hostname;}
       (./hosts/${hostname})
     ];
+  };
 }

hosts/crocoite/default.nix

@@ -5,6 +5,8 @@
   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
@@ -32,9 +34,9 @@
       #   });
       # })
     ];
-
     # Configure your nixpkgs instance
     config = {
+      # Disable if you don't want unfree packages
       allowUnfree = true;
     };
   };

hosts/game-luanti/default.nix

@@ -1,41 +0,0 @@
-{
-  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.<interface>.useDHCP`.
-      networking.useDHCP = lib.mkDefault true;
-      # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
-    }
-  ];
-}

hosts/game-luanti/hardware-configuration.nix

@@ -1,6 +0,0 @@
-{
-  lib,
-  ...
-}: {
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}

modules/game/server/luanti/default.nix

@@ -1,5 +0,0 @@
-{...}: {
-  services.minetest = {
-    enable = true;
-  };
-}

modules/software/default.nix

@@ -10,6 +10,7 @@
     ./obs-studio.nix
     ./packages.nix
     ./programs.nix
+    ./shell.nix
     ./virt.nix
   ];
 }

modules/software/shells/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
-    ./fish.nix
-    ./shell.nix
     ./zsh.nix
+    ./fish.nix
   ];
 }

modules/software/shells/fish.nix

@@ -11,4 +11,5 @@
     direnv.enableFishIntegration = true;
     foot.enableFishIntegration = true;
   };
+  environment.systemPackages = [pkgs.starship];
 }

outputs.nix

@@ -9,18 +9,15 @@ 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 = builtins.mapAttrs (hostName: hostOptions: (hostHelper hostName hostOptions)) {
-    crocoite = {};
-    game-luanti = {unstable = true;};
-  };
+
+  nixosConfigurations =
+    (hostHelper "crocoite"); #// (host_helper2 "jitsi");
 
   # Your custom packages
   # Accessible through 'nix build', 'nix shell', etc
@@ -36,6 +33,4 @@ 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);
 }

system_profiles/mini-container.nix

@@ -1,10 +0,0 @@
-{
-  imports = [
-    ./mini.nix
-
-    {
-      boot.isContainer = true;
-      boot.kernel.enable = false;
-    }
-  ];
-}

system_profiles/mini.nix

@@ -1,21 +0,0 @@
-{
-  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")
-  ];
-}