conf

flake.nix

@@ -62,8 +62,13 @@
       luna = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
-          # > Our main nixos configuration file <
+          ./machines/luna/configuration.nix
-          ./nixos/configuration.nix
+        ];
+      };
+      terra = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs outputs;};
+        modules = [
+          ./machines/terra/configuration.nix
         ];
       };
     };

machines/laptop/update-config.sh

@@ -1,6 +0,0 @@
-#!bin/bash
-
-cd /home/horseman/nix-config
-git pull
-sudo nixos-rebuild switch --flake .#laptop-koen
-exit 0

machines/luna/configuration.nix

@@ -31,7 +31,7 @@
     extraSpecialArgs = { inherit inputs outputs; };
     users = {
       # Import your home-manager configuration
-      horseman = import ../home-manager/home.nix;
+      horseman = import ../../home-manager/home.nix;
     };
   };
 
@@ -82,7 +82,7 @@
     auto-optimise-store = true;
   };
 
-  networking.hostName = "laptop-koen";
+  networking.hostName = "luna";
 
   # time.timeZone = "Europe/Amsterdam";
 

machines/luna/hardware-configuration.nix

@@ -8,23 +8,23 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/4c50d5fb-2734-4acf-9aa9-daa4dbd8c982";
+    { device = "/dev/disk/by-uuid/5b1cef65-3c1b-4c46-b117-20271902390f";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7FE8-93C8";
+    { device = "/dev/disk/by-uuid/0433-B98A";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/1a5004e0-dfcb-4986-aa3d-e2cc9e81f70b"; }
+    [ { device = "/dev/disk/by-uuid/6fbb72cf-415f-48f8-a850-5d91f6e7dae7"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -36,6 +36,5 @@
   # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

machines/pc/update-config.sh

@@ -1,6 +0,0 @@
-#!bin/bash
-
-cd /home/horseman/nix-config
-git pull
-sudo nixos-rebuild switch --flake .#pc-koen
-exit 0

machines/terra/configuration.nix

@@ -74,7 +74,7 @@
     extraSpecialArgs = { inherit inputs outputs; };
     users = {
       # Import your home-manager configuration
-      horseman = import ../home-manager/home.nix;
+      horseman = import ../../home-manager/home.nix;
     };
   };
 
@@ -125,7 +125,7 @@
     auto-optimise-store = true;
   };
 
-  networking.hostName = "pc-koen";
+  networking.hostName = "terra";
 
   # time.timeZone = "Europe/Amsterdam";
 
@@ -136,24 +136,6 @@
   services.xserver.displayManager.gdm.enable = true;
   boot.loader.systemd-boot.enable = true;  
 
-  systemd.timers."update-config" = {
-    wantedBy = [ "timers.target" ];
-    timerConfig = {
-      OnBootSec = "1m";
-      Unit = "update-config.service";
-    };
-  };
-
-  systemd.services."update-config" = {
-    script = ''
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-    };
-  };
-
-
   # TODO: Configure your system-wide user settings (groups, etc), add more users as needed.
   users.users = {
     horseman = {