fixes and improvements

user/modules/alacritty.nix

@@ -4,17 +4,17 @@
     enable = true;
     settings = {
       terminal.shell = {
-        program = "/bin/sh";
-        args = [
-          "-c"
-          ''
-            if command -v zellij >/dev/null 2>&1; then
-              exec zellij
-            else
-              exec "${SHELL:-/bin/bash}"
-            fi
-          ''
-        ];
+        program = "${pkgs.fish}/bin/fish";
+#        args = [
+#          "-c"
+#          ''
+#            if command -v zellij >/dev/null 2>&1; then
+#              exec zellij
+#            else
+#              exec "${SHELL:-/bin/bash}"
+#            fi
+#          ''
+#        ];
       };
     };
   };

user/modules/common.nix

@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- home.packages = with pkgs; [
- ];
- home.stateVersion = "24.05";
-}
-

user/modules/dev.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  # pyenv setup
+  programs.pyenv = {
+    enable = true;
+    enableFishIntegration = true; 
+  };
+}

user/modules/dev_helpers.nix

@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+let
+  devScript = pkgs.writeShellScriptBin "dev" ''
+    if [ -z "$1" ]; then
+      echo "Usage: dev <shell-name>"
+      exit 1
+    fi
+
+    nix develop ~/nixos/devshells/$1
+  '';
+in
+{
+  home.packages = [
+    devScript
+  ];
+}

user/modules/gammastep.nix

@@ -6,7 +6,7 @@
     provider = "geoclue2";
     tray = true;
     temperature = {
-      night = 1700;
+      night = 2500;
     };
   };
 }

user/modules/mako.nix

@@ -0,0 +1,29 @@
+{ pkgs, lib, ... }:
+{
+  services.mako = {
+    enable = true;
+    settings = {
+      actions = true;
+      sort = "-time";
+      anchor = lib.mkDefault "top-right";
+      background-color = "#000000";
+      border-color = "#88c0d0";
+      border-radius = 0;
+      default-timeout = 10000;
+      font = "monospace 20";
+      height = 150;
+      width = 400;
+      icons = true;
+      ignore-timeout = false;
+      layer = "overlay";
+      markup = true;
+  
+      # Section example
+      "urgency=high" = {
+        border-color = "fc0f0f";
+	default-timeout = 0;
+
+      };
+    };
+  };
+}

user/modules/sway.nix

@@ -35,8 +35,16 @@ in
       terminal = "alacritty";
       startup = [
 	{ command = "blueman-applet";}
+	{ command = "mullvad-vpn";}
+	{ command = "swaymsg workspace 1";}
+	{ command = "thunderbird";}
+	{ command = "nextcloud";}
+	{ command = "spotify";}
+	{ command = "brave";}
+	{ command = "alacritty";}
       ];
       defaultWorkspace = "1";
+      workspaceAutoBackAndForth = true;
       bars = [];
       fonts = {
         names = [ "MesloLGS NF" ];
@@ -144,18 +152,17 @@ in
           value = "workspace ${key}";
         }
         {
-          name = "${mod}+Ctrl+${key}";
+          name = "${mod}+Shift+${key}";
           value = "move container to workspace ${key}";
         }
         {
-          name = "${mod}+Shift+${key}";
+          name = "${mod}+Ctrl+${key}";
           value = "move container to workspace ${key}; workspace ${key}";
         }
-      ]) (lib.range 0 8));
+      ]) (lib.range 1 9));
 
       assigns = {
-	"2: web" = [{ class = "^Brave$"; }];
-        "9: mail" = [{ class = "Thunderbird"; }];
+        "9: mail" = [{ app_id = "thunderbird"; }];
       };
 
       modes = {
@@ -213,7 +220,7 @@ in
       };
     };
     extraConfig = ''
-        default_border pixel 1
+        default_border pixel 2
         floating_modifier ${mod}
 
         # === Floating Windows ===
@@ -224,8 +231,15 @@ in
         for_window [class="Blueman-manager"] floating enable border normal
         for_window [class="GParted"] floating enable border normal
         for_window [class="pavucontrol"] floating enable
-        for_window [class="Volume Control"] floating enable
-        for_window [class="(?i)VirtualBox"] floating enable border normal
+        for_window [title="Volume Control"] floating enable
+        for_window [class="Spotify"] move scratchpad
+	 
+        # Float all windows with "VirtualBox" in the title
+        for_window [class=".*VirtualBox.*"] floating enable
+        # EXCEPT: unfloat those that also contain "Manager" or "Machine"
+        for_window [class=".*VirtualBox Manager.*"] floating disable
+        for_window [class=".*VirtualBox Machine"] floating disable
+
     '';
   };
 }

user/modules/waybar.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  scriptDir = ./../../scripts/waybar;
+  scriptDir = ./../../resources/scripts/waybar;
 
   # Get all files in the scriptDir
   scriptFiles = builtins.filter (name: 
@@ -28,11 +28,11 @@ in {
   programs.waybar = {
     enable = true;
     systemd.enable = true;
-    settings = [{
+    settings.main = lib.mkMerge [{
     	command = "waybar";
         layer = "top";
-        position = "top";
-        "modules-left" = [
+        position = lib.mkDefault "top";
+        "modules-left" = lib.mkDefault [
           "tray"
           #"custom/cpu_linux"
 	  "cpu"
@@ -41,8 +41,8 @@ in {
           "disk"
           "custom/nvidia"
         ];
-        "modules-center" = [ "sway/window" ];
-        "modules-right" = [
+        "modules-center" = lib.mkDefault [ "sway/window" ];
+        "modules-right" = lib.mkDefault [
           "group/blight"
           "custom/colorpicker"
           "idle_inhibitor"
@@ -219,7 +219,7 @@ in {
     }
     
     window#waybar {
-      background: transparent;
+      background: black;
     }
     
     .modules-right {

user/modules/zellij.nix

@@ -2,7 +2,7 @@
 {
   programs.zellij = {
     enable = true;
-    enableFishIntegration = true;
+    #enableFishIntegration = true;
     settings = {
       theme = "dracula";
       copy_on_select = true;