nix/configuration/configuration.nix

@@ -130,7 +130,6 @@
     strace
     tcpdump
     git-crypt
-    nix-index-unwrapped
   ];
 
   services.openssh = {

nix/configuration/hosts/odo/disk-config.nix

@@ -118,7 +118,4 @@ lib.mkIf (!config.me.buildingIso) {
   fileSystems."/persist".neededForBoot = true;
   fileSystems."/state".neededForBoot = true;
   fileSystems."/home".neededForBoot = true;
-
-  # Only attempt to decrypt the main pool. Otherwise it attempts to decrypt pools that aren't even used.
-  boot.zfs.requestEncryptionCredentials = [ "zroot/linux/nix" ];
 }

nix/configuration/roles/gpg/default.nix

@@ -15,18 +15,7 @@
   # gpg -vvv --auto-key-locate local,wkd --locate-keys tom@fizz.buzz
 
   hardware.gpgSmartcards.enable = true;
-  services.udev.packages = [
+  services.udev.packages = [ pkgs.yubikey-personalization ];
-    pkgs.yubikey-personalization
-    pkgs.libfido2
-    (pkgs.writeTextFile {
-      name = "my-rules";
-      text = ''
-        ACTION=="add", SUBSYSTEM=="usb", ENV{ID_VENDOR_ID}=="1050", ENV{ID_MODEL_ID}=="0406", MODE="660", GROUP="wheel"
-        KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0406", TAG+="uaccess", GROUP="wheel", MODE="0660"
-      '';
-      destination = "/etc/udev/rules.d/50-yubikey.rules";
-    })
-  ];
   services.pcscd.enable = true;
   # services.gnome.gnome-keyring.enable = true;
 
@@ -47,7 +36,7 @@
       };
     };
 
-  # programs.gnupg.dirmngr.enable = true;
+  programs.gnupg.dirmngr.enable = true;
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
@@ -71,51 +60,16 @@
     };
   };
 
-  nixpkgs.overlays = [
+  # nixpkgs.overlays = [
-    (final: prev: {
+  #   (final: prev: {
-      # pcsclite = prev.pcsclite.overrideAttrs (old: {
+  #     pcsclite = prev.pcsclite.overrideAttrs (old: {
-      #   postPatch = ''
+  #       postPatch = ''
-      #     substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
+  #         substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-      #       --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+  #           --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-      #   '';
+  #       '';
-      # });
+  #     });
-
+  #   })
-      # pcsclite = prev.pcsclite.overrideAttrs (old: {
+  # ];
-      #   postPatch =
-      #     old.postPatch
-      #     + (lib.optionalString
-      #       (!(lib.strings.hasInfix ''--replace-fail "libpcsclite_real.so.1"'' old.postPatch))
-      #       ''
-      #         substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-      #           --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-      #       ''
-      #     );
-      # });
-
-      # pcsclite = prev.pcsclite.overrideAttrs (old: {
-      #   postPatch =
-      #     old.postPatch
-      #     + ''
-      #       substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-      #         --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-      #     '';
-      # });
-
-      # gnupg = prev.gnupg.override {
-      #   pcsclite = pkgs.pcsclite.overrideAttrs (old: {
-      #     postPatch =
-      #       old.postPatch
-      #       + (lib.optionalString
-      #         (!(lib.strings.hasInfix ''--replace-fail "libpcsclite_real.so.1"'' old.postPatch))
-      #         ''
-      #           substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-      #             --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-      #         ''
-      #       );
-      #   });
-      # };
-    })
-  ];
 
   # security.polkit.extraConfig = ''
   #   polkit.addRule(function(action, subject) {
@@ -132,18 +86,13 @@
   # '';
 
   environment.systemPackages = with pkgs; [
-    pcsclite
     pcsctools
-    yubikey-personalization
-    yubikey-manager
-    glibcLocales
   ];
 
   # nixpkgs.overlays = [
   #   (final: prev: {
   #     gnupg = pkgs-unstable.gnupg;
   #     scdaemon = pkgs-unstable.scdaemon;
-  #     libgcrypt = pkgs-unstable.libgcrypt;
   #   })
   # ];
 
@@ -159,5 +108,4 @@
   #   })
   # ];
 
-  programs.gnupg.agent.enableExtraSocket = true;
 }

nix/configuration/roles/gpg/files/scdaemon.conf

@@ -1,7 +1,2 @@
 reader-port Yubico Yubi
 disable-ccid
-
-log-file /home/talexander/scd.log
-verbose
-debug cardio
-debug-level 5

nix/configuration/roles/kubernetes/default.nix

@@ -25,9 +25,6 @@ let
     export KUBECTL_EXTERNAL_DIFF="${pkgs.colordiff}/bin/colordiff -N -u"
     exec ${pkgs.kubectl}/bin/kubectl diff "''${@}"
   '';
-  alias_klog = pkgs.writeShellScriptBin "klog" ''
-    exec ${pkgs.kubectl}/bin/kubectl logs --all-containers "$@"
-  '';
 in
 {
   imports = [ ];
@@ -42,21 +39,5 @@ in
     alias_ka
     alias_kdel
     alias_kd
-    alias_klog
   ];
-
-  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        {
-          directory = ".kube";
-          user = "talexander";
-          group = "talexander";
-          mode = "0750";
-        }
-      ];
-    };
-  };
-
 }

nix/configuration/roles/network/default.nix

@@ -10,16 +10,16 @@
 
   networking.dhcpcd.enable = false;
   networking.useDHCP = false;
-  # networking.nameservers = [
+  networking.nameservers = [
-  #   "194.242.2.2#doh.mullvad.net"
+    "194.242.2.2#doh.mullvad.net"
-  #   "2a07:e340::2#doh.mullvad.net"
+    "2a07:e340::2#doh.mullvad.net"
-  # ];
+  ];
   services.resolved = {
     enable = true;
     # dnssec = "true";
-    # domains = [ "~." ];
+    domains = [ "~." ];
-    # fallbackDns = [ ];
+    fallbackDns = [ ];
-    # dnsovertls = "true";
+    dnsovertls = "true";
   };
 
   # Without this, systemd-resolved will send DNS requests for <X>.home.arpa to the per-link DNS server (172.16.0.1) which does not support DNS-over-TLS. This leads to the connection anging and timing out. This causes firefox startup to take an extra 10+ seconds.

nix/configuration/roles/sway/default.nix

@@ -373,11 +373,6 @@ in
           source = ./files/settings.ini;
         };
       };
-      home.file = {
-        ".icons/default" = {
-          source = "${pkgs.adwaita-icon-theme}/share/icons/Adwaita";
-        };
-      };
     };
 
   # For mounting drives in pcmanfm