Merge pull request 'Update 6-29-23' (#7) from update-6-29-23 into master

Reviewed-on: #7

flake.lock

@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687555006,
-        "narHash": "sha256-GD2Kqb/DXQBRJcHqkM2qFZqbVenyO7Co/80JHRMg2U0=",
+        "lastModified": 1687829761,
+        "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33223d479ffde3d05ac16c6dff04ae43cc27e577",
+        "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206",
         "type": "github"
       },
       "original": {

flake.nix

@@ -14,7 +14,6 @@
         modules = [
           ./hardware/nixos-bootstrap.nix
           ./configs/desktop.nix
-          ./hosts/nixos-bootstrap.nix
           ./users/wesley.nix
           home-manager.nixosModules.home-manager
           {
@@ -22,7 +21,6 @@
             home-manager.useUserPackages = true;
             home-manager.users.wesley = import ./home/wesley.nix;
           }
-          ./updates/no-restart.nix
         ];
       };
       "steiner" = nixpkgs.lib.nixosSystem {
@@ -30,15 +28,13 @@
         modules = [
           ./hardware/steiner.nix
           ./configs/desktop.nix
-          ./hosts/steiner.nix
           ./users/wesley.nix
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages=true;
+            home-manager.useUserPackages = true;
             home-manager.users.wesley = import ./home/wesley-steiner.nix;
           }
-          ./updates/no-restart.nix
         ];
       };
     };

hardware/nixos-bootstrap.nix

@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    [
+      (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
@@ -14,12 +15,14 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/544f57e2-71e0-433b-8afe-305610bb4a6b";
+    {
+      device = "/dev/disk/by-uuid/544f57e2-71e0-433b-8afe-305610bb4a6b";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DE9E-321B";
+    {
+      device = "/dev/disk/by-uuid/DE9E-321B";
       fsType = "vfat";
     };
 
@@ -32,5 +35,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
 
+  networking.hostName = "nixos-bootstrap"; # Define your hostname.
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

hardware/steiner.nix

@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@@ -14,25 +15,27 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004";
+    {
+      device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/8357-3C1B";
+    {
+      device = "/dev/disk/by-uuid/8357-3C1B";
       fsType = "vfat";
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004";
+    {
+      device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004";
       fsType = "btrfs";
       options = [ "subvol=@home" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/fb41410e-80cd-427b-8040-e9acb57b3ce5"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/fb41410e-80cd-427b-8040-e9acb57b3ce5"; }];
 
   # 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
@@ -42,6 +45,8 @@
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
 
+  networking.hostName = "steiner"; # Define your hostname.
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/nixos-bootstrap.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  networking.hostName = "nixos-bootstrap"; # Define your hostname.
-}

hosts/steiner.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  networking.hostName = "steiner"; # Define your hostname.
-}

updates/no-restart.nix

@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Enable automatic updates
-  system.autoUpgrade.enable = true;
-  # Automatically restart after update
-  #system.autoUpgrade.allowReboot = true;
-}
-