From c625bba2591aa0b6d3a73c538d7e6d15afbbab56 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Fri, 3 Jan 2025 18:03:07 -0500 Subject: [PATCH] Rename JimboNFS to KittyNFS --- flake.nix | 2 +- hosts/extern/disko/default.nix | 2 +- hosts/kitty/filesystems/default.nix | 4 +-- hosts/redmond/disko/default.nix | 2 +- hosts/redmond/filesystems/default.nix | 4 +-- hosts/tower/filesystems/default.nix | 4 +-- .../home/programs/terminal/ranger/default.nix | 8 ++--- modules/home/services/mpd/default.nix | 4 +-- .../server/fileserver/nextcloud/default.nix | 29 ------------------- .../server/fileserver/nfs/default.nix | 6 ++-- .../server/fileserver/seafile/default.nix | 10 ------- .../fileserver/seafile/nginx/default.nix | 11 ------- .../icecast/liquidsoap/jimbops/default.nix | 2 +- .../liquidsoap/jimscrapped/default.nix | 2 +- 14 files changed, 20 insertions(+), 70 deletions(-) delete mode 100644 modules/system/services/server/fileserver/nextcloud/default.nix delete mode 100644 modules/system/services/server/fileserver/seafile/default.nix delete mode 100644 modules/system/services/server/fileserver/seafile/nginx/default.nix diff --git a/flake.nix b/flake.nix index e67e7ab..55edb8e 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,6 @@ }; # home-manager switch --flake /etc/nixos#username - homeConfigurations."jimbo" = mkHome [ ./modules/home ] nixpkgs.legacyPackages.x86_64-linux; + homeConfigurations."main" = mkHome [ ./modules/home ] nixpkgs.legacyPackages.x86_64-linux; }; } diff --git a/hosts/extern/disko/default.nix b/hosts/extern/disko/default.nix index 1a21455..aef6eca 100644 --- a/hosts/extern/disko/default.nix +++ b/hosts/extern/disko/default.nix @@ -70,7 +70,7 @@ "/persist/.snapshots" = { }; "/${config.sysusers.main}" = { - mountpoint = "/persist/home/jimbo"; + mountpoint = "/persist/home/${config.sysusers.main}"; mountOptions = [ "compress=zstd" "noatime" "ssd" ]; }; "/${config.sysusers.main}/.snapshots" = { }; diff --git a/hosts/kitty/filesystems/default.nix b/hosts/kitty/filesystems/default.nix index aaaf851..99fc9dc 100644 --- a/hosts/kitty/filesystems/default.nix +++ b/hosts/kitty/filesystems/default.nix @@ -33,9 +33,9 @@ fsType = "btrfs"; options = [ "subvol=persist" "compress=zstd" ]; }; - "/export/JimboNFS" = { + "/export/KittyNFS" = { depends = [ "/persist" ]; - device = "/persist/export/JimboNFS"; + device = "/persist/export/KittyNFS"; fsType = "none"; options = [ "bind" ]; }; diff --git a/hosts/redmond/disko/default.nix b/hosts/redmond/disko/default.nix index fb70489..3c18c2f 100644 --- a/hosts/redmond/disko/default.nix +++ b/hosts/redmond/disko/default.nix @@ -91,6 +91,6 @@ # Needed for impermanence fileSystems = { "/persist".neededForBoot = true; - "/persist/home/jimbo".neededForBoot = true; + "/persist/home/${config.sysusers.main}".neededForBoot = true; }; } diff --git a/hosts/redmond/filesystems/default.nix b/hosts/redmond/filesystems/default.nix index a5f8458..da74246 100644 --- a/hosts/redmond/filesystems/default.nix +++ b/hosts/redmond/filesystems/default.nix @@ -5,8 +5,8 @@ device = "/dev/disk/by-uuid/582C6B802C6B57D0"; options = [ "nosuid" "nodev" ]; }; - "/home/${config.sysusers.main}/JimboNFS" = { - device = "10.100.0.1:/export/JimboNFS"; + "/home/${config.sysusers.main}/KittyNFS" = { + device = "10.100.0.1:/export/KittyNFS"; fsType = "nfs4"; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; }; diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix index bc11498..d1a9fb2 100644 --- a/hosts/tower/filesystems/default.nix +++ b/hosts/tower/filesystems/default.nix @@ -39,8 +39,8 @@ }; # Network mounts - "/home/${config.sysusers.main}/JimboNFS" = { - device = "${config.ips.server}:/export/JimboNFS"; + "/home/${config.sysusers.main}/KittyNFS" = { + device = "${config.ips.server}:/export/KittyNFS"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; }; diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix index 7c4e4b3..fa1ee26 100644 --- a/modules/home/programs/terminal/ranger/default.nix +++ b/modules/home/programs/terminal/ranger/default.nix @@ -108,10 +108,10 @@ n:/etc/nixos # Remote files - J:/home/${config.sysusers.main}/JimboNFS - K:/home/${config.sysusers.main}/JimboNFS/Files - V:/home/${config.sysusers.main}/JimboNFS/Media - M:/home/${config.sysusers.main}/JimboNFS/Music + J:/home/${config.sysusers.main}/KittyNFS + K:/home/${config.sysusers.main}/KittyNFS/Files + V:/home/${config.sysusers.main}/KittyNFS/Media + M:/home/${config.sysusers.main}/KittyNFS/Music ''; }; packages = with pkgs; [ diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix index c44c1f3..098b8a1 100644 --- a/modules/home/services/mpd/default.nix +++ b/modules/home/services/mpd/default.nix @@ -3,8 +3,8 @@ services.mpd = { enable = config.home.desktop.enable; network.startWhenNeeded = true; - musicDirectory = "/home/${config.sysusers.main}/JimboNFS/Music/JimBops"; - playlistDirectory = "/home/${config.sysusers.main}/JimboNFS/Music/JimBops/Playlists"; + musicDirectory = "/home/${config.sysusers.main}/KittyNFS/Music/JimBops"; + playlistDirectory = "/home/${config.sysusers.main}/KittyNFS/Music/JimBops/Playlists"; extraConfig = '' audio_output { type "pipewire" diff --git a/modules/system/services/server/fileserver/nextcloud/default.nix b/modules/system/services/server/fileserver/nextcloud/default.nix deleted file mode 100644 index c2ddb1e..0000000 --- a/modules/system/services/server/fileserver/nextcloud/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, config, ... }: -{ - imports = [ ./nginx ]; - - services.nextcloud = { - enable = config.system.server.enable; - package = pkgs.nextcloud30; - hostName = "cloud.${config.domains.p2}"; - datadir = "/mnt/nextcloud"; - https = true; - config = { - adminuser = "jimbo"; - adminpassFile = "${pkgs.writeText "nextpass" config.secrets.jimboAccPass}"; - }; - settings = { - trusted_proxies = [ "127.0.0.1" ]; - trusted_domains = [ "cloud.${config.domains.p2}" ]; - overwriteprotocol = "https"; - mail_smtphost = "mx.${config.domains.p1}"; - mail_domain = "${config.domains.p1}"; - mail_from_address = "noreply"; - mail_smtpauth = "true"; - mail_smtpname = "noreply@${config.domains.p2}"; - mail_smtppassword = config.secrets.noreplyPassword; - mail_smtpmode = "smtp"; - mail_smtpport = 587; - }; - }; -} diff --git a/modules/system/services/server/fileserver/nfs/default.nix b/modules/system/services/server/fileserver/nfs/default.nix index 37ff1ce..98d99ff 100644 --- a/modules/system/services/server/fileserver/nfs/default.nix +++ b/modules/system/services/server/fileserver/nfs/default.nix @@ -3,9 +3,9 @@ services.nfs.server = { enable = config.system.server.enable; exports = '' - /export/JimboNFS/Files *(rw,sync,no_subtree_check) - /export/JimboNFS/Media *(rw,sync,no_subtree_check) - /export/JimboNFS/Music *(rw,sync,no_subtree_check) + /export/KittyNFS/Files *(rw,sync,no_subtree_check) + /export/KittyNFS/Media *(rw,sync,no_subtree_check) + /export/KittyNFS/Music *(rw,sync,no_subtree_check) ''; }; } diff --git a/modules/system/services/server/fileserver/seafile/default.nix b/modules/system/services/server/fileserver/seafile/default.nix deleted file mode 100644 index f42282c..0000000 --- a/modules/system/services/server/fileserver/seafile/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, ... }: -{ - services.seafile = { - enable = true; - gc.enable = true; - group = "nfsShare"; - adminEmail = "contact@${config.domains.p2}"; - initialAdminPassword = config.secrets.jimboAccPass; - }; -} diff --git a/modules/system/services/server/fileserver/seafile/nginx/default.nix b/modules/system/services/server/fileserver/seafile/nginx/default.nix deleted file mode 100644 index bb69ce7..0000000 --- a/modules/system/services/server/fileserver/seafile/nginx/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib, config, ... }: -{ - services.nginx.virtualHosts."cloud.${config.domains.p2}" = lib.mkIf config.services.icecast.enable { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8082"; - proxyWebsockets = true; - }; - }; -} diff --git a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix index 074aecf..bc9010b 100644 --- a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix @@ -7,7 +7,7 @@ settings.init.allow_root.set(true) settings.scheduler.fast_queues.set(2) - jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimBops")) + jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/JimBops")) jimbops_fallback = fallback([jimbops, jimbops]) output.icecast( diff --git a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix index 0faba2c..24cdab1 100644 --- a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix @@ -7,7 +7,7 @@ settings.init.allow_root.set(true) settings.scheduler.fast_queues.set(2) - jimscrapped = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimScrapped")) + jimscrapped = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/JimScrapped")) jimscrapped_fallback = fallback([jimscrapped, jimscrapped]) output.icecast(