one more fix

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "dotfiles/config/taffybar/taffybar"]
 	path = dotfiles/config/taffybar/taffybar
-	url = ../../taffybar/taffybar.git
+	url = git@github.com:taffybar/taffybar.git
 [submodule "dotfiles/xmonad/xmonad"]
 	path = dotfiles/config/xmonad/xmonad
-	url = ../xmonad.git
+	url = git@github.com:xmonad/xmonad.git
 [submodule "dotfiles/xmonad/xmonad-contrib"]
 	path = dotfiles/config/xmonad/xmonad-contrib
-	url = ../xmonad-contrib.git
+	url = git@github.com:xmonad/xmonad-contrib.git
 [submodule "dotfiles/config/alacritty/themes"]
 	path = dotfiles/config/alacritty/themes
 	url = https://github.com/alacritty/alacritty-theme

nixos/configuration.nix

@@ -3,8 +3,8 @@
   imports = [
     ./android.nix
     ./base.nix
-    ./cache.nix
     ./cache-server.nix
+    ./cache.nix
     ./code.nix
     ./desktop.nix
     ./environment.nix
@@ -12,8 +12,9 @@
     ./extra.nix
     ./games.nix
     ./git-sync.nix
-    ./gitea.nix
     ./gitea-runner.nix
+    ./gitea.nix
+    ./gnome.nix
     ./imalison.nix
     ./internet-computer.nix
     ./kat.nix
@@ -21,6 +22,7 @@
     ./nix.nix
     ./nixified.ai.nix
     ./options.nix
+    ./plasma.nix
     ./secrets.nix
     ./ssh.nix
     ./syncthing.nix
@@ -36,12 +38,14 @@
   config = lib.mkIf config.features.full.enable {
     modules.base.enable = true;
     modules.desktop.enable = true;
+    modules.plasma.enable = true;
+    modules.gnome.enable = false;
     modules.xmonad.enable = true;
     modules.extra.enable = true;
     modules.code.enable = true;
     modules.games.enable = true;
     modules.syncthing.enable = true;
     modules.fonts.enable = true;
-    modules.nixified-ai.enable = true;
+    modules.nixified-ai.enable = false;
   };
 }

nixos/desktop.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, options, inputs, makeEnable, forEachUser, ... }:
+{ config, pkgs, makeEnable, forEachUser, ... }:
 makeEnable config "modules.desktop" true {
   imports = [
     ./fonts.nix
@@ -8,13 +8,7 @@ makeEnable config "modules.desktop" true {
     exportConfiguration = true;
     enable = true;
     layout = "us";
-    desktopManager = {
-      plasma5.enable = true;
-    };
     displayManager = {
-      sddm = {
-        enable = true;
-      };
       sessionCommands = ''
         systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
       '';

nixos/flake.nix

@@ -22,7 +22,7 @@
     };
 
     xmonad = {
-      url = "path:../dotfiles/config/xmonad/xmonad";
+      url = "github:xmonad/xmonad";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -31,7 +31,7 @@
     };
 
     taffybar = {
-      url = "path:../dotfiles/config/taffybar/taffybar";
+      url = "github:taffybar/taffybar";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -154,7 +154,7 @@
         inherit inputs machineNames;
         makeEnable = (import ./make-enable.nix) nixpkgs.lib;
         mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
-        realUsers = [ "root" "imalison" "kat" "dean" "alex", "will" ];
+        realUsers = [ "root" "imalison" "kat" "dean" "alex" "will" ];
         forEachUser = mapValueToKeys realUsers;
         keys = (import ./keys.nix);
       } // specialArgs;

nixos/gnome.nix

@@ -0,0 +1,7 @@
+{ config, makeEnable, ... }:
+makeEnable config "modules.gnome" false {
+  services.xserver = {
+    desktopManager.gnome3.enable = true;
+    displayManager.gdm.enable = true;
+  };
+}

nixos/machines/railbird-sf.nix

@@ -1,9 +1,24 @@
-{ config, lib, pkgs, inputs, forEachUser, ... }:
+{ config, lib, pkgs, forEachUser, ... }:
 {
   imports = [
     ../configuration.nix
   ];
 
+  networking.hostName = "railbird-sf";
+
+  hardware.enableRedistributableFirmware = true;
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+  boot.loader.systemd-boot.enable = true;
+
+  hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
+  hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
+  services.xserver = {
+    videoDrivers = [ "nvidia" ];
+  };
+
   # Enable OpenGL
   hardware.opengl = {
     enable = true;
@@ -11,9 +26,6 @@
     driSupport32Bit = true;
   };
 
-  # Load nvidia driver for Xorg and Wayland
-  services.xserver.videoDrivers = ["nvidia"];
-
   hardware.nvidia = {
 
     # Modesetting is required.
@@ -42,39 +54,15 @@
     package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
-    services.xserver.desktopManager.gnome3.enable = true;
-    services.displayManager.gddm.enable = true;
-
   features.full.enable = false;
   modules.base.enable = true;
   modules.desktop.enable = true;
-    modules.xmonad.enable = true;
+  modules.xmonad.enable = false;
+  modules.gnome.enable = true;
   modules.code.enable = true;
   modules.syncthing.enable = true;
   modules.fonts.enable = true;
 
-  networking.hostName = "railbird-sf";
-
-  hardware.enableRedistributableFirmware = true;
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-  boot.loader.systemd-boot.enable = true;
-
-  hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
-  hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
-  services.xserver = {
-    videoDrivers = [ "nvidia" ];
-  };
-
-  hardware.opengl.driSupport32Bit = true;
-
-  hardware.nvidia.modesetting.enable = true;
-
-  # This also enables v4l2loopback
-  programs.droidcam.enable = true
-
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/a317d456-6f84-41ee-a149-8e466e414aae";
     fsType = "ext4";
@@ -96,10 +84,6 @@
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
 
-  services.xrdp.enable = true;
-  services.xrdp.defaultWindowManager = "startplasma-x11";
-  services.xrdp.openFirewall = true;
-
   home-manager.users = forEachUser {
      home.stateVersion = "23.11";
   };

nixos/nixified.ai.nix

@@ -11,7 +11,6 @@ specialArgs.makeEnable config "modules.nixified-ai" false {
   services.invokeai = {
     enable = false;
     host = "0.0.0.0";
-    nsfwChecker = false;
     package = inputs.nixified-ai.packages.${config.nixpkgs.system}.invokeai-nvidia;
   };
 }

nixos/plasma.nix

@@ -0,0 +1,7 @@
+{ config, makeEnable, ... }:
+makeEnable config "modules.plasma" true {
+  services.xserver = {
+    desktopManager.plasma5.enable = true;
+    displayManager.sddm.enable = true;
+  };
+}