flake.nix

@@ -22,17 +22,23 @@
     # Available through 'nixos-rebuild --flake .#your-hostname'
     nixosConfigurations = {
       # FIXME_ replace with your hostname
-      nixos-desktop-mans = nixpkgs.lib.nixosSystem {
+      nixos-mans = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; }; # Pass flake inputs to our config
         # > Our main nixos configuration file <
-        modules = [ ./nixos/machines/nixos-desktop-mans/configuration.nix ];
+        modules = [ ./nixos/configuration.nix ];
+      };
     };
 
-      nixos-laptop-mans = nixpkgs.lib.nixosSystem {
+    # Standalone home-manager configuration entrypoint
-        specialArgs = { inherit inputs; }; # Pass flake inputs to our config
+    # Available through 'home-manager --flake .#your-username@your-hostname'
-        # > Our main nixos configuration file <
+    # homeConfigurations = {
-        modules = [ ./nixos/machines/nixos-laptop-mans/configuration.nix ];
+    #   # FIXME_ replace with your username@hostname
-      };
+    #   "mans@nixos-mans" = home-manager.lib.homeManagerConfiguration {
-    };
+    #     pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+    #     extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
+    #     # > Our main home-manager configuration file <
+    #     modules = [ ./home-manager/home.nix ];
+    #   };
+    # };
   };
 }

nixos/configuration.nix

@@ -12,7 +12,7 @@
     # You can also split up your configuration and import pieces of it here:
     # ./users.nix
     ./network.nix
-    ../../roles/desktop.nix
+    ./i3.nix
 
     # Import home-manager's NixOS module
     inputs.home-manager.nixosModules.home-manager
@@ -149,7 +149,7 @@
     extraSpecialArgs = { inherit inputs; };
     users = {
       # Import your home-manager configuration
-      mans = import ../../../home-manager/home.nix;
+      mans = import ../home-manager/home.nix;
     };
   };
 

nixos/machines/nix-desktop-mans/configuration.nix

@@ -12,7 +12,7 @@
     # You can also split up your configuration and import pieces of it here:
     # ./users.nix
     ./network.nix
-    ../../roles/desktop.nix
+    ./i3.nix
 
     # Import home-manager's NixOS module
     inputs.home-manager.nixosModules.home-manager
@@ -127,12 +127,6 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    wget
-    neovim
-    openssl
-  ];  
-
   # This setups a SSH server. Very important if you're setting up a headless system.
   # Feel free to remove if you don't need it.
   services.openssh = {
@@ -149,7 +143,7 @@
     extraSpecialArgs = { inherit inputs; };
     users = {
       # Import your home-manager configuration
-      mans = import ../../../home-manager/home.nix;
+      mans = import ../home-manager/home.nix;
     };
   };
 

nixos/machines/nixos-laptop-mans/network.nix

@@ -1,21 +0,0 @@
-# networking.nix
-
-# Import the necessary modules
-{ config, pkgs, ... }:
-
-{
-  # Set the network interface configuration
-  # networking.interfaces.eth0.useDHCP = true;
-
-  networking.networkmanager.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ 22 ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-
-  # Set the hostname
-  networking.hostName = "nixos-laptop-mans";
-}

nixos/network.nix

@@ -17,5 +17,5 @@
 
 
   # Set the hostname
-  networking.hostName = "nixos-desktop-mans";
+  networking.hostName = "nixos-mans";
 }

nixos/roles/base.nix

@@ -1,12 +0,0 @@
-# Module arguments which our system can use to refer to its own configuration
-{ config, lib, pkgs, ... }:
-{
-  imports = [
-  ];
-
-  options = {
-  };
-
-  config = {
-  };
-}

nixos/roles/desktop.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  imports = [
-    ../modules/i3.nix
-  ];
-
-  options = {
-  };
-
-  config = {
-  };
-}

nixos/roles/server.nix

@@ -1,12 +0,0 @@
-# Module arguments which our system can use to refer to its own configuration
-{ config, lib, pkgs, ... }:
-{
-  imports = [
-  ];
-
-  options = {
-  };
-
-  config = {
-  };
-}

update.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-sudo nixos-rebuild switch --flake .#$(hostname)
+sudo nixos-rebuild switch --flake .#nixos-mans