From 6d7026d08b552e24a96abbf7a05a32638bcb803a Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Fri, 25 Oct 2024 19:53:50 -0400
Subject: [PATCH] chore: cleanup old and/or unused stuff

---
 hosts/Hevana/default.nix            |   5 --
 modules/common.nix                  |   6 --
 modules/secrets/default.nix         | Bin 4970 -> 4905 bytes
 modules/services/airsonic.nix       |  71 ------------------------
 modules/services/home-assistant.nix |  83 ----------------------------
 modules/users/aires/default.nix     |   6 +-
 modules/users/root/default.nix      |  18 ++----
 packages/airsonic-advanced.nix      |  33 -----------
 8 files changed, 9 insertions(+), 213 deletions(-)
 delete mode 100644 modules/services/airsonic.nix
 delete mode 100644 modules/services/home-assistant.nix
 delete mode 100644 packages/airsonic-advanced.nix

diff --git a/hosts/Hevana/default.nix b/hosts/Hevana/default.nix
index 2a0a7f0..2f828d1 100644
--- a/hosts/Hevana/default.nix
+++ b/hosts/Hevana/default.nix
@@ -112,11 +112,6 @@ in
         home = "${services-root}/forgejo";
         url = config.secrets.services.forgejo.url;
       };
-      home-assistant = {
-        enable = false;
-        home = "${services-root}/home-assistant";
-        url = config.secrets.services.home-assistant.url;
-      };
       jellyfin = {
         enable = true;
         home = "${services-root}/jellyfin";
diff --git a/modules/common.nix b/modules/common.nix
index 854a2d7..b8e498b 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -48,12 +48,6 @@
       # Install ZSH for all users
       zsh.enable = true;
 
-      # Enable NH, an alternative nixos-rebuild frontend.
-      # https://github.com/viperML/nh
-      nh = {
-        enable = true;
-        flake = "${config.secrets.nixConfigFolder}";
-      };
       # Configure nano
       nano.nanorc = ''
         set tabsize 4
diff --git a/modules/secrets/default.nix b/modules/secrets/default.nix
index 6eb92bfa03e9a256dd49f39a32a37ec2bdc549a9..1246e2aef1d4981611b2c781a397cf4fbf7c9cff 100644
GIT binary patch
literal 4905
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
bp_k6o)VKzQh?N@gi|nB4Vn=?iit&ZTYuAqD

literal 4970
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

