Merge

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;
@@ -41,20 +45,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 @@
   };
 
 
-}
+}

modules/bspwm/home.nix

@@ -61,7 +61,7 @@
       # };
 
       extraConfigEarly = ''
-      bspc monitor -d I II III IV V
+      bsp-auto-monitors
       '';
 
       settings = with config.custom.colors; {

modules/bspwm/scripts/bsp-auto-monitors

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+monitors=($(xrandr | grep " connected " | awk '{ print$1 }'))
+monitorcount=${#monitors[*]}
+names=(I II III IV V)
+
+if [ $monitorcount -eq 1 ]; then
+  bspc monitor -d ${names[@]}
+else
+  for((i=0; i<${monitorcount}; i++)); do
+    name=${names[$i]}
+	  bspc monitor ${monitors[$i]} -d ${name}-0 ${name}-1
+  done
+fi

modules/bspwm/sxhkdrc

@@ -100,9 +100,12 @@ super + {h,j,k,l,Left,Down,Up,Right}
 super + {p,b,comma,period}
 	bspc node -f @{parent,brother,first,second}
 
-# focus the next/previous window in the current desktop
-super + {a,d}
-	bspc node -f {next,prev}.local.!hidden.window
+# # focus the next/previous window in the current desktop
+# super + {a,d}
+# 	bspc node -f {next,prev}.local.!hidden.window
+# Rotate tree
+super + {d,a}
+    bspc node @/ -C {forward,backward}
 
 # focus the next/previous desktop in the current monitor
 super + bracket{left,right}

modules/hyprland/home.nix

@@ -8,6 +8,11 @@
   # options.custom.hyprland.enable = lib.mkEnable "hyprland";
 
   config = {
+    # Tell electron apps it's wayland time
+    home.sessionVariables = {
+      "NIXOS_OZONE_WL = 1"
+    }
+
     home.packages = [
       pkgs.swaybg
     ];

modules/kitty/colors.nix

@@ -1,7 +1,14 @@
 { config, lib,  ... }:
 
 {
-  config = {
+  options.custom.colors.kitty = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+    };
+  };
+
+  config = lib.mkDefault {
     programs.kitty.settings = with config.custom.colors; {
       # Based on https://github.com/mk12/base16-kitty
 

result

@@ -1 +0,0 @@
-/nix/store/hq65zx7jbxkbn8kqpfhn8gklv9xi6kpx-nixos-system-nixos-24.05.20240117.842d9d8

themes/kaolin-dark/default.nix

@@ -30,7 +30,6 @@
 
     # The basic colors
     foreground = base07;
-    # background = "#000000";
     background = base00;
 
     selection_foreground = base00;