diff --git a/flake.nix b/flake.nix index c28ee06..3253fda 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ systems = ["x86_64-linux"]; imports = [ ./home/profiles - ./hosts + ./hosts/machines ./modules ./home-modules ]; diff --git a/home/default.nix b/home/default.nix index 383b5de..421a90b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,7 +1,4 @@ { - imports = [ - ]; - home = { username = "xun"; homeDirectory = "/home/xun"; diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix index 9e3753a..334925a 100644 --- a/home/profiles/nixdesk/default.nix +++ b/home/profiles/nixdesk/default.nix @@ -28,7 +28,6 @@ # desktop ../../programs/desktop - ../../programs/desktop/libreoffice.nix ../../programs/desktop/theme.nix ../../programs/desktop/awesome #../../programs/desktop/hyprland @@ -48,10 +47,13 @@ # ../../programs/misc/obsidian.nix ../../programs/misc/pwvucontrol.nix ../../programs/misc/qpwgraph.nix + ../../programs/misc/libreoffice.nix # ../../programs/misc/thunderbird.nix #../../programs/music #../../programs/music/yams.nix # ../../programs/music/spotify.nix + ../../programs/music/puddletag.nix + ../../programs/music/picard.nix ../../programs/media ../../programs/media/jellyfin.nix # gaming diff --git a/home/programs/browsers/firefox/default.nix b/home/programs/browsers/firefox/default.nix index 48c14fc..c832e2a 100644 --- a/home/programs/browsers/firefox/default.nix +++ b/home/programs/browsers/firefox/default.nix @@ -102,7 +102,7 @@ "browser.disableResetPrompt" = true; # "Looks like you haven't started Firefox in a while." "browser.onboarding.enabled" = false; # "New to Firefox? Let's get started!" tour "browser.aboutConfig.showWarning" = false; # Warning when opening about:config - "media.videocontrols.picture-in-picture.video-toggle.enabled" = false; + # "media.videocontrols.picture-in-picture.video-toggle.enabled" = false; "extensions.autoDisableScopes" = "0"; # Automatically enable extensions "extensions.pocket.enabled" = true; # i actually use pocket "extensions.shield-recipe-client.enabled" = false; diff --git a/home/programs/desktop/libreoffice.nix b/home/programs/misc/libreoffice.nix similarity index 100% rename from home/programs/desktop/libreoffice.nix rename to home/programs/misc/libreoffice.nix diff --git a/home/programs/music/picard.nix b/home/programs/music/picard.nix new file mode 100644 index 0000000..4ce374b --- /dev/null +++ b/home/programs/music/picard.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.picard]; +} diff --git a/home/programs/music/puddletag.nix b/home/programs/music/puddletag.nix new file mode 100644 index 0000000..e44c0fa --- /dev/null +++ b/home/programs/music/puddletag.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.puddletag]; +} diff --git a/hosts/default.nix b/hosts/machines/default.nix similarity index 100% rename from hosts/default.nix rename to hosts/machines/default.nix diff --git a/hosts/hopper/brawlstats.nix b/hosts/machines/hopper/brawlstats.nix similarity index 100% rename from hosts/hopper/brawlstats.nix rename to hosts/machines/hopper/brawlstats.nix diff --git a/hosts/hopper/default.nix b/hosts/machines/hopper/default.nix similarity index 100% rename from hosts/hopper/default.nix rename to hosts/machines/hopper/default.nix diff --git a/hosts/hopper/hardening.nix b/hosts/machines/hopper/hardening.nix similarity index 100% rename from hosts/hopper/hardening.nix rename to hosts/machines/hopper/hardening.nix diff --git a/hosts/hopper/hardware.nix b/hosts/machines/hopper/hardware.nix similarity index 100% rename from hosts/hopper/hardware.nix rename to hosts/machines/hopper/hardware.nix diff --git a/hosts/hopper/lab.nix b/hosts/machines/hopper/lab.nix similarity index 100% rename from hosts/hopper/lab.nix rename to hosts/machines/hopper/lab.nix diff --git a/hosts/kidney/default.nix b/hosts/machines/kidney/default.nix similarity index 100% rename from hosts/kidney/default.nix rename to hosts/machines/kidney/default.nix diff --git a/hosts/kidney/fonts.nix b/hosts/machines/kidney/fonts.nix similarity index 100% rename from hosts/kidney/fonts.nix rename to hosts/machines/kidney/fonts.nix diff --git a/hosts/kidney/hardware.nix b/hosts/machines/kidney/hardware.nix similarity index 100% rename from hosts/kidney/hardware.nix rename to hosts/machines/kidney/hardware.nix diff --git a/hosts/kidney/wsl.nix b/hosts/machines/kidney/wsl.nix similarity index 100% rename from hosts/kidney/wsl.nix rename to hosts/machines/kidney/wsl.nix diff --git a/hosts/liveiso/default.nix b/hosts/machines/liveiso/default.nix similarity index 100% rename from hosts/liveiso/default.nix rename to hosts/machines/liveiso/default.nix diff --git a/hosts/liveiso/sway.nix b/hosts/machines/liveiso/sway.nix similarity index 100% rename from hosts/liveiso/sway.nix rename to hosts/machines/liveiso/sway.nix diff --git a/hosts/liveiso/tools.nix b/hosts/machines/liveiso/tools.nix similarity index 100% rename from hosts/liveiso/tools.nix rename to hosts/machines/liveiso/tools.nix diff --git a/hosts/nixdesk/default.nix b/hosts/machines/nixdesk/default.nix similarity index 100% rename from hosts/nixdesk/default.nix rename to hosts/machines/nixdesk/default.nix diff --git a/hosts/nixdesk/hardware.nix b/hosts/machines/nixdesk/hardware.nix similarity index 100% rename from hosts/nixdesk/hardware.nix rename to hosts/machines/nixdesk/hardware.nix diff --git a/hosts/nixdesk/hibernate-boot.nix b/hosts/machines/nixdesk/hibernate-boot.nix similarity index 100% rename from hosts/nixdesk/hibernate-boot.nix rename to hosts/machines/nixdesk/hibernate-boot.nix diff --git a/hosts/nixdesk/jellyfin.nix b/hosts/machines/nixdesk/jellyfin.nix similarity index 100% rename from hosts/nixdesk/jellyfin.nix rename to hosts/machines/nixdesk/jellyfin.nix diff --git a/hosts/nixdesk/samba-mount.nix b/hosts/machines/nixdesk/samba-mount.nix similarity index 52% rename from hosts/nixdesk/samba-mount.nix rename to hosts/machines/nixdesk/samba-mount.nix index 645de12..e547861 100644 --- a/hosts/nixdesk/samba-mount.nix +++ b/hosts/machines/nixdesk/samba-mount.nix @@ -14,7 +14,22 @@ type = "cifs"; options = "uid=xun,gid=users," + (builtins.readFile ./smbcreds); } + { + description = "smb hopper library"; + what = "//192.168.50.97/library"; # hopper local ip + where = "/server/library"; + type = "cifs"; + options = "uid=xun,gid=users," + (builtins.readFile ./smbcreds); + } + { + description = "smb hopper slskd files"; + what = "//192.168.50.97/slskd"; # hopper local ip + where = "/server/slskd"; + type = "cifs"; + options = "uid=xun,gid=users," + (builtins.readFile ./smbcreds); + } ]; + systemd.automounts = [ { requires = ["network-online.target"]; @@ -32,5 +47,21 @@ TimeoutIdleSec = "10min"; }; } + { + requires = ["network-online.target"]; + where = "/server/library"; + wantedBy = ["multi-user.target"]; + automountConfig = { + TimeoutIdleSec = "10min"; + }; + } + { + requires = ["network-online.target"]; + where = "/server/slskd"; + wantedBy = ["multi-user.target"]; + automountConfig = { + TimeoutIdleSec = "10min"; + }; + } ]; } diff --git a/hosts/nixdesk/testing.nix b/hosts/machines/nixdesk/testing.nix similarity index 100% rename from hosts/nixdesk/testing.nix rename to hosts/machines/nixdesk/testing.nix diff --git a/hosts/nixdesk/smbcreds b/hosts/nixdesk/smbcreds deleted file mode 100644 index 3be106c..0000000 --- a/hosts/nixdesk/smbcreds +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Uot/1Q zOPmK3Ael5Ss1gclWT0Q/YLbtus/1Ef5QgSYP96MdjQ -Ut0OfpCHqMlWrkU298WDWXLseerYiwv8hAAf70nSgfo --> mQ1Ds-grease V=M 7* -ZsOetI30y2vLGlwWP84sVSQzbrtA4m+yRrCc316MzHWPyuEJYnVzw7Eygayg8c26 -t+1VDhMHLhFpImAIXni2GsZNAxGnUw5VaRybmpHRt1Bri8k7ZENosX/7T6/kViO8 -BW8 ---- 0MsxoH3ENvyga/ICHX3448MZ9q7GJecTg5eOLPe2D2A -fh_ɿm>rc ӡJx׃E^-`!+uTu{soh"E%ϼ З! _>)Ҥ.'¼]U}蚃eB7L;9h` -+86#}4R/OSZ(BˮZ9 \ No newline at end of file