diff --git a/modules/services/airsonic.nix b/modules/services/airsonic.nix
deleted file mode 100644
index 31af51f..0000000
--- a/modules/services/airsonic.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-let
-  cfg = config.aux.system.services.airsonic;
-in
-{
-  options = {
-    aux.system.services.airsonic = {
-      enable = lib.mkEnableOption "Enables Airsonic Advanced media streaming service.";
-      home = lib.mkOption {
-        default = "/var/lib/airsonic";
-        type = lib.types.str;
-        description = "Where to store Airsonic's files";
-      };
-      url = lib.mkOption {
-        default = "";
-        type = lib.types.str;
-        description = "The complete URL where Airsonic is hosted.";
-        example = "https://forgejo.example.com";
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    aux.system.users.media.enable = true;
-    users.users.airsonic.extraGroups = [ "media" ];
-
-    services = {
-      nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURL cfg.url;
-        forceSSL = true;
-        locations."/" = {
-          proxyPass = "http://127.0.0.1:4040";
-          proxyWebsockets = true;
-          extraConfig = ''
-            # Taken from https://airsonic.github.io/docs/proxy/nginx/
-            proxy_set_header X-Real-IP         $remote_addr;
-            proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto https;
-            proxy_set_header X-Forwarded-Host  $host;
-            proxy_set_header Host              $host;
-            proxy_max_temp_file_size           0;
-            proxy_ssl_server_name on;
-          '';
-        };
-      };
-
-      airsonic = {
-        enable = true;
-        war = "${
-          (pkgs.callPackage ../../packages/airsonic-advanced.nix { inherit lib; })
-        }/webapps/airsonic.war";
-        port = 4040;
-        jre = pkgs.jdk17;
-        jvmOptions = [
-          "-Dserver.use-forward-headers=true"
-          "-Xmx4G" # Increase Java heap size to 4GB
-        ];
-      } // lib.optionalAttrs (cfg.home != "") { home = cfg.home; };
-    };
-
-    systemd.services = {
-      airsonic.unitConfig.RequiresMountsFor = cfg.home;
-      nginx.wants = [ config.systemd.services.airsonic.name ];
-    };
-  };
-}
diff --git a/modules/services/home-assistant.nix b/modules/services/home-assistant.nix
deleted file mode 100644
index 03cd5e8..0000000
--- a/modules/services/home-assistant.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.aux.system.services.home-assistant;
-in
-{
-  options = {
-    aux.system.services.home-assistant = {
-      enable = lib.mkEnableOption "Enables Home Assistant.";
-      home = lib.mkOption {
-        default = "/etc/home-assistant";
-        type = lib.types.str;
-        description = "Where to store Home Assistant's files";
-        example = "/home/home-assistant";
-      };
-      url = lib.mkOption {
-        default = "";
-        type = lib.types.str;
-        description = "The complete URL where Home Assistant is hosted.";
-        example = "https://home-assistant.example.com";
-      };
-    };
-
-  };
-
-  config = lib.mkIf cfg.enable {
-    services = {
-      home-assistant = {
-        enable = true;
-        # opt-out from declarative configuration management
-        lovelaceConfig = null;
-        # configure the path to your config directory
-        configDir = cfg.home;
-        # specify list of components required by your configuration
-        extraComponents = [
-          "default_config"
-          "esphome"
-          "eufy"
-          "govee_light_local"
-          "met"
-          "radio_browser"
-          "tplink"
-        ];
-        extraPackages = python3Packages: with python3Packages; [ numpy ];
-        config.http = {
-          server_host = "::1";
-          trusted_proxies = [ "::1" ];
-          use_x_forwarded_for = true;
-        };
-      };
-      nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURL cfg.url;
-        forceSSL = true;
-        locations."/" = {
-          proxyPass = "http://[::1]:8123";
-          proxyWebsockets = true;
-          extraConfig = ''
-            # Security / XSS Mitigation Headers
-            add_header X-Frame-Options "SAMEORIGIN";
-            add_header X-Content-Type-Options "nosniff";
-
-            proxy_ssl_server_name on;
-            proxy_set_header Host $host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Real-IP $remote_addr;
-
-            proxy_buffering off;
-          '';
-        };
-      };
-    };
-
-    systemd.services = {
-      home-assistant.unitConfig.RequiresMountsFor = cfg.home;
-      nginx.wants = [ config.systemd.services.home-assistant.name ];
-    };
-  };
-}
diff --git a/modules/users/aires/default.nix b/modules/users/aires/default.nix
index 8cecc94..10013d6 100644
--- a/modules/users/aires/default.nix
+++ b/modules/users/aires/default.nix
@@ -76,8 +76,12 @@ in
               userName = config.secrets.users.aires.firstName;
               userEmail = config.secrets.users.aires.email;
               extraConfig = {
-                safe.directory = "${config.secrets.nixConfigFolder}/.git";
+                core.editor = config.aux.system.editor;
+                merge.conflictStyle = "zdiff3";
+                pull.ff = "only";
                 push.autoSetupRemote = "true";
+                safe.directory = "${config.secrets.nixConfigFolder}/.git";
+                submodule.recurse = true;
               };
             };
 
diff --git a/modules/users/root/default.nix b/modules/users/root/default.nix
index a8c6062..cfc3fc6 100644
--- a/modules/users/root/default.nix
+++ b/modules/users/root/default.nix
@@ -1,20 +1,10 @@
-{ config, lib, ... }:
+{ ... }:
 {
-  # Give root user access to run remote builds
   home-manager.users.root = {
     home.stateVersion = "24.05";
-    programs = {
-      git.extraConfig = {
-        safe.directory = "${config.secrets.nixConfigFolder}/.git";
-      };
-      ssh = {
-        enable = true;
-        matchBlocks = config.secrets.users.root.sshConfig;
-      };
-      zsh = {
-        oh-my-zsh.theme = "kardan";
-        shellAliases.nos = "nixos-operations-script";
-      };
+    programs.zsh = {
+      oh-my-zsh.theme = "kardan";
+      shellAliases.nos = "nixos-operations-script";
     };
   };
 }
diff --git a/packages/airsonic-advanced.nix b/packages/airsonic-advanced.nix
deleted file mode 100644
index 3208420..0000000
--- a/packages/airsonic-advanced.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  nixosTests,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "airsonic-advanced";
-  version = "11.1.4-SNAPSHOT.20240628143437";
-
-  src = fetchurl {
-    url = "https://github.com/kagemomiji/airsonic-advanced/releases/download/${version}/airsonic.war";
-    sha256 = "fde2c921e26cf536405118c5114a2f42fe87ff0a019852f21c80f4c68a2431ee";
-  };
-
-  buildCommand = ''
-    mkdir -p "$out/webapps"
-    cp "$src" "$out/webapps/airsonic.war"
-  '';
-
-  passthru.tests = {
-    airsonic-starts = nixosTests.airsonic;
-  };
-
-  meta = {
-    description = "Free, web-based media streamer providing ubiquitous access to your music.";
-    homepage = "https://github.com/kagemomiji/airsonic-advanced/";
-    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.all;
-  };
-}