hotfixes

README.md

@@ -1,6 +1,6 @@
 ## Unified nix configuration
 
-Update whole flake: `nix flake update --commit-lock-file`
+Update whole flake (clean working directory 1st): `nix flake update --commit-lock-file`
 
 Switch current machine: `sudo nixos-rebuild switch --flake . --show-trace`
 

home/modules/baseline.nix

@@ -33,7 +33,8 @@ in {
         vim
         zip
       ];
-      keyboard = {  #TODO switch to normal people variant
+      keyboard = {
+        #TODO switch to normal people variant
         layout = "us";
         variant = "altgr-intl";
       };

home/modules/default.nix

@@ -9,14 +9,10 @@
     ./neovim.nix
     ./baseline.nix
     ./gaming.nix
-    ./yubikey.nix
     ./firefox.nix
     ./gui
     ./zsh
     ./defaultDesktopPack.nix
-    ./accounts.nix
-    ./syncthing.nix
-    ./deepState.nix
     ./mapping.nix
   ];
 }

home/modules/gpg.nix

@@ -1,61 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.local.services.gpg;
-in {
-  options.local.services.gpg = {
-    enable = mkEnableOption "gpg settings";
-    defaultKey = mkOption {
-      type = types.str;
-      description = "fingerprint of default public key to be used in gpg, git, email, etc.";
-      example = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
-    };
-  };
-  config = mkIf cfg.enable {
-    programs.gpg = {
-      enable = true;
-      settings = {
-        default-key = config.local.services.gpg.defaultKey;
-      };
-    };
-
-    services.gpg-agent = {
-      enable = true;
-
-      enableZshIntegration = true;
-      enableBashIntegration = true;
-
-      enableExtraSocket = true;
-      enableSshSupport = true;
-
-      defaultCacheTtl = 3600 * 3;
-      defaultCacheTtlSsh = 3600 * 3;
-
-      maxCacheTtl = 3600 * 6;
-      maxCacheTtlSsh = 3600 * 6;
-
-      pinentry.package = pkgs.pinentry-emacs;
-    };
-
-    accounts.email.accounts = {
-      "fabian@posixlycorrect.com" = {
-        gpg = {
-          encryptByDefault = true;
-          signByDefault = true;
-          key = config.local.services.gpg.defaultKey;
-        };
-      };
-    };
-
-    programs.git = {
-      signing = {
-        key = config.local.services.gpg.defaultKey;
-        signByDefault = true;
-      };
-    };
-  };
-}

home/platforms/chem@yuki/default.nix

@@ -28,10 +28,6 @@
         enable = true;
         prompt = "%B[%~] \${vcs_info_msg_0_}%b";
       };
-      gpg = { #TODO finish setup gpg
-        enable = false;
-        defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
-      };
     };
 
     apps = {

pkgs/default.nix

@@ -7,7 +7,8 @@ with prev.lib; let
   inherit (final) callPackage fetchpatch;
 in {
   override =
-    {# add python modules here to make them available in all versions
+    {
+      # add python modules here to make them available in all versions
     }
     // (
       let

sys/modules/default.nix

@@ -6,7 +6,6 @@
 }: {
   imports = [
     ./baseline.nix
-    ./yubikey.nix
     ./audio.nix
     ./graphics.nix
     ./virtualisation.nix

sys/platforms/yuki/hardware-configuration.nix

@@ -1,30 +1,34 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b925ebc0-f717-4f0d-83ca-a9a29990b8e2";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/b925ebc0-f717-4f0d-83ca-a9a29990b8e2";
     fsType = "btrfs";
   };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/EC62-0FDF";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/EC62-0FDF";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = ["fmask=0022" "dmask=0022"];
   };
 
-  swapDevices = [ ];
+  swapDevices = [];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's