From 65f90a0bf31199bb86c1d2407266a2b0cf873c56 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Sat, 12 Oct 2024 17:35:52 -0400 Subject: [PATCH] I think my flake needs a complete rewrite --- flake.lock | 36 ++--- flake.nix | 139 ++++++++---------- modules/home/settings/default.nix | 1 + modules/home/settings/fonts/default.nix | 19 +++ modules/system/default.nix | 5 + modules/system/desktop/default.nix | 1 + modules/system/fonts/default.nix | 24 --- .../services/{ => common}/ssh/default.nix | 0 .../{ => common}/ssh/fail2ban/default.nix | 0 .../system/services/{ => pc}/mpd/default.nix | 0 .../services/{ => pc}/networkfs/default.nix | 0 .../services/{ => pc}/school/default.nix | 0 .../services/{ => pc}/sunshine/default.nix | 0 .../{ => pc}/virtualization/qemu/default.nix | 0 .../virtualization/waydroid/default.nix | 0 .../services/{ => server}/acme/default.nix | 0 .../{ => server}/ddclient/default.nix | 0 .../{ => server}/fileserver/default.nix | 0 .../{ => server}/fileserver/local/default.nix | 0 .../fileserver/local/nfs/default.nix | 0 .../fileserver/local/samba/default.nix | 0 .../fileserver/public/default.nix | 0 .../fileserver/public/nextcloud/default.nix | 0 .../fileserver/public/photoprism/default.nix | 0 .../services/{ => server}/forgejo/default.nix | 0 .../{ => server}/forgejo/nginx/default.nix | 0 .../services/{ => server}/icecast/default.nix | 0 .../{ => server}/icecast/nginx/default.nix | 0 .../{ => server}/mailserver/default.nix | 0 .../{ => server}/mailserver/nginx/default.nix | 0 .../mailserver/roundcube/default.nix | 0 .../{ => server}/minecraft/common/default.nix | 0 .../minecraft/common/essentialsconfig.yml | 0 .../minecraft/common/vcserver.properties | 0 .../{ => server}/minecraft/default.nix | 0 .../minecraft/servers/blockworld/default.nix | 0 .../servers/dewdemolisher/default.nix | 0 .../minecraft/servers/johnside/default.nix | 0 .../minecraft/servers/roguecraft/default.nix | 0 .../minecraft/servers/uberbeta/default.nix | 0 .../minecraft/servers/velocity/default.nix | 0 .../services/{ => server}/misc/default.nix | 0 .../services/{ => server}/mysql/default.nix | 0 .../services/{ => server}/nginx/default.nix | 0 .../services/{ => server}/social/default.nix | 0 .../{ => server}/social/lemmy/default.nix | 0 .../social/lemmy/nginx/default.nix | 0 .../{ => server}/social/mastodon/default.nix | 0 .../{ => server}/social/matrix/default.nix | 0 .../social/matrix/element/default.nix | 0 .../social/matrix/element/nginx/default.nix | 0 .../social/matrix/synapse/coturn/default.nix | 0 .../matrix/synapse/coturn/nginx/default.nix | 0 .../social/matrix/synapse/default.nix | 0 .../social/matrix/synapse/nginx/default.nix | 0 .../matrix/synapse/slidingsync/default.nix | 0 .../{ => server}/social/owncast/default.nix | 0 .../social/owncast/nginx/default.nix | 0 .../{ => server}/social/pixelfed/default.nix | 0 .../{ => server}/transmission/default.nix | 0 .../transmission/nginx/default.nix | 0 .../{ => server}/vaultwarden/default.nix | 0 .../vaultwarden/nginx/default.nix | 0 .../services/virtualization/default.nix | 6 - overlays/mpv/default.nix | 4 +- 65 files changed, 110 insertions(+), 125 deletions(-) create mode 100644 modules/home/settings/fonts/default.nix delete mode 100644 modules/system/fonts/default.nix rename modules/system/services/{ => common}/ssh/default.nix (100%) rename modules/system/services/{ => common}/ssh/fail2ban/default.nix (100%) rename modules/system/services/{ => pc}/mpd/default.nix (100%) rename modules/system/services/{ => pc}/networkfs/default.nix (100%) rename modules/system/services/{ => pc}/school/default.nix (100%) rename modules/system/services/{ => pc}/sunshine/default.nix (100%) rename modules/system/services/{ => pc}/virtualization/qemu/default.nix (100%) rename modules/system/services/{ => pc}/virtualization/waydroid/default.nix (100%) rename modules/system/services/{ => server}/acme/default.nix (100%) rename modules/system/services/{ => server}/ddclient/default.nix (100%) rename modules/system/services/{ => server}/fileserver/default.nix (100%) rename modules/system/services/{ => server}/fileserver/local/default.nix (100%) rename modules/system/services/{ => server}/fileserver/local/nfs/default.nix (100%) rename modules/system/services/{ => server}/fileserver/local/samba/default.nix (100%) rename modules/system/services/{ => server}/fileserver/public/default.nix (100%) rename modules/system/services/{ => server}/fileserver/public/nextcloud/default.nix (100%) rename modules/system/services/{ => server}/fileserver/public/photoprism/default.nix (100%) rename modules/system/services/{ => server}/forgejo/default.nix (100%) rename modules/system/services/{ => server}/forgejo/nginx/default.nix (100%) rename modules/system/services/{ => server}/icecast/default.nix (100%) rename modules/system/services/{ => server}/icecast/nginx/default.nix (100%) rename modules/system/services/{ => server}/mailserver/default.nix (100%) rename modules/system/services/{ => server}/mailserver/nginx/default.nix (100%) rename modules/system/services/{ => server}/mailserver/roundcube/default.nix (100%) rename modules/system/services/{ => server}/minecraft/common/default.nix (100%) rename modules/system/services/{ => server}/minecraft/common/essentialsconfig.yml (100%) rename modules/system/services/{ => server}/minecraft/common/vcserver.properties (100%) rename modules/system/services/{ => server}/minecraft/default.nix (100%) rename modules/system/services/{ => server}/minecraft/servers/blockworld/default.nix (100%) rename modules/system/services/{ => server}/minecraft/servers/dewdemolisher/default.nix (100%) rename modules/system/services/{ => server}/minecraft/servers/johnside/default.nix (100%) rename modules/system/services/{ => server}/minecraft/servers/roguecraft/default.nix (100%) rename modules/system/services/{ => server}/minecraft/servers/uberbeta/default.nix (100%) rename modules/system/services/{ => server}/minecraft/servers/velocity/default.nix (100%) rename modules/system/services/{ => server}/misc/default.nix (100%) rename modules/system/services/{ => server}/mysql/default.nix (100%) rename modules/system/services/{ => server}/nginx/default.nix (100%) rename modules/system/services/{ => server}/social/default.nix (100%) rename modules/system/services/{ => server}/social/lemmy/default.nix (100%) rename modules/system/services/{ => server}/social/lemmy/nginx/default.nix (100%) rename modules/system/services/{ => server}/social/mastodon/default.nix (100%) rename modules/system/services/{ => server}/social/matrix/default.nix (100%) rename modules/system/services/{ => server}/social/matrix/element/default.nix (100%) rename modules/system/services/{ => server}/social/matrix/element/nginx/default.nix (100%) rename modules/system/services/{ => server}/social/matrix/synapse/coturn/default.nix (100%) rename modules/system/services/{ => server}/social/matrix/synapse/coturn/nginx/default.nix (100%) rename modules/system/services/{ => server}/social/matrix/synapse/default.nix (100%) rename modules/system/services/{ => server}/social/matrix/synapse/nginx/default.nix (100%) rename modules/system/services/{ => server}/social/matrix/synapse/slidingsync/default.nix (100%) rename modules/system/services/{ => server}/social/owncast/default.nix (100%) rename modules/system/services/{ => server}/social/owncast/nginx/default.nix (100%) rename modules/system/services/{ => server}/social/pixelfed/default.nix (100%) rename modules/system/services/{ => server}/transmission/default.nix (100%) rename modules/system/services/{ => server}/transmission/nginx/default.nix (100%) rename modules/system/services/{ => server}/vaultwarden/default.nix (100%) rename modules/system/services/{ => server}/vaultwarden/nginx/default.nix (100%) delete mode 100644 modules/system/services/virtualization/default.nix diff --git a/flake.lock b/flake.lock index 98ba869..5cf5787 100644 --- a/flake.lock +++ b/flake.lock @@ -333,22 +333,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1717602782, @@ -447,8 +431,8 @@ "mailserver": "mailserver", "minecraft": "minecraft", "nixpkgs": "nixpkgs_4", - "nixpkgs-unstable": "nixpkgs-unstable", - "nur": "nur" + "nur": "nur", + "unstable": "unstable" } }, "rust-overlay": { @@ -521,6 +505,22 @@ "type": "github" } }, + "unstable": { + "locked": { + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_2" diff --git a/flake.nix b/flake.nix index f0741bb..83278e3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,5 @@ { inputs = { - # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; @@ -29,6 +28,7 @@ nur, mailserver, blender-bin, + minecraft, hardware, lanzaboote, home-manager, @@ -36,7 +36,7 @@ } @inputs: let channels = { - master = import nixpkgs { + stable = import nixpkgs { inherit (flake) system overlays; config.allowUnfree = true; }; @@ -51,93 +51,82 @@ (import ./overlays/mpv { inherit (self) inputs channels; }) ]; packages = import ./packages/default.nix { inherit (nix) pkgs; }; - secrets = import ./extras/secrets.nix; - cmd = import ./extras/cmd.nix; - displays = import ./extras/displays.nix; - ips = import ./extras/ips.nix; - look = import ./extras/look.nix; - ws = import ./extras/workspaces.nix; }; nix = rec { - pkgs = channels.master // flake.packages; + pkgs = channels.stable // flake.packages; inherit (pkgs) lib; inherit (flake) channels-config; }; + + mkNixos = modules: nixpkgs.lib.nixosSystem { + inherit (nix) pkgs; + system = "x86_64-linux"; + specialArgs = { + inherit + inputs + ; + }; + }; + + mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration { + inherit (nix) pkgs; + }; in { + # Variables defined globally + secrets = import ./extras/secrets.nix; + cmd = import ./extras/cmd.nix; + displays = import ./extras/displays.nix; + ips = import ./extras/ips.nix; + look = import ./extras/look.nix; + ws = import ./extras/workspaces.nix; + # NixOS config entrypoint, use 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { - JimDesktop = nixpkgs.lib.nixosSystem { - inherit (nix) pkgs; - specialArgs = { inherit inputs outputs; }; - modules = [ - ./system/hosts/JimDesktop/configuration.nix - lanzaboote.nixosModules.lanzaboote - ]; - }; - JimServer = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - ./system/hosts/JimServer/configuration.nix - mailserver.nixosModule - ]; - }; - JimPine = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - ./system/hosts/JimPine/configuration.nix - hardware.nixosModules.pine64-pinebook-pro - ]; - }; - JimLenovo = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - ./system/hosts/JimLenovo/configuration.nix - ]; - }; + firefly = mkNixos [ + ./modules/system/hardware/firefly + ./modules/system + ./modules/system/desktop + ./modules/system/devices + ./modules/system/programs + ./modules/system/services/ssh + ./modules/system/services/sunshine + ./modules/system/services/networkfs + ./modules/system/services/virtualization + lanzaboote.nixosModules.lanzaboote + ]; + JimServer = mkNixos [ + ./system/hosts/JimServer/configuration.nix + mailserver.nixosModule + ]; + JimPine = mkNixos [ + ./system/hosts/JimPine/configuration.nix + hardware.nixosModules.pine64-pinebook-pro + ]; }; # Home-manager configuration, use 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { - "jimbo@JimDesktop" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - modules = [ - ./home/hosts/JimDesktop/home.nix - nur.nixosModules.nur - ]; - }; - "jimbo@JimServer" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - modules = [ - ./home/hosts/JimServer/home.nix - ]; - }; - "jimbo@JimPine" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.aarch64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - modules = [ - ./home/hosts/JimPine/home.nix - nur.nixosModules.nur - ]; - }; - "jimbo@JimLenovo" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - modules = [ - ./home/hosts/JimLenovo/home.nix - nur.nixosModules.nur - ]; - }; + "jimbo@JimDesktop" = mkHome [ + ./modules/home + ./modules/home/files + ./modules/home/programs + ./modules/home/settings + ./modules/home/sway + ./modules/home/utils + nur.nixosModules.nur + ]; + "jimbo@JimServer" = mkHome [ + ./home/hosts/JimServer/home.nix + ]; + "jimbo@JimPine" = mkHome [ + ./home/hosts/JimPine/home.nix + nur.nixosModules.nur + ]; # Derivation for ssh envrionments on other people's servers - "jimbo@JimTerminal" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - modules = [ - ./home/hosts/JimTerminal/home.nix - ]; - }; + "jimbo@JimTerminal" = mkHome [ + ./home/hosts/JimTerminal/home.nix + ]; }; }; } diff --git a/modules/home/settings/default.nix b/modules/home/settings/default.nix index 0b107fb..23945be 100644 --- a/modules/home/settings/default.nix +++ b/modules/home/settings/default.nix @@ -2,6 +2,7 @@ { imports = [ ./dconf + ./fonts ./gtk ./xdg ]; diff --git a/modules/home/settings/fonts/default.nix b/modules/home/settings/fonts/default.nix new file mode 100644 index 0000000..d6ef4f7 --- /dev/null +++ b/modules/home/settings/fonts/default.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + liberation_ttf + twitter-color-emoji + noto-fonts + sarasa-gothic + ubuntu_font_family + (nerdfonts.override { fonts = [ "UbuntuMono" ]; }) + ]; + + fonts.fontconfig = { + enable = true; + defaultFonts = { + sansSerif = [ "Ubuntu" ]; + monospace = [ "UbuntuMono Nerd Font Mono" ]; + emoji = [ "Twitter Color Emoji" ]; + }; + }; +} diff --git a/modules/system/default.nix b/modules/system/default.nix index e9c5c3e..5dd77d0 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -31,5 +31,10 @@ info.enable = false; }; + console = { + font = "${pkgs.terminus_font}/share/consolefonts/ter-u22n.psf.gz"; + packages = with pkgs; [ terminus_font ]; + }; + hardware.enableRedistributableFirmware = true; } diff --git a/modules/system/desktop/default.nix b/modules/system/desktop/default.nix index e413a8c..8cf5d39 100644 --- a/modules/system/desktop/default.nix +++ b/modules/system/desktop/default.nix @@ -4,5 +4,6 @@ ./qt ./wayland ./sway + ./fonts ]; } diff --git a/modules/system/fonts/default.nix b/modules/system/fonts/default.nix deleted file mode 100644 index da7080b..0000000 --- a/modules/system/fonts/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: { - fonts = { - packages = with pkgs; [ - liberation_ttf - twitter-color-emoji - noto-fonts - sarasa-gothic - ubuntu_font_family - (nerdfonts.override { - fonts = [ - "UbuntuMono" - ]; - }) - ]; - fontconfig.defaultFonts.emoji = [ - "Twitter Color Emoji" - ]; - }; - - console = { - font = "${pkgs.terminus_font}/share/consolefonts/ter-u22n.psf.gz"; - packages = with pkgs; [ terminus_font ]; - }; -} diff --git a/modules/system/services/ssh/default.nix b/modules/system/services/common/ssh/default.nix similarity index 100% rename from modules/system/services/ssh/default.nix rename to modules/system/services/common/ssh/default.nix diff --git a/modules/system/services/ssh/fail2ban/default.nix b/modules/system/services/common/ssh/fail2ban/default.nix similarity index 100% rename from modules/system/services/ssh/fail2ban/default.nix rename to modules/system/services/common/ssh/fail2ban/default.nix diff --git a/modules/system/services/mpd/default.nix b/modules/system/services/pc/mpd/default.nix similarity index 100% rename from modules/system/services/mpd/default.nix rename to modules/system/services/pc/mpd/default.nix diff --git a/modules/system/services/networkfs/default.nix b/modules/system/services/pc/networkfs/default.nix similarity index 100% rename from modules/system/services/networkfs/default.nix rename to modules/system/services/pc/networkfs/default.nix diff --git a/modules/system/services/school/default.nix b/modules/system/services/pc/school/default.nix similarity index 100% rename from modules/system/services/school/default.nix rename to modules/system/services/pc/school/default.nix diff --git a/modules/system/services/sunshine/default.nix b/modules/system/services/pc/sunshine/default.nix similarity index 100% rename from modules/system/services/sunshine/default.nix rename to modules/system/services/pc/sunshine/default.nix diff --git a/modules/system/services/virtualization/qemu/default.nix b/modules/system/services/pc/virtualization/qemu/default.nix similarity index 100% rename from modules/system/services/virtualization/qemu/default.nix rename to modules/system/services/pc/virtualization/qemu/default.nix diff --git a/modules/system/services/virtualization/waydroid/default.nix b/modules/system/services/pc/virtualization/waydroid/default.nix similarity index 100% rename from modules/system/services/virtualization/waydroid/default.nix rename to modules/system/services/pc/virtualization/waydroid/default.nix diff --git a/modules/system/services/acme/default.nix b/modules/system/services/server/acme/default.nix similarity index 100% rename from modules/system/services/acme/default.nix rename to modules/system/services/server/acme/default.nix diff --git a/modules/system/services/ddclient/default.nix b/modules/system/services/server/ddclient/default.nix similarity index 100% rename from modules/system/services/ddclient/default.nix rename to modules/system/services/server/ddclient/default.nix diff --git a/modules/system/services/fileserver/default.nix b/modules/system/services/server/fileserver/default.nix similarity index 100% rename from modules/system/services/fileserver/default.nix rename to modules/system/services/server/fileserver/default.nix diff --git a/modules/system/services/fileserver/local/default.nix b/modules/system/services/server/fileserver/local/default.nix similarity index 100% rename from modules/system/services/fileserver/local/default.nix rename to modules/system/services/server/fileserver/local/default.nix diff --git a/modules/system/services/fileserver/local/nfs/default.nix b/modules/system/services/server/fileserver/local/nfs/default.nix similarity index 100% rename from modules/system/services/fileserver/local/nfs/default.nix rename to modules/system/services/server/fileserver/local/nfs/default.nix diff --git a/modules/system/services/fileserver/local/samba/default.nix b/modules/system/services/server/fileserver/local/samba/default.nix similarity index 100% rename from modules/system/services/fileserver/local/samba/default.nix rename to modules/system/services/server/fileserver/local/samba/default.nix diff --git a/modules/system/services/fileserver/public/default.nix b/modules/system/services/server/fileserver/public/default.nix similarity index 100% rename from modules/system/services/fileserver/public/default.nix rename to modules/system/services/server/fileserver/public/default.nix diff --git a/modules/system/services/fileserver/public/nextcloud/default.nix b/modules/system/services/server/fileserver/public/nextcloud/default.nix similarity index 100% rename from modules/system/services/fileserver/public/nextcloud/default.nix rename to modules/system/services/server/fileserver/public/nextcloud/default.nix diff --git a/modules/system/services/fileserver/public/photoprism/default.nix b/modules/system/services/server/fileserver/public/photoprism/default.nix similarity index 100% rename from modules/system/services/fileserver/public/photoprism/default.nix rename to modules/system/services/server/fileserver/public/photoprism/default.nix diff --git a/modules/system/services/forgejo/default.nix b/modules/system/services/server/forgejo/default.nix similarity index 100% rename from modules/system/services/forgejo/default.nix rename to modules/system/services/server/forgejo/default.nix diff --git a/modules/system/services/forgejo/nginx/default.nix b/modules/system/services/server/forgejo/nginx/default.nix similarity index 100% rename from modules/system/services/forgejo/nginx/default.nix rename to modules/system/services/server/forgejo/nginx/default.nix diff --git a/modules/system/services/icecast/default.nix b/modules/system/services/server/icecast/default.nix similarity index 100% rename from modules/system/services/icecast/default.nix rename to modules/system/services/server/icecast/default.nix diff --git a/modules/system/services/icecast/nginx/default.nix b/modules/system/services/server/icecast/nginx/default.nix similarity index 100% rename from modules/system/services/icecast/nginx/default.nix rename to modules/system/services/server/icecast/nginx/default.nix diff --git a/modules/system/services/mailserver/default.nix b/modules/system/services/server/mailserver/default.nix similarity index 100% rename from modules/system/services/mailserver/default.nix rename to modules/system/services/server/mailserver/default.nix diff --git a/modules/system/services/mailserver/nginx/default.nix b/modules/system/services/server/mailserver/nginx/default.nix similarity index 100% rename from modules/system/services/mailserver/nginx/default.nix rename to modules/system/services/server/mailserver/nginx/default.nix diff --git a/modules/system/services/mailserver/roundcube/default.nix b/modules/system/services/server/mailserver/roundcube/default.nix similarity index 100% rename from modules/system/services/mailserver/roundcube/default.nix rename to modules/system/services/server/mailserver/roundcube/default.nix diff --git a/modules/system/services/minecraft/common/default.nix b/modules/system/services/server/minecraft/common/default.nix similarity index 100% rename from modules/system/services/minecraft/common/default.nix rename to modules/system/services/server/minecraft/common/default.nix diff --git a/modules/system/services/minecraft/common/essentialsconfig.yml b/modules/system/services/server/minecraft/common/essentialsconfig.yml similarity index 100% rename from modules/system/services/minecraft/common/essentialsconfig.yml rename to modules/system/services/server/minecraft/common/essentialsconfig.yml diff --git a/modules/system/services/minecraft/common/vcserver.properties b/modules/system/services/server/minecraft/common/vcserver.properties similarity index 100% rename from modules/system/services/minecraft/common/vcserver.properties rename to modules/system/services/server/minecraft/common/vcserver.properties diff --git a/modules/system/services/minecraft/default.nix b/modules/system/services/server/minecraft/default.nix similarity index 100% rename from modules/system/services/minecraft/default.nix rename to modules/system/services/server/minecraft/default.nix diff --git a/modules/system/services/minecraft/servers/blockworld/default.nix b/modules/system/services/server/minecraft/servers/blockworld/default.nix similarity index 100% rename from modules/system/services/minecraft/servers/blockworld/default.nix rename to modules/system/services/server/minecraft/servers/blockworld/default.nix diff --git a/modules/system/services/minecraft/servers/dewdemolisher/default.nix b/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix similarity index 100% rename from modules/system/services/minecraft/servers/dewdemolisher/default.nix rename to modules/system/services/server/minecraft/servers/dewdemolisher/default.nix diff --git a/modules/system/services/minecraft/servers/johnside/default.nix b/modules/system/services/server/minecraft/servers/johnside/default.nix similarity index 100% rename from modules/system/services/minecraft/servers/johnside/default.nix rename to modules/system/services/server/minecraft/servers/johnside/default.nix diff --git a/modules/system/services/minecraft/servers/roguecraft/default.nix b/modules/system/services/server/minecraft/servers/roguecraft/default.nix similarity index 100% rename from modules/system/services/minecraft/servers/roguecraft/default.nix rename to modules/system/services/server/minecraft/servers/roguecraft/default.nix diff --git a/modules/system/services/minecraft/servers/uberbeta/default.nix b/modules/system/services/server/minecraft/servers/uberbeta/default.nix similarity index 100% rename from modules/system/services/minecraft/servers/uberbeta/default.nix rename to modules/system/services/server/minecraft/servers/uberbeta/default.nix diff --git a/modules/system/services/minecraft/servers/velocity/default.nix b/modules/system/services/server/minecraft/servers/velocity/default.nix similarity index 100% rename from modules/system/services/minecraft/servers/velocity/default.nix rename to modules/system/services/server/minecraft/servers/velocity/default.nix diff --git a/modules/system/services/misc/default.nix b/modules/system/services/server/misc/default.nix similarity index 100% rename from modules/system/services/misc/default.nix rename to modules/system/services/server/misc/default.nix diff --git a/modules/system/services/mysql/default.nix b/modules/system/services/server/mysql/default.nix similarity index 100% rename from modules/system/services/mysql/default.nix rename to modules/system/services/server/mysql/default.nix diff --git a/modules/system/services/nginx/default.nix b/modules/system/services/server/nginx/default.nix similarity index 100% rename from modules/system/services/nginx/default.nix rename to modules/system/services/server/nginx/default.nix diff --git a/modules/system/services/social/default.nix b/modules/system/services/server/social/default.nix similarity index 100% rename from modules/system/services/social/default.nix rename to modules/system/services/server/social/default.nix diff --git a/modules/system/services/social/lemmy/default.nix b/modules/system/services/server/social/lemmy/default.nix similarity index 100% rename from modules/system/services/social/lemmy/default.nix rename to modules/system/services/server/social/lemmy/default.nix diff --git a/modules/system/services/social/lemmy/nginx/default.nix b/modules/system/services/server/social/lemmy/nginx/default.nix similarity index 100% rename from modules/system/services/social/lemmy/nginx/default.nix rename to modules/system/services/server/social/lemmy/nginx/default.nix diff --git a/modules/system/services/social/mastodon/default.nix b/modules/system/services/server/social/mastodon/default.nix similarity index 100% rename from modules/system/services/social/mastodon/default.nix rename to modules/system/services/server/social/mastodon/default.nix diff --git a/modules/system/services/social/matrix/default.nix b/modules/system/services/server/social/matrix/default.nix similarity index 100% rename from modules/system/services/social/matrix/default.nix rename to modules/system/services/server/social/matrix/default.nix diff --git a/modules/system/services/social/matrix/element/default.nix b/modules/system/services/server/social/matrix/element/default.nix similarity index 100% rename from modules/system/services/social/matrix/element/default.nix rename to modules/system/services/server/social/matrix/element/default.nix diff --git a/modules/system/services/social/matrix/element/nginx/default.nix b/modules/system/services/server/social/matrix/element/nginx/default.nix similarity index 100% rename from modules/system/services/social/matrix/element/nginx/default.nix rename to modules/system/services/server/social/matrix/element/nginx/default.nix diff --git a/modules/system/services/social/matrix/synapse/coturn/default.nix b/modules/system/services/server/social/matrix/synapse/coturn/default.nix similarity index 100% rename from modules/system/services/social/matrix/synapse/coturn/default.nix rename to modules/system/services/server/social/matrix/synapse/coturn/default.nix diff --git a/modules/system/services/social/matrix/synapse/coturn/nginx/default.nix b/modules/system/services/server/social/matrix/synapse/coturn/nginx/default.nix similarity index 100% rename from modules/system/services/social/matrix/synapse/coturn/nginx/default.nix rename to modules/system/services/server/social/matrix/synapse/coturn/nginx/default.nix diff --git a/modules/system/services/social/matrix/synapse/default.nix b/modules/system/services/server/social/matrix/synapse/default.nix similarity index 100% rename from modules/system/services/social/matrix/synapse/default.nix rename to modules/system/services/server/social/matrix/synapse/default.nix diff --git a/modules/system/services/social/matrix/synapse/nginx/default.nix b/modules/system/services/server/social/matrix/synapse/nginx/default.nix similarity index 100% rename from modules/system/services/social/matrix/synapse/nginx/default.nix rename to modules/system/services/server/social/matrix/synapse/nginx/default.nix diff --git a/modules/system/services/social/matrix/synapse/slidingsync/default.nix b/modules/system/services/server/social/matrix/synapse/slidingsync/default.nix similarity index 100% rename from modules/system/services/social/matrix/synapse/slidingsync/default.nix rename to modules/system/services/server/social/matrix/synapse/slidingsync/default.nix diff --git a/modules/system/services/social/owncast/default.nix b/modules/system/services/server/social/owncast/default.nix similarity index 100% rename from modules/system/services/social/owncast/default.nix rename to modules/system/services/server/social/owncast/default.nix diff --git a/modules/system/services/social/owncast/nginx/default.nix b/modules/system/services/server/social/owncast/nginx/default.nix similarity index 100% rename from modules/system/services/social/owncast/nginx/default.nix rename to modules/system/services/server/social/owncast/nginx/default.nix diff --git a/modules/system/services/social/pixelfed/default.nix b/modules/system/services/server/social/pixelfed/default.nix similarity index 100% rename from modules/system/services/social/pixelfed/default.nix rename to modules/system/services/server/social/pixelfed/default.nix diff --git a/modules/system/services/transmission/default.nix b/modules/system/services/server/transmission/default.nix similarity index 100% rename from modules/system/services/transmission/default.nix rename to modules/system/services/server/transmission/default.nix diff --git a/modules/system/services/transmission/nginx/default.nix b/modules/system/services/server/transmission/nginx/default.nix similarity index 100% rename from modules/system/services/transmission/nginx/default.nix rename to modules/system/services/server/transmission/nginx/default.nix diff --git a/modules/system/services/vaultwarden/default.nix b/modules/system/services/server/vaultwarden/default.nix similarity index 100% rename from modules/system/services/vaultwarden/default.nix rename to modules/system/services/server/vaultwarden/default.nix diff --git a/modules/system/services/vaultwarden/nginx/default.nix b/modules/system/services/server/vaultwarden/nginx/default.nix similarity index 100% rename from modules/system/services/vaultwarden/nginx/default.nix rename to modules/system/services/server/vaultwarden/nginx/default.nix diff --git a/modules/system/services/virtualization/default.nix b/modules/system/services/virtualization/default.nix deleted file mode 100644 index 8f61253..0000000 --- a/modules/system/services/virtualization/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - imports = [ - ./qemu - ]; -} diff --git a/overlays/mpv/default.nix b/overlays/mpv/default.nix index 306914a..7538162 100644 --- a/overlays/mpv/default.nix +++ b/overlays/mpv/default.nix @@ -1,5 +1,5 @@ { ... }: -self: super: { +(self: super: { mpv = super.mpv.override { scripts = with self.mpvScripts; [ mpris @@ -7,4 +7,4 @@ self: super: { thumbnail ]; }; -} +})