before school

home/main/home.nix

@@ -8,14 +8,14 @@
   programs.home-manager.enable = true;
 
   imports = [
-    ./modules/hyprland.nix
-    ./modules/nvf.nix
-    ./modules/stylix.nix
-    ./modules/games.nix
-    ./modules/programming.nix
-    ./modules/multimedia.nix
-    ./modules/communication.nix
-    ./modules/rice.nix
-    ./modules/shells.nix
+    ../modules/hyprland.nix
+    ../modules/nvf.nix
+    ../modules/stylix.nix
+    ../modules/games.nix
+    ../modules/programming.nix
+    ../modules/multimedia.nix
+    ../modules/communication.nix
+    ../modules/rice.nix
+    ../modules/shells.nix
   ];
 }

home/modules/hyprland.nix

@@ -136,16 +136,27 @@
         "$mainMod, code:19, workspace, 10"
 
         # same as above, but switch to the workspace
-        "$mainMod SHIFT, code:10, movetoworkspacesilent, 1"
-        "$mainMod SHIFT, code:11, movetoworkspacesilent, 2"
-        "$mainMod SHIFT, code:12, movetoworkspacesilent, 3"
-        "$mainMod SHIFT, code:13, movetoworkspacesilent, 4"
-        "$mainMod SHIFT, code:14, movetoworkspacesilent, 5"
-        "$mainMod SHIFT, code:15, movetoworkspacesilent, 6"
-        "$mainMod SHIFT, code:16, movetoworkspacesilent, 7"
-        "$mainMod SHIFT, code:17, movetoworkspacesilent, 8"
-        "$mainMod SHIFT, code:18, movetoworkspacesilent, 9"
-        "$mainMod SHIFT, code:19, movetoworkspacesilent, 10"
+        "$mainMod SHIFT, code:10, movetoworkspace, 1"
+        "$mainMod SHIFT, code:11, movetoworkspace, 2"
+        "$mainMod SHIFT, code:12, movetoworkspace, 3"
+        "$mainMod SHIFT, code:13, movetoworkspace, 4"
+        "$mainMod SHIFT, code:14, movetoworkspace, 5"
+        "$mainMod SHIFT, code:15, movetoworkspace, 6"
+        "$mainMod SHIFT, code:16, movetoworkspace, 7"
+        "$mainMod SHIFT, code:17, movetoworkspace, 8"
+        "$mainMod SHIFT, code:18, movetoworkspace, 9"
+        "$mainMod SHIFT, code:19, movetoworkspace, 10"
+
+        "$mainMod ALT, code:10, movetoworkspacesilent, 1"
+        "$mainMod ALT, code:11, movetoworkspacesilent, 2"
+        "$mainMod ALT, code:12, movetoworkspacesilent, 3"
+        "$mainMod ALT, code:13, movetoworkspacesilent, 4"
+        "$mainMod ALT, code:14, movetoworkspacesilent, 5"
+        "$mainMod ALT, code:15, movetoworkspacesilent, 6"
+        "$mainMod ALT, code:16, movetoworkspacesilent, 7"
+        "$mainMod ALT, code:17, movetoworkspacesilent, 8"
+        "$mainMod ALT, code:18, movetoworkspacesilent, 9"
+        "$mainMod ALT, code:19, movetoworkspacesilent, 10"
 
         # window control
         "$mainMod SHIFT, left, movewindow, l"
@@ -216,6 +227,8 @@
       bar = {
         launcher.autoDetectIcon = true;
 
+        clock.format = "%d %b  %H:%M";
+
         workspaces.show_numbered = true;
 
         layouts = {
@@ -238,7 +251,7 @@
       menus.clock = {
         time = {
           military = true;
-          hideSeconds = true;
+          hideSeconds = false;
         };
         weather.enabled = false;
       };

home/modules/multimedia.nix

@@ -3,7 +3,7 @@
     packages = with pkgs; [
       libreoffice
       xarchiver
-      trilium-next-desktop
+      trilium-desktop
       krita
       libresprite
       mpv

home/modules/nvf.nix

@@ -11,6 +11,13 @@
     enable = true;
 
     settings.vim = {
+      theme = {
+        enable = true;
+        transparent = true;
+
+        name = "catppuccin";
+        style = "mocha";
+      };
       lsp = {
         enable = true;
 

home/modules/programming.nix

@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     godot
+    lazygit
   ];
 }

home/modules/rice.nix

@@ -38,13 +38,13 @@
           "os"
           "kernel"
           "cpu"
-          "memory"
           {
             type = "gpu";
             key = "GPU";
             detectionMethod = "pci";
             hideType = "integrated";
           }
+          "memory"
           "wm"
           "terminal"
           "shell"
@@ -55,8 +55,13 @@
 
     foot = {
       enable = true;
-      settings.main = {
-        term = "xterm-256color";
+      settings = {
+        main = {
+          term = "xterm-256color";
+        };
+        #colors = {
+        #  alpha = "0.85";
+        #};
       };
     };
 

home/modules/shells.nix

@@ -55,9 +55,15 @@
             "rs" => {
               flake rust -c $"nvim ($file)"
             }
+            "zig" => {
+              flake zig -c $"nvim ($file)"
+            }
             "c" | "cpp" => {
               flake c -c $"nvim ($file)"
             }
+            "cs" => {
+              flake c-sharp -c $"nvim ($file)"
+            }
             _ => {nvim $file}
           }
         }

home/modules/stylix.nix

@@ -1,6 +1,7 @@
 {pkgs, ...}: {
   stylix = {
     enable = true;
+    overlays.enable = false;
 
     targets = {
       gtk.enable = true;
@@ -28,6 +29,12 @@
       base0F = "f2cdcd"; # flamingo
     };
 
+    opacity.terminal = 0.75;
+
+    targets.nvf = {
+      enable = false;
+    };
+
     cursor = {
       package = pkgs.bibata-cursors;
       name = "Bibata-Modern-Ice";
@@ -44,7 +51,7 @@
 
       monospace = {
         package = pkgs.nerd-fonts.jetbrains-mono;
-        name = "JetBrainsMono Nerd Font Mono";
+        name = "JetBrainsMono Nerd Font";
       };
 
       sansSerif = {