diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index f0d7c70..5819aaf 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -4,46 +4,7 @@ ./hardware-configuration.nix ../../base.nix ]; - my = { - emacs.enable = true; - apps.dictionaries.enable = true; - shell.tools.enable = true; - services = { - network.enable = true; - nvidia.enable = true; - }; - dev = { - nix.enable = true; - python.enable = true; - sh.enable = true; - }; - scripts = { - run.enable = true; - download.enable = true; - split-dir.enable = true; - ffmpreg.enable = true; - ffmpeg4discord.enable = true; - manage-library.enable = true; - library-report.enable = true; - }; - units.downloadManga.enable = true; - servers = { - sonarr.enable = true; - radarr.enable = true; - lidarr.enable = true; - prowlarr.enable = true; - bazarr.enable = true; - kavita.enable = true; - qbittorrent.enable = true; - sabnzbd.enable = true; - unpackerr.enable = true; - plex.enable = true; - jellyfin = { - enable = true; - enableCron = true; - }; - }; - }; + my = import ./toggles.nix; networking = let ports = [ @@ -92,7 +53,10 @@ createHome = true; group = "nixremote"; home = "/var/nixremote/"; - openssh.authorizedKeys.keyFiles = [ ../../secrets/ssh/ed25519_nixworkstation.pub ]; + openssh.authorizedKeys.keyFiles = [ + ../../secrets/ssh/ed25519_nixworkstation.pub + ../../secrets/ssh/ed25519_nixminiserver.pub + ]; }; }; }; diff --git a/hosts/server/toggles.nix b/hosts/server/toggles.nix new file mode 100644 index 0000000..be07dd7 --- /dev/null +++ b/hosts/server/toggles.nix @@ -0,0 +1,40 @@ +{ + emacs.enable = true; + apps.dictionaries.enable = true; + shell.tools.enable = true; + services = { + network.enable = true; + nvidia.enable = true; + }; + dev = { + nix.enable = true; + python.enable = true; + sh.enable = true; + }; + scripts = { + run.enable = true; + download.enable = true; + split-dir.enable = true; + ffmpreg.enable = true; + ffmpeg4discord.enable = true; + manage-library.enable = true; + library-report.enable = true; + }; + units.downloadManga.enable = true; + servers = { + sonarr.enable = true; + radarr.enable = true; + lidarr.enable = true; + prowlarr.enable = true; + bazarr.enable = true; + kavita.enable = true; + qbittorrent.enable = true; + sabnzbd.enable = true; + unpackerr.enable = true; + plex.enable = true; + jellyfin = { + enable = true; + enableCron = true; + }; + }; +} diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index e48b5c7..e6ca8e4 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -5,48 +5,7 @@ ../../base.nix ../../gnome.nix ]; - my = { - enableContainers = true; - emacs.enable = true; - apps = { - art.enable = true; - dictionaries.enable = true; - fonts.enable = true; - gaming.enable = true; - internet.enable = true; - multimedia.enable = true; - office.enable = true; - misc.enable = true; - }; - dev = { - haskell.enable = true; - nix.enable = true; - python.enable = true; - gameDev.enable = true; - sh.enable = true; - javascript.enable = true; - }; - shell = { - exercism.enable = true; - multimedia.enable = true; - tools.enable = true; - }; - services = { - network.enable = true; - nvidia.enable = true; - printing.enable = true; - sound.enable = true; - }; - scripts = { - tasks.enable = true; - run.enable = true; - split-dir.enable = true; - download.enable = true; - ffmpreg.enable = true; - ffmpeg4discord.enable = true; - }; - servers.drpp.enable = true; - }; + my = import ./toggles.nix; sops.secrets = { "resilio/user" = { }; "resilio/host" = { }; diff --git a/hosts/workstation/toggles.nix b/hosts/workstation/toggles.nix new file mode 100644 index 0000000..45ff220 --- /dev/null +++ b/hosts/workstation/toggles.nix @@ -0,0 +1,42 @@ +{ + enableContainers = true; + emacs.enable = true; + apps = { + art.enable = true; + dictionaries.enable = true; + fonts.enable = true; + gaming.enable = true; + internet.enable = true; + multimedia.enable = true; + office.enable = true; + misc.enable = true; + }; + dev = { + haskell.enable = true; + nix.enable = true; + python.enable = true; + gameDev.enable = true; + sh.enable = true; + javascript.enable = true; + }; + shell = { + exercism.enable = true; + multimedia.enable = true; + tools.enable = true; + }; + services = { + network.enable = true; + nvidia.enable = true; + printing.enable = true; + sound.enable = true; + }; + scripts = { + tasks.enable = true; + run.enable = true; + split-dir.enable = true; + download.enable = true; + ffmpreg.enable = true; + ffmpeg4discord.enable = true; + }; + servers.drpp.enable = true; +}