push

device.nix

@@ -1 +1 @@
-{ device = "server"; }
+{ device = "desktop"; }

home.nix

@@ -7,7 +7,7 @@
         
     ] else [
         ./modules/stylix.nix
-        ./modules/firefox.nix
+        #./modules/firefox.nix
     ]);
 
     home = {

main.nix

@@ -31,10 +31,12 @@
         ./modules/audio.nix
         ./modules/swap.nix
         ./modules/virtualisation.nix
+        ./modules/mpd.nix
+        ./modules/sshfs.nix
         
         #./modules/firefox.nix
     ]) ++ (if device == "laptop" then [
-        ./modules/mpd.nix
+        
     ] else []) ++ (if device == "desktop" then [
 
     ] else []);

modules/mpd.nix

@@ -6,7 +6,7 @@
             enable = true;
 
             settings = {
-                music_directory = "/run/media/bug/Music/";
+                music_directory = (if (device == "desktop") then "/home/bug/Music" else "/run/media/bug/Music/");
 
                 decoder = [
                     {

modules/packages.nix

@@ -71,11 +71,11 @@ in
             libGLU
             gcc
             zlib
-            xorg.libX11
+            libX11
             fontconfig
             pcre2
-            xorg.libXext
+            libXext
-            xorg.libxcb
+            libxcb
             glib
         ]))
 
@@ -231,6 +231,7 @@ in
                 "org.gnome.Decibels"
                 "org.pipewire.Helvum"
                 "community.pathofbuilding.PathOfBuilding"
+                "io.github.gaheldev.Millisecond"
 
                 {
                     appId = "com.hytale.Launcher";
@@ -302,11 +303,11 @@ in
             binfmt = true;
         };
 
-        #firefox = {
+        firefox = {
-        #    enable = true;
+            enable = true;
         
-        #    package = pkgs.firefox-bin;
+            package = pkgs.firefox-bin;
-        #};
+        };
 
         steam = {
             enable = true;
@@ -349,10 +350,10 @@ in
                 mesa
                 libglvnd
                 wayland
-                xorg.libX11
+                libX11
-                xorg.libXcursor
+                libXcursor
-                xorg.libXrandr
+                libXrandr
-                xorg.libXi
+                libXi
             ]);
         };
     };

modules/sshfs.nix

@@ -0,0 +1,18 @@
+{ config, pkgs, device, ... }:
+
+{
+    fileSystems."/mnt/box" = {
+        device = "bug@box.bug.tools:/";
+        fsType = "fuse.sshfs";
+        options = [
+            "identityfile=/home/bug/.ssh/id_ed25519"
+            "idmap=user"
+            "x-systemd.automount"
+            "allow_other"
+            "user"
+            "_netdev"
+        ];
+    };
+
+    boot.supportedFilesystems."fuse.sshfs" = true;
+}

modules/syncthing.nix

@@ -62,6 +62,11 @@
                     path = "/home/bug/.cloudflared";
                     devices = ["desktop" "laptop" "server"];
                 };
+
+                "Music" = {
+                    path = (if (device == "desktop") then "/home/bug/Music" else "/run/media/bug/Music/");
+                    devices = ["desktop" "laptop"];
+                };
             };
         };
     };