homes/josh/home.nix

@@ -32,7 +32,6 @@ with lib;
     package = mkDefault pkgs.nix;
     settings = {
       allowed-users = [ "josh" ];
-      trusted-users = [ "root" "@wheel" "josh" ];
       experimental-features = [
         "nix-command"
         "flakes"

hosts/installation-iso/default.nix

@@ -3,13 +3,23 @@
 }:
 {
   imports = [
-    ../../profiles/desktop
-
     ../../modules/core
-    ../../modules/drivers
     ../../modules/options
 
     ./hardware.nix
     ./host-packages.nix
   ];
+
+  modules.hyprland = {
+    enable = true;
+    terminal = "kitty";
+  };
+
+  modules.plasma.enable = false;
+  modules.displayManager.displayManager = "gdm";
+
+  modules.zsh.enable = true;
+  modules.shell.defaultShell = "zsh";
+
+  modules.pipewire.enable = true;
 }

hosts/vm/default.nix

@@ -3,26 +3,27 @@
 }:
 {
   imports = [
-    ../../profiles/desktop
+    ../../profiles/vm
-
     ../../modules/core
-    ../../modules/drivers
     ../../modules/options
 
     ./hardware.nix
     ./host-packages.nix
   ];
 
-  virtualisation.vmVariant = {
+  modules.hyprland = {
-    virtualisation = {
+    enable = true;
-      memorySize = 8192;
+    terminal = "kitty";
-      cores = 8;
+    launcher = "walker";
-    };
+    monitor = [
+      ",preferred,auto,1"
+    ];
   };
+  modules.plasma.enable = false;
+  modules.displayManager.displayManager = "gdm";
 
-  # drivers.amdgpu.enable = false;
+  modules.zsh.enable = true;
-  # drivers.nvidia.enable = false;
+  modules.shell.defaultShell = "zsh";
-  # drivers.nvidia-prime.enable = false;
+
-  # drivers.intel.enable = false;
+  modules.pipewire.enable = true;
-  vm.guest-services.enable = true;
 }

modules/core/firefox.nix

@@ -9,6 +9,10 @@ let
   pipewireCfg = config.modules.pipewire;
 in
 {
+  programs = {
+    firefox.enable = true;
+  };
+
   # Add wayland screensharing support if PipeWire is enabled
   environment.systemPackages =
     with pkgs;

modules/core/packages.nix

@@ -9,10 +9,8 @@
 
   environment.systemPackages = with pkgs; [
     git
-    home-manager
     tldr
     tmux
-    vim-full
+    vim
-    wl-clipboard
   ];
 }

modules/homes/default.nix

@@ -4,7 +4,6 @@
 {
   imports = [
     ./direnv.nix
-    ./firefox.nix
     ./fzf.nix
     ./hyprland
     ./kitty.nix

modules/homes/firefox.nix

@@ -1,38 +0,0 @@
-{
-  pkgs,
-  username,
-  ...
-}:
-{
-  programs.firefox = {
-    enable = true;
-    package = pkgs.firefox;
-
-    policies = {
-      # Updates & Background Services
-      AppAutoUpdate = false;
-      BackgroundAppUpdate = false;
-
-      # Extensions
-      ExtensionSettings = let
-        moz = short: "https://addons.mozilla.org/firefox/downloads/latest/${short}/latest.xpi";
-      in {
-        "*".installation_mode = "blocked";
-
-        "uBlock0@raymondhill.net" = {
-          install_url = moz "ublock-origin";
-          installation_mode = "force_installed";
-          updates_disabled = true;
-        };
-      };
-
-      profiles = {
-        ${username} = {
-          id = 0;
-          isDefault = true;
-          name = "${username}";
-        };
-      };
-    };
-  };
-}

modules/homes/stylix.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  username,
   ...
 }:
 {
@@ -40,11 +39,5 @@
       name = "Bibata-Modern-Classic";
       size = 24;
     };
-
-    targets = {
-      firefox = {
-        profileNames = [ "${username}" ];
-      };
-    };
   };
 }

modules/options/hyprland.nix

@@ -30,7 +30,7 @@ with lib;
     };
     monitor = mkOption {
       type = types.listOf types.str;
-      default = [ ",preferred,auto,auto" ];
+      default = [ ",preferred,auto,1" ];
       description = ''
         Monitors to use for Hyprland.
       '';

profiles/desktop/default.nix

@@ -2,23 +2,9 @@
   ...
 }:
 {
-  imports = [
+  imports = [ ../../modules/options ];
-    ../../modules/options
-  ];
 
   modules.hyprland = {
     enable = true;
-    terminal = "kitty";
-    launcher = "walker";
-    monitor = [
-      ",preferred,auto,auto"
-    ];
   };
-  modules.plasma.enable = false;
-  modules.displayManager.displayManager = "gdm";
-
-  modules.zsh.enable = true;
-  modules.shell.defaultShell = "zsh";
-
-  modules.pipewire.enable = true;
 }

profiles/vm/default.nix

@@ -0,0 +1,21 @@
+{
+  ...
+}:
+{
+  imports = [
+    ../../modules/drivers
+  ];
+
+  virtualisation.vmVariant = {
+    virtualisation = {
+      memorySize = 8192;
+      cores = 8;
+    };
+  };
+
+  # drivers.amdgpu.enable = false;
+  # drivers.nvidia.enable = false;
+  # drivers.nvidia-prime.enable = false;
+  # drivers.intel.enable = false;
+  vm.guest-services.enable = true;
+}