Start separating home-manager from nixos config for better portability

nixos/common.nix

@@ -1,27 +1,17 @@
-{ ... }:
+{ pkgs, ... }:
-
-let
-  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-in
-
 {
-  imports = [
-    (import "${home-manager}/nixos")
-    ./cachix.nix
-  ];
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  home-manager.useUserPackages = false;
-  home-manager.useGlobalPkgs = false;
-
   # Enable networking
   networking.networkmanager.enable = true;
 
   # Enable power-profiles
   services.power-profiles-daemon.enable = true;
 
+  environment.systemPackages = with pkgs; [home-manager];
+
+
   programs.ssh.startAgent = true;
   programs.fish.enable = true;
   programs.zsh = {

nixos/desktop/default.nix

@@ -3,11 +3,13 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-  environment.systemPackages = [
+  programs.dconf.enable = true;
-    pkgs.pavucontrol
+
-    pkgs.pamixer
+  # environment.systemPackages = [
-    pkgs.pulseaudio
+  #   pkgs.pavucontrol
-  ];
+  #   pkgs.pamixer
+  #   pkgs.pulseaudio
+  # ];
 
   # Enable sound with pipewire.
   sound.enable = true;

nixos/desktop/plasma.nix

@@ -9,6 +9,7 @@
 
   # Enable the KDE Plasma Desktop Environment.
   services.xserver.desktopManager.plasma5.enable = true;
+  services.xserver.displayManager.defaultSession = "plasma";
 
   programs.kdeconnect.enable = true;
 

nixos/home-manager/packages/gui/browser-wayland.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [ ./browser.nix ];
+  programs.chromium.enable = true;
   programs.chromium.commandLineArgs = [
     "--enable-features=UseOzonePlatform"
     "--ozone-platform=wayland"

nixos/home-manager/packages/gui/browser.nix

@@ -2,5 +2,4 @@
 {
   imports = [ ./common.nix ];
   programs.firefox.enable = true;
-  programs.chromium.enable = true;
 }

nixos/home-manager/vanguard-xenia.nix

@@ -1,12 +1,11 @@
 { ... }: {
   imports = [
-    ./env/hyprland.nix
+    ./env/gtk.nix
-    ./env/sway.nix
+    ./env/xresources.nix
     ./packages/env
     ./packages/tui
     ./packages/gui/browser.nix
     ./packages/gui/cloud.nix
-    ./packages/gui/foot.nix
     ./packages/gui/gaming.nix
     ./packages/gui/kitty.nix
     ./packages/gui/messaging.nix
@@ -21,10 +20,5 @@
     userEmail = "evie@xenia.me.uk";
   };
 
-  wayland.windowManager.hyprland.extraConfig =
-    builtins.readFile (./env/config/hypr/macchiato.conf) + "\n"
-    + builtins.readFile (./env/config/hypr/hyprland.conf) + "\n"
-    + builtins.readFile (./env/config/hypr/hyprland-vanguard.conf);
-
   home.stateVersion = "22.11";
 }

nixos/vanguard-xenia.nix

@@ -4,7 +4,7 @@
   imports = [
     ./common.nix
     ./locales/en_GB.nix
-    ./desktop/hyprland.nix
+    ./desktop/plasma.nix
   ];
 
   networking.hostName = "Vanguard"; # Define your hostname.
@@ -31,7 +31,7 @@
   };
 
   # Set up home manager for user
-  home-manager.users.xenia = import ./home-manager/vanguard-xenia.nix;
+  # home-manager.users.xenia = import ./home-manager/vanguard-xenia.nix;
 
   # Extra hardware configuration
   # For Steam support