refactoring

modules/home/desktop.nix

@@ -2,6 +2,18 @@
 
 {
 
+  imports = with nix-config.homeModules; [
+    niri
+    waybar
+    swaync
+    shikane
+    mpv
+    gnome
+
+    hyprlock
+    hypridle
+  ];
+
   home.packages = lib.mkMerge [
     (with nix-config.packages.x86_64-linux; [
       filen-desktop

modules/home/niri.nix

@@ -28,7 +28,7 @@ in {
           touchpad  = {
             natural-scroll = true;
             scroll-method = "two-finger";
-            dwt = true;
+            dwt = false;
             tap = false;
             tap-button-map = "left-right-middle";
             click-method = "clickfinger";

modules/home/shell-conf.nix

@@ -55,7 +55,7 @@
     numbat
     glpng
     nurl
-    neofetch
+    fastfetch
     nvd
     ripgrep-all
     silver-searcher

modules/home/yazi.nix

@@ -10,6 +10,7 @@
         { on = ["c" "d"]; run = "shell 'ripdrag \"$@\" -x 2>/dev/null &' --confirm"; desc = "drag selection";}
         { on = "y"; run = ["shell 'for path in \"$@\"; do echo \"file://$path\"; done | wl-copy -t text/uri-list'\n" "yank"]; }
         { on = ["g" "r"]; run = "shell 'ya emit cd \"$(git rev-parse --show-toplevel)\"'\n"; desc = "go to top of git repo"; }
+        { on = ["g" "p"]; run = "cd ~/Projects"; desc = "go to ~/Projects"; }
         { on = ["t" "p"]; run = "plugin toggle-view parent"; desc = "Toggle parent"; }
         { on = ["t" "c"]; run = "plugin toggle-view current"; desc = "Toggle current"; }
         { on = ["t" "r"]; run = "plugin toggle-view preview"; desc = "Toggle preview"; }

modules/system/filesystems.nix

@@ -9,33 +9,33 @@
     in {
 
       "/mnt/filez/media" = {
-        device = "//100.70.114.113/Media";
+        device = "//filez/Media";
         fsType = "smb3";
         options = [ "${filez-opts}" ];
       };
 
       "/mnt/filez/music-production" = {
-        device = "//100.70.114.113/Music Production";
+        device = "//filez/Music Production";
         fsType = "smb3";
         options = [ "${filez-opts}" ];
       };
 
       "/mnt/filez/storage" = {
-        device = "//100.70.114.113/Storage";
+        device = "//filez/Storage";
         fsType = "smb3";
         options = [ "${filez-opts}" ];
       };
 
       "/mnt/filez/photos" = {
-        device = "//100.70.114.113/Photo Storage";
+        device = "//filez/Photo Storage";
         fsType = "smb3";
         options = [ "${filez-opts}" ];
       };
 
-      "/mnt/beets-import" = {
-        device = "//100.103.170.132/media";
-        fsType = "smb3";
-        options = [ "${media-server-opts}" ];
-      };
+      # "/mnt/media-server/import" = {
+      #   device = "//media-server/import";
+      #   # fsType = "smb3";
+      #   options = [ "${media-server-opts}" ];
+      # };
     };
 }