nix/configuration/configuration.nix

@@ -39,8 +39,6 @@
     ./roles/bsnes
     ./roles/ssh
     ./roles/python
-    ./roles/docker
-    ./roles/kubernetes
   ];
 
   nix.settings.experimental-features = [
@@ -94,7 +92,7 @@
     # Runs nix-collect-garbage --delete-older-than 5d
     automatic = true;
     randomizedDelaySec = "14m";
-    options = "--delete-older-than 30d";
+    options = "--delete-older-than 5d";
   };
 
   # Use doas instead of sudo

nix/configuration/roles/docker/default.nix

@@ -1,39 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  virtualisation.docker.enable = true;
-  virtualisation.docker.rootless = {
-    enable = true;
-    setSocketVariable = true;
-  };
-
-  environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    directories = [
-      {
-        directory = "/var/lib/docker";
-        user = "root";
-        group = "root";
-        mode = "0740";
-      }
-    ];
-    users.talexander = {
-      directories = [
-        {
-          directory = ".local/share/docker";
-          user = "talexander";
-          group = "talexander";
-          mode = "0740";
-        }
-      ];
-    };
-  };
-
-}

nix/configuration/roles/gpg/default.nix

@@ -96,16 +96,4 @@
   #   })
   # ];
 
-  # nixpkgs.overlays = [
-  #   (final: prev: {
-  #     gnupg = prev.gnupg.overrideAttrs (old: rec {
-  #       version = "2.4.7";
-  #       src = prev.fetchurl {
-  #         url = "https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2";
-  #         hash = "sha256-eyRwbk2n4OOwbKBoIxAnQB8jgQLEHJCWMTSdzDuF60Y=";
-  #       };
-  #     });
-  #   })
-  # ];
-
 }

nix/configuration/roles/kubernetes/default.nix

@@ -1,43 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  alias_kx = pkgs.writeShellScriptBin "kx" ''
-    exec ${pkgs.kubeswitch}/bin/switcher "''${@}"
-  '';
-  alias_ks = pkgs.writeShellScriptBin "ks" ''
-    exec ${pkgs.kubeswitch}/bin/switcher namespace "''${@}"
-  '';
-  alias_k = pkgs.writeShellScriptBin "k" ''
-    exec ${pkgs.kubectl}/bin/kubectl "''${@}"
-  '';
-  alias_ka = pkgs.writeShellScriptBin "ka" ''
-    exec ${pkgs.kubectl}/bin/kubectl "''${@}" --all-namespaces
-  '';
-  alias_kdel = pkgs.writeShellScriptBin "kdel" ''
-    exec ${pkgs.kubectl}/bin/kubectl delete --all "''${@}"
-  '';
-  alias_kd = pkgs.writeShellScriptBin "kd" ''
-    export KUBECTL_EXTERNAL_DIFF="${pkgs.colordiff}/bin/colordiff -N -u"
-    exec ${pkgs.kubectl}/bin/kubectl diff "''${@}"
-  '';
-in
-{
-  imports = [ ];
-
-  environment.systemPackages = with pkgs; [
-    kubectl
-    kubeswitch
-    stern
-    alias_kx
-    alias_ks
-    alias_k
-    alias_ka
-    alias_kdel
-    alias_kd
-  ];
-}