flake.nix

@@ -149,7 +149,6 @@
             cabal-install
             ghcid
             nixfmt-rfc-style
-            nil
             hpack
             hlint
           ];

home/alex/home.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
   imports = [
@@ -22,7 +17,6 @@
     ./services/network-manager
     ./services/syncthing
     ./services/git-sync
-    ./modules/email.nix
   ];
 
   home = {
@@ -33,11 +27,8 @@
 
     keyboard.layout = "us";
     keyboard.variant = "dvorak";
-    keyboard.options = [
+    keyboard.options =
-      "terminate:ctrl_alt_bksp"
+      [ "terminate:ctrl_alt_bksp" "caps:escape" "compose:ralt" ];
-      "caps:escape"
-      "compose:ralt"
-    ];
 
     packages = with pkgs; [
       # social
@@ -50,8 +41,7 @@
 
       # gaming support
       lutris
-      bottles
+      winePackages.stagingFull
-      wine64Packages.stagingFull
 
       # reading
       calibre
@@ -76,27 +66,23 @@
       enable = true;
       package = pkgs.firefox.override {
         cfg = {
-          nativeMessagingHosts.packages = [
+          nativeMessagingHosts.packages =
-            pkgs.browserpass
+            [ pkgs.browserpass pkgs.tridactyl-native ];
-            pkgs.tridactyl-native
-          ];
           enableGnomeExtensions = true;
         };
       };
     };
     mpv.enable = true;
 
-    zsh =
+    zsh = let
-      let
+      auth-socket-env = ''
-        auth-socket-env = ''
+        export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf -L agent-ssh-socket)"
-          export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf -L agent-ssh-socket)"
+      '';
-        '';
+    in {
-      in
+      enable = true;
-      {
+      loginExtra = auth-socket-env;
-        enable = true;
+      initExtra = auth-socket-env;
-        loginExtra = auth-socket-env;
+    };
-        initExtra = auth-socket-env;
-      };
   };
 
   services.gpg-agent = {

home/alex/modules/email.nix

@@ -1,39 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  programs.mbsync.enable = true;
-  programs.msmtp.enable = true;
-  programs.notmuch = {
-    enable = true;
-    hooks.preNew = "mbsync --all";
-  };
-
-  accounts.email = {
-    accounts.failco = {
-      address = "me@failco.de";
-      gpg = {
-        key = "F2132F0C63730C6BC42BCC2A41A6D13FECA21280";
-        signByDefault = true;
-      };
-      imap.host = "thrall.failco.de";
-      mbsync = {
-        enable = true;
-        create = "maildir";
-      };
-      msmtp.enable = true;
-      notmuch.enable = true;
-      primary = true;
-      realName = "Alexander Kobjolke";
-      passwordCommand = "gopass --nosync show -o eMail/failco.de/me@failco.de";
-      smtp = {
-        host = "thrall.failco.de";
-      };
-      userName = "me@failco.de";
-    };
-  };
-}

home/alex/programs/emacs/doom/init.el

@@ -177,8 +177,8 @@
        ;;zig               ; C, but simpler
 
        :email
-       ;; (mu4e +org +gmail)
+       (mu4e +org +gmail)
-       (notmuch +org +afew)
+       ;;notmuch
        ;;(wanderlust +gmail)
 
        :app

home/alex/programs/jq/default.nix

@@ -1,12 +1,5 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
-  programs.jq = {
+  programs.jq = { enable = true; };
-    enable = true;
-  };
 }

home/alex/programs/xmonad/config.hs

@@ -100,7 +100,6 @@ myConfig =
                     [ namedScratchpadManageHook scratchpads
                     , isDialog --> doFloat
                     , isFullscreen --> doFullFloat
-                    , className =? "steam_proton" --> doFloat
                     , manageHook def
                     ]
             }