Vinegar changes, multi monitor in bspwm, color changes

hosts/vinegar/configuration.nix

@@ -16,7 +16,7 @@ in {
     <nixos-wsl/modules>
   ];
 
-  home-manager.users."${username}" = {
+  home-manager.users.${username} = {
     imports = helpers.getModules "/home.nix" (import ./modules.nix) ++ [
       ../../common/home.nix
       ./home.nix
@@ -25,6 +25,10 @@ in {
     config.custom.username = username;
   };
 
+  users.users.${username} = {
+    shell = pkgs.fish;
+  };
+
   wsl = {
     enable = true;
     defaultUser  = username;
@@ -37,20 +41,27 @@ in {
   };
 
   services.xserver.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.xserver.displayManager.startx.enable = true;
 
-  services.xrdp.enable = true;
-  services.xrdp.defaultWindowManager = "dbus-run-session bspwm";
-  # services.xrdp.defaultWindowManager = "Hyprland";
-  services.xrdp.openFirewall = true;
-  services.xrdp.port = 3390;
+  services.xrdp = {
+    enable = true;
+    defaultWindowManager = "/home/nixos/.xsession";
+  #   defaultWindowManager = "startx";
+    # defaultWindowManager = "startplasma-x11";
+    openFirewall = true;
+    port = 3390;
+    extraConfDirCommands = ''
+    sed -i 's/max_bpp=32/#max_bpp=32\nmax_bpp=128/g' $out/xrdp.ini
+    '';
+  };
+  
 
   environment.systemPackages = [
     pkgs.vscodium
     pkgs.git
     pkgs.wget
     pkgs.micro
+    pkgs.neofetch
   ];
 
   fonts.packages = [

hosts/vinegar/home.nix

@@ -4,15 +4,25 @@
   imports =
     # helpers.getModules "/home.nix"  (import ./modules.nix) ++
     [
-    ../../colors/monokai-dark
+    ../../themes/kaolin-dark
     ./start-session/home.nix
     ];
-  custom.wallpaper = ../../wallpapers/blip-blip-blip-blip.jpg;
+  custom.wallpaper = ../../wallpapers/blopies.jpg;
 
   xsession.windowManager.bspwm.extraConfig = ''
   pgrep -x sxhkd > /dev/null || sxhkd &
   '';
 
+  # Workaround for xkb not working properly in xrdp
+  # 
+  # Hypothesis: Xorg starts before a client connects,
+  # so the client's keyboard is added far after
+  # initialization. By adding it to the xsession we set
+  # the xkb map after the client joins 
+  xsession.initExtra = ''
+  setxkbmap -option caps:swapescape,altwin:swap_alt_win
+  '';
+
   home = {
     sessionVariables = {
       EDITOR = "codium";
@@ -21,8 +31,8 @@
       TERM = "kitty";
       FILEMANAGER = "kitty lf";
 
-	    # Tell Electron apps it's wayland
-      NIXOS_OZONE_WL = 1;
+      # Vscodium garbaj
+      DONT_PROMPT_WSL_INSTALL = 1;
     };
 
     sessionPath = [
@@ -42,4 +52,4 @@
   };
 
 
-}
+}