From 90f94f7888ae6abd4dbcf829cf3884f9fc64dccd Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Wed, 11 Feb 2026 20:24:05 -0600 Subject: [PATCH] push --- device.nix | 2 +- home.nix | 2 +- main.nix | 4 +++- modules/mpd.nix | 2 +- modules/packages.nix | 23 ++++++++++++----------- modules/sshfs.nix | 18 ++++++++++++++++++ modules/syncthing.nix | 5 +++++ 7 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 modules/sshfs.nix diff --git a/device.nix b/device.nix index 976e816..4a699cd 100644 --- a/device.nix +++ b/device.nix @@ -1 +1 @@ -{ device = "server"; } \ No newline at end of file +{ device = "desktop"; } \ No newline at end of file diff --git a/home.nix b/home.nix index 19980c7..0df40d1 100644 --- a/home.nix +++ b/home.nix @@ -7,7 +7,7 @@ ] else [ ./modules/stylix.nix - ./modules/firefox.nix + #./modules/firefox.nix ]); home = { diff --git a/main.nix b/main.nix index 8a85054..d03f434 100644 --- a/main.nix +++ b/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 []); diff --git a/modules/mpd.nix b/modules/mpd.nix index 6453149..a8c8293 100644 --- a/modules/mpd.nix +++ b/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 = [ { diff --git a/modules/packages.nix b/modules/packages.nix index 15e64ae..533a174 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -71,11 +71,11 @@ in libGLU gcc zlib - xorg.libX11 + libX11 fontconfig pcre2 - xorg.libXext - xorg.libxcb + libXext + 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 = { - # enable = true; + firefox = { + enable = true; - # package = pkgs.firefox-bin; - #}; + package = pkgs.firefox-bin; + }; steam = { enable = true; @@ -349,10 +350,10 @@ in mesa libglvnd wayland - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi + libX11 + libXcursor + libXrandr + libXi ]); }; }; diff --git a/modules/sshfs.nix b/modules/sshfs.nix new file mode 100644 index 0000000..c4078cb --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/modules/syncthing.nix b/modules/syncthing.nix index 9cd528d..28b955b 100644 --- a/modules/syncthing.nix +++ b/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"]; + }; }; }; };