hosts/home/home_common.nix

@@ -1,35 +0,0 @@
-{ config, pkgs, inputs, ... }:
-
-{
-  home = {
-    username = "k";
-    homeDirectory = "/home/k";
-    stateVersion = "23.11";
-    enableNixpkgsReleaseCheck = false;
-  };
-  programs = {
-    git = {
-      enable = true;
-      userName = "k";
-      userEmail = "markers711@gmail.com";
-    };
-    starship.enable = true;
-    zsh = {
-      enable = true;
-      autosuggestion.enable = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      autocd = true;
-      plugins = [{
-        name = "zsh-nix-shell";
-        file = "nix-shell.plugin.zsh";
-        src = pkgs.fetchFromGitHub {
-          owner = "chisui";
-          repo = "zsh-nix-shell";
-          rev = "v0.8.0";
-          sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-        };
-      }];
-    };
-  };
-}

hosts/laptop/configuration.nix

@@ -8,7 +8,6 @@
   time.timeZone = "America/New_York";
   security.rtkit.enable = true;
   powerManagement.enable = true;
-  virtualisation.waydroid.enable = true;
 
   nix = {
     settings.experimental-features = [ "nix-command" "flakes" ];
@@ -59,11 +58,7 @@
     enable = true;
     polarity = "light";
     image = ./wallpaper.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/brushtrees.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml";
-    opacity = {
-    terminal = .85;
-    popups = .75;
-    };
     cursor = {
       package = pkgs.adwaita-icon-theme;
       name = "Adwaita";
@@ -98,9 +93,8 @@
     packages = with pkgs; [ zsh ];
     shell = pkgs.zsh;
   };
-
+  
   home-manager = {
-    backupFileExtension = "bk";
     users = { "k" = import ./home.nix; };
   };
 
@@ -136,24 +130,6 @@
     ];
   };
 
-  boot = {
-
-    plymouth = { enable = true; };
-
-    consoleLogLevel = 0;
-    initrd.verbose = false;
-    kernelParams = [
-      "quiet"
-      "splash"
-      "boot.shell_on_fail"
-      "loglevel=3"
-      "rd.systemd.show_status=false"
-      "rd.udev.log_level=3"
-      "udev.log_priority=3"
-    ];
-    loader.timeout = 0;
-  };
-
   # 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

hosts/laptop/hardware-configuration.nix

@@ -4,26 +4,28 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
-    [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/a7301069-c11f-411e-9a23-446744c3ae76";
+    { device = "/dev/disk/by-uuid/a7301069-c11f-411e-9a23-446744c3ae76";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/19F3-CD7E";
+    { device = "/dev/disk/by-uuid/19F3-CD7E";
-    fsType = "vfat";
+      fsType = "vfat";
-  };
+    };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/d9df94a1-5088-468c-839d-f4cd10cb7e5f"; }];
+    [ { device = "/dev/disk/by-uuid/d9df94a1-5088-468c-839d-f4cd10cb7e5f"; }
+    ];
 
   # 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
@@ -33,8 +35,7 @@
   # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode =
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;

hosts/laptop/home.nix

@@ -1,16 +1,14 @@
 { config, pkgs, inputs, ... }:
 
 {
-  imports = [
-     ../home/home_common.nix
-  ];
-
-  stylix.enable = true;
-
   nixpkgs.config.allowUnfree = true;
-  
+
   home = {
-    packages = with pkgs; [
+    username = "k";
+    homeDirectory = "/home/k";
+    stateVersion = "23.11";
+    enableNixpkgsReleaseCheck = false;
+    packages = with pkgs;[
       nerdfonts
       firefox
       keepassxc
@@ -24,17 +22,40 @@
 
       modrinth-app
       direnv
-      emacs
-      syncthing
     ];
   };
 
   programs = {
+    git = {
+      enable = true;
+      userName = "k";
+      userEmail = "markers711@gmail.com";
+    };
+
     direnv = {
       enable = true;
       enableZshIntegration = true;
       nix-direnv.enable = true;
     };
+
+    starship.enable = true;
+    zsh = {
+      enable = true;
+      autosuggestion.enable = true;
+      enableCompletion = true;
+      syntaxHighlighting.enable = true;
+      autocd = true;
+      plugins = [{
+        name = "zsh-nix-shell";
+        file = "nix-shell.plugin.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "chisui";
+          repo = "zsh-nix-shell";
+          rev = "v0.8.0";
+          sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
+        };
+      }];
+    };
   };
 
   services = {