WIP: home: vim: notify

I'm not sure why it was written that way to begin with.

.drone.yml

@@ -1,24 +0,0 @@
-kind: pipeline
-name: check config
-
-steps:
-  - name: format check
-    image: nixos/nix
-    commands:
-      - nix-shell -p nixpkgs-fmt --run 'nixpkgs-fmt . --check'
-
-  - name: notify
-    image: plugins/matrix
-    settings:
-      homeserver:
-        from_secret: matrix_homeserver
-      roomid:
-        from_secret: matrix_roomid
-      username:
-        from_secret: matrix_username
-      password:
-        from_secret: matrix_password
-      trigger:
-        status:
-          - failure
-          - success

.envrc

@@ -1,8 +1,10 @@
-use_flake() {
-  watch_file flake.nix
-  watch_file flake.lock
-  eval "$(nix print-dev-env)"
-}
+if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
+fi
 
-ulimit -s unlimited # Bypass current bug in `nix` flakes evaluation
 use flake
+
+watch_file ./flake/checks.nix
+watch_file ./flake/dev-shells.nix
+
+eval "$shellHooks"

.git-crypt/.gitattributes

@@ -1,4 +0,0 @@
-# Do not edit this file.  To specify the files to encrypt, create your own
-# .gitattributes file in the directory where your files are.
-* !filter !diff
-*.gpg binary

.gitignore

@@ -0,0 +1 @@
+/.pre-commit-config.yaml

.pre-commit-config.yaml

@@ -1,21 +0,0 @@
-repos:
-- repo: 'https://github.com/pre-commit/pre-commit-hooks'
-  rev: 'v2.3.0'
-  hooks:
-  - id: 'trailing-whitespace'
-  - id: 'end-of-file-fixer'
-  - id: 'check-yaml'
-  - id: 'check-added-large-files'
-- repo: 'https://github.com/jumanjihouse/pre-commit-hooks'
-  rev: '2.1.4'
-  hooks:
-  - id: 'forbid-binary'
-- repo: 'local'
-  hooks:
-  - id: 'nixpkgs-fmt'
-    name: 'nixpkgs-fmt'
-    description: 'Format nix code with nixpkgs-fmt'
-    entry: 'nixpkgs-fmt'
-    language: 'system'
-    files: '\.nix$'
-    always_run: true

.stylua.toml

@@ -0,0 +1 @@
+indent_type = "Spaces"

.woodpecker/check.yml

@@ -0,0 +1,26 @@
+labels:
+  backend: local
+
+pipeline:
+- name: nix flake check
+  image: bash
+  commands:
+  - nix flake check
+
+- name: notifiy
+  image: bash
+  secrets:
+  - source: matrix_homeserver
+    target: address
+  - source: matrix_roomid
+    target: room
+  - source: matrix_username
+    target: user
+  - source: matrix_password
+    target: pass
+  commands:
+  - nix run '.#matrix-notifier'
+  when:
+    status:
+    - failure
+    - success

README.md

@@ -17,7 +17,8 @@ Secondly, take care of a few manual steps:
 * Configure Gitea and Drone
 * Configure Lohr webhook and SSH key
 * Configure Jellyfin
-* Configure Jackett and NZBHydra2
+* Configure Prowlarr,Jackett and NZBHydra2
 * Configure Sonarr, Radarr, Bazarr
 * Configure Transmission's webui port
 * Configure Quassel user
+* Configure Flood account

bootstrap.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i bash -p bitwarden-cli git gnupg jq nixFlakes
+#! nix-shell -i bash -p bitwarden-cli git gnupg jq nix
 
 # Command failure is script failure
 set -e
@@ -58,6 +58,8 @@ get_ssh() {
 
     get_doc "SysAdmin/SSH" "shared-key-public" "$HOME/.ssh/shared_rsa.pub" 644
     get_doc "SysAdmin/SSH" "shared-key-private" "$HOME/.ssh/shared_rsa" 600
+    get_doc "SysAdmin/SSH" "agenix-public" "$HOME/.ssh/agenix.pub" 644
+    get_doc "SysAdmin/SSH" "agenix-private" "$HOME/.ssh/agenix" 600
 }
 
 get_pgp() {
@@ -78,22 +80,13 @@ get_pgp() {
 }
 
 get_creds() {
-    BW_SESSION="$(bw login --raw)"
+    BW_SESSION="$(bw login --raw || bw unlock --raw)"
     export BW_SESSION
 
     get_ssh
     get_pgp
 }
 
-setup_gpg() {
-    info 'Setting up loopback pinentry for GnuPG'
-    echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
-
-    info 'Signing dummy message to ensure GnuPG key is usable by `git-crypt`'
-    echo whatever | gpg --clearsign --armor --pinentry loopback --output /dev/null
-}
-
 [ -z "$NOCREDS" ] && get_creds
-[ -z "$NOGPG" ] && setup_gpg
 
 nix --experimental-features 'nix-command flakes' develop

flake.lock

@@ -1,21 +1,129 @@
 {
   "nodes": {
-    "futils": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1619345332,
-        "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
+        "lastModified": 1690228878,
+        "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "ref": "main",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1673295039,
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1690933134,
+        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "ref": "main",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "futils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
         "owner": "numtide",
-        "ref": "master",
+        "ref": "main",
         "repo": "flake-utils",
         "type": "github"
       }
     },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -23,11 +131,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1619558193,
-        "narHash": "sha256-DljP5/9EX0eXEPhzCUFqFEHkkcFuXJBx1PTgcv0OgyM=",
+        "lastModified": 1691039228,
+        "narHash": "sha256-iPNZJ1LvfUf1Y456ewC0DXgf99TNssG8OLObOyqxO6M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "18ad12d52b8cebbb57013865eec2be5125de050a",
+        "rev": "86dd48d70a2e2c17e84e747ba4faa92453e68d4a",
         "type": "github"
       },
       "original": {
@@ -39,11 +147,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1619464443,
-        "narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=",
+        "lastModified": 1691006197,
+        "narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17",
+        "rev": "66aedfd010204949cb225cf749be08cb13ce1813",
         "type": "github"
       },
       "original": {
@@ -55,11 +163,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1619628114,
-        "narHash": "sha256-s3pQyvMfXVmbQOX224yOWQf6zi8406sShFF4u17LVQ0=",
+        "lastModified": 1691139289,
+        "narHash": "sha256-cZtqvYztpGwLtAsfrzY2VeTfFdW3HBwX7m1KV2Zy2nw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0615e756dc14986c4968fa478c0bd080d621cb2b",
+        "rev": "cb20b89d5b355c53a18dd149e7104a67381c7c17",
         "type": "github"
       },
       "original": {
@@ -69,12 +177,59 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": [
+          "futils"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1691093055,
+        "narHash": "sha256-sjNWYpDHc6vx+/M0WbBZKltR0Avh2S43UiDbmYtfHt0=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "ebb43bdacd1af8954d04869c77bc3b61fde515e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "master",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "agenix": "agenix",
+        "flake-parts": "flake-parts",
         "futils": "futils",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "nur": "nur"
+        "nur": "nur",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -1,11 +1,32 @@
 {
   description = "NixOS configuration with flakes";
   inputs = {
+    agenix = {
+      type = "github";
+      owner = "ryantm";
+      repo = "agenix";
+      ref = "main";
+      inputs = {
+        home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+
+    flake-parts = {
+      type = "github";
+      owner = "hercules-ci";
+      repo = "flake-parts";
+      ref = "main";
+      inputs = {
+        nixpkgs-lib.follows = "nixpkgs";
+      };
+    };
+
     futils = {
       type = "github";
       owner = "numtide";
       repo = "flake-utils";
-      ref = "master";
+      ref = "main";
     };
 
     home-manager = {
@@ -31,79 +52,20 @@
       repo = "NUR";
       ref = "master";
     };
-  };
 
-  outputs = { self, futils, home-manager, nixpkgs, nur } @ inputs:
-    let
-      inherit (futils.lib) eachDefaultSystem;
-
-      lib = nixpkgs.lib.extend (self: super: {
-        my = import ./lib { inherit inputs; pkgs = nixpkgs; lib = self; };
-      });
-
-      defaultModules = [
-        ({ ... }: {
-          # Let 'nixos-version --json' know about the Git revision
-          system.configurationRevision = self.rev or "dirty";
-        })
-        {
-          nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
-            nur.overlay
-          ];
-        }
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.users.ambroisie = import ./home;
-          # Nix Flakes compatibility
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-        }
-      ];
-
-      buildHost = name: system: lib.nixosSystem {
-        inherit system;
-        modules = defaultModules ++ [
-          (./. + "/${name}.nix")
-        ];
-        specialArgs = {
-          # Use my extended lib in NixOS configuration
-          inherit lib;
-        };
-      };
-    in
-    eachDefaultSystem
-      (system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        rec {
-          apps = {
-            diff-flake = futils.lib.mkApp { drv = packages.diff-flake; };
-          };
-
-          defaultApp = apps.diff-flake;
-
-          devShell = pkgs.mkShell {
-            name = "NixOS-config";
-            buildInputs = with pkgs; [
-              git-crypt
-              gitAndTools.pre-commit
-              gnupg
-              nixpkgs-fmt
-            ];
-          };
-
-          packages = import ./pkgs { inherit pkgs; };
-        }) // {
-      overlay = self.overlays.pkgs;
-
-      overlays = {
-        lib = final: prev: { inherit lib; };
-        pkgs = final: prev: { ambroisie = import ./pkgs { pkgs = prev; }; };
-      };
-
-      nixosConfigurations = lib.mapAttrs buildHost {
-        porthos = "x86_64-linux";
+    pre-commit-hooks = {
+      type = "github";
+      owner = "cachix";
+      repo = "pre-commit-hooks.nix";
+      ref = "master";
+      inputs = {
+        flake-utils.follows = "futils";
+        nixpkgs.follows = "nixpkgs";
+        nixpkgs-stable.follows = "nixpkgs";
       };
     };
+  };
+
+  # Can't eta-reduce a flake outputs...
+  outputs = inputs: import ./flake inputs;
 }

flake/apps.nix

@@ -0,0 +1,9 @@
+{ inputs, ... }:
+{
+  perSystem = { self', ... }: {
+    apps = {
+      diff-flake = inputs.futils.lib.mkApp { drv = self'.packages.diff-flake; };
+      default = self'.apps.diff-flake;
+    };
+  };
+}

flake/checks.nix

@@ -0,0 +1,33 @@
+{ inputs, ... }:
+{
+  imports = [
+    inputs.pre-commit-hooks.flakeModule
+  ];
+
+  perSystem = { ... }: {
+    pre-commit = {
+      # Add itself to `nix flake check`
+      check.enable = true;
+
+      settings = {
+        hooks = {
+          deadnix = {
+            enable = true;
+          };
+
+          nixpkgs-fmt = {
+            enable = true;
+          };
+
+          shellcheck = {
+            enable = true;
+          };
+
+          stylua = {
+            enable = true;
+          };
+        };
+      };
+    };
+  };
+}

flake/default.nix

@@ -0,0 +1,22 @@
+{ flake-parts
+, futils
+, ...
+} @ inputs:
+let
+  mySystems = futils.lib.defaultSystems;
+in
+flake-parts.lib.mkFlake { inherit inputs; } {
+  systems = mySystems;
+
+  imports = [
+    ./apps.nix
+    ./checks.nix
+    ./dev-shells.nix
+    ./home-manager.nix
+    ./lib.nix
+    ./nixos.nix
+    ./overlays.nix
+    ./packages.nix
+    ./templates.nix
+  ];
+}

flake/dev-shells.nix

@@ -0,0 +1,19 @@
+{ ... }:
+{
+  perSystem = { config, pkgs, ... }: {
+    devShells = {
+      default = pkgs.mkShellNoCC {
+        name = "NixOS-config";
+
+        nativeBuildInputs = with pkgs; [
+          gitAndTools.pre-commit
+          nixpkgs-fmt
+        ];
+
+        shellHook = ''
+          ${config.pre-commit.installationScript}
+        '';
+      };
+    };
+  };
+}

flake/home-manager.nix

@@ -0,0 +1,61 @@
+{ self, inputs, lib, ... }:
+let
+  defaultModules = [
+    # Include generic settings
+    "${self}/home"
+    {
+      # Basic user information defaults
+      home.username = lib.mkDefault "ambroisie";
+      home.homeDirectory = lib.mkDefault "/home/ambroisie";
+
+      # Make it a Linux installation by default
+      targets.genericLinux.enable = lib.mkDefault true;
+
+      # Enable home-manager
+      programs.home-manager.enable = true;
+    }
+  ];
+
+  mkHome = name: system: inputs.home-manager.lib.homeManagerConfiguration {
+    # Work-around for home-manager
+    # * not letting me set `lib` as an extraSpecialArgs
+    # * not respecting `nixpkgs.overlays` [1]
+    # [1]: https://github.com/nix-community/home-manager/issues/2954
+    pkgs = import inputs.nixpkgs {
+      inherit system;
+
+      overlays = (lib.attrValues self.overlays) ++ [
+        inputs.nur.overlay
+      ];
+    };
+
+    modules = defaultModules ++ [
+      "${self}/hosts/homes/${name}"
+    ];
+
+    extraSpecialArgs = {
+      # Inject inputs to use them in global registry
+      inherit inputs;
+    };
+  };
+
+  hosts = {
+    "ambroisie@ambroisie" = "x86_64-linux"; # Unfortunate naming here...
+  };
+in
+{
+  perSystem = { system, ... }: {
+    # Work-around for https://github.com/nix-community/home-manager/issues/3075
+    legacyPackages = {
+      homeConfigurations =
+        let
+          filteredHosts = lib.filterAttrs (_: v: v == system) hosts;
+          allHosts = filteredHosts // {
+            # Default configuration
+            ambroisie = system;
+          };
+        in
+        lib.mapAttrs mkHome allHosts;
+    };
+  };
+}

flake/lib.nix

@@ -0,0 +1,11 @@
+{ self, inputs, ... }:
+let
+  inherit (inputs) nixpkgs;
+
+  lib = nixpkgs.lib.extend (final: _: {
+    my = import "${self}/lib" { inherit inputs; pkgs = nixpkgs; lib = final; };
+  });
+in
+{
+  flake.lib = lib;
+}

flake/nixos.nix

@@ -0,0 +1,39 @@
+{ self, inputs, ... }:
+let
+  inherit (self) lib;
+
+  defaultModules = [
+    {
+      # Let 'nixos-version --json' know about the Git revision
+      system.configurationRevision = self.rev or "dirty";
+    }
+    {
+      nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
+        inputs.nur.overlay
+      ];
+    }
+    # Include generic settings
+    "${self}/modules"
+    # Include bundles of settings
+    "${self}/profiles"
+  ];
+
+  buildHost = name: system: lib.nixosSystem {
+    inherit system;
+    modules = defaultModules ++ [
+      "${self}/hosts/nixos/${name}"
+    ];
+    specialArgs = {
+      # Use my extended lib in NixOS configuration
+      inherit lib;
+      # Inject inputs to use them in global registry
+      inherit inputs;
+    };
+  };
+in
+{
+  flake.nixosConfigurations = lib.mapAttrs buildHost {
+    aramis = "x86_64-linux";
+    porthos = "x86_64-linux";
+  };
+}

flake/overlays.nix

@@ -0,0 +1,17 @@
+{ self, ... }:
+let
+  default-overlays = import "${self}/overlays";
+
+  additional-overlays = {
+    # Expose my expanded library
+    lib = _final: _prev: { inherit (self) lib; };
+
+    # Expose my custom packages
+    pkgs = _final: prev: {
+      ambroisie = prev.recurseIntoAttrs (import "${self}/pkgs" { pkgs = prev; });
+    };
+  };
+in
+{
+  flake.overlays = default-overlays // additional-overlays;
+}

flake/packages.nix

@@ -0,0 +1,13 @@
+{ self, inputs, ... }:
+{
+  perSystem = { pkgs, system, ... }: {
+    packages =
+      let
+        inherit (inputs.futils.lib) filterPackages flattenTree;
+        packages = import "${self}/pkgs" { inherit pkgs; };
+        flattenedPackages = flattenTree packages;
+        finalPackages = filterPackages system flattenedPackages;
+      in
+      finalPackages;
+  };
+}

flake/templates.nix

@@ -0,0 +1,4 @@
+{ self, ... }:
+{
+  flake.templates = import "${self}/templates";
+}

home/aliases/default.nix

@@ -0,0 +1,26 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.aliases;
+in
+{
+  options.my.home.aliases = with lib; {
+    enable = my.mkDisableOption "shell aliases configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home = {
+      shellAliases = {
+        # I like pretty colors
+        diff = "diff --color=auto";
+        grep = "grep --color=auto";
+        egrep = "egrep --color=auto";
+        fgrep = "fgrep --color=auto";
+        ls = "ls --color=auto";
+
+        # Well-known ls aliases
+        l = "ls -alh";
+        ll = "ls -l";
+      };
+    };
+  };
+}

home/atuin/default.nix

@@ -0,0 +1,31 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.atuin;
+in
+{
+  options.my.home.atuin = with lib; {
+    enable = my.mkDisableOption "atuin configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.atuin = {
+      enable = true;
+
+      flags = [
+        # I *despise* this hijacking of the up key, even though I use Ctrl-p
+        "--disable-up-arrow"
+      ];
+
+      settings = {
+        # The package is managed by Nix
+        update_check = false;
+        # I don't care for the fancy display
+        style = "compact";
+        # Get closer to fzf's fuzzy search
+        search_mode = "skim";
+        # Show long command lines at the bottom
+        show_preview = true;
+      };
+    };
+  };
+}

home/bat/default.nix

@@ -3,13 +3,15 @@ let
   cfg = config.my.home.bat;
 in
 {
-  options.my.home.bat = with lib.my; {
-    enable = mkDisableOption "bat configuration";
+  options.my.home.bat = with lib; {
+    enable = my.mkDisableOption "bat configuration";
   };
 
   config.programs.bat = lib.mkIf cfg.enable {
     enable = true;
     config = {
+      theme = "gruvbox-dark";
+
       pager = with config.home.sessionVariables; "${PAGER} ${LESS}";
     };
   };

home/bitwarden/default.nix

@@ -0,0 +1,27 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.bitwarden;
+in
+{
+  options.my.home.bitwarden = with lib; {
+    enable = my.mkDisableOption "bitwarden configuration";
+
+    pinentry = mkOption {
+      type = types.str;
+      default = "tty";
+      example = "gtk2";
+      description = "Which pinentry interface to use";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.rbw = {
+      enable = true;
+
+      settings = {
+        email = lib.my.mkMailAddress "bruno" "belanyi.fr";
+        inherit (cfg) pinentry;
+      };
+    };
+  };
+}

home/bluetooth/default.nix

@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.bluetooth;
+in
+{
+  options.my.home.bluetooth = with lib; {
+    enable = mkEnableOption "bluetooth configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.blueman-applet = {
+      enable = true;
+    };
+
+    services.mpris-proxy = {
+      enable = true;
+    };
+  };
+}

home/calibre/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.calibre;
+in
+{
+  options.my.home.calibre = with lib; {
+    enable = mkEnableOption "calibre configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      calibre # NOTE: relies on my overlay to add necessary plug-in dependencies
+    ];
+  };
+}

home/comma/default.nix

@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.comma;
+in
+{
+  options.my.home.comma = with lib; {
+    enable = my.mkDisableOption "comma configuration";
+
+    pkgsFlake = mkOption {
+      type = types.str;
+      default = "pkgs";
+      example = "nixpkgs";
+      description = ''
+        Which flake from the registry should be used with
+        <command>nix shell</command>.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      ambroisie.comma
+    ];
+
+    home.sessionVariables = {
+      COMMA_PKGS_FLAKE = cfg.pkgsFlake;
+    };
+  };
+}

home/default.nix

@@ -1,20 +1,47 @@
 { ... }:
 {
   imports = [
-    ./bat.nix
-    ./direnv.nix
-    ./documentation.nix
+    ./aliases
+    ./atuin
+    ./bat
+    ./bitwarden
+    ./bluetooth
+    ./calibre
+    ./comma
+    ./dircolors
+    ./direnv
+    ./discord
+    ./documentation
+    ./feh
+    ./firefox
+    ./flameshot
+    ./fzf
+    ./gammastep
+    ./gdb
     ./git
-    ./gpg.nix
-    ./htop.nix
-    ./jq.nix
-    ./packages.nix
-    ./pager.nix
-    ./secrets # Home-manager specific secrets
-    ./ssh.nix
-    ./tmux.nix
+    ./gpg
+    ./gtk
+    ./htop
+    ./jq
+    ./mail
+    ./mpv
+    ./nix
+    ./nix-index
+    ./nixpkgs
+    ./nm-applet
+    ./packages
+    ./pager
+    ./power-alert
+    ./secrets
+    ./ssh
+    ./terminal
+    ./tmux
+    ./udiskie
     ./vim
-    ./xdg.nix
+    ./wm
+    ./x
+    ./xdg
+    ./zathura
     ./zsh
   ];
 
@@ -23,4 +50,7 @@
 
   # Who am I?
   home.username = "ambroisie";
+
+  # Start services automatically
+  systemd.user.startServices = "sd-switch";
 }

home/dircolors/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.dircolors;
+in
+{
+  options.my.home.dircolors = with lib; {
+    enable = my.mkDisableOption "dircolors configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.dircolors = {
+      enable = true;
+    };
+  };
+}

home/direnv.nix

@@ -1,15 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.home.direnv;
-in
-{
-  options.my.home.direnv = with lib.my; {
-    enable = mkDisableOption "direnv configuration";
-  };
-
-  config.programs.direnv = lib.mkIf cfg.enable {
-    enable = true;
-    # A better `use_nix`
-    enableNixDirenvIntegration = true;
-  };
-}

home/direnv/default.nix

@@ -0,0 +1,46 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.direnv;
+in
+{
+  options.my.home.direnv = with lib; {
+    enable = my.mkDisableOption "direnv configuration";
+
+    defaultFlake = mkOption {
+      type = types.str;
+      default = "pkgs";
+      example = "nixpkgs";
+      description = ''
+        Which flake from the registry should be used for
+        <command>use pkgs</command> by default.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.direnv = {
+      enable = true;
+      nix-direnv = {
+        # A better `use_nix`
+        enable = true;
+      };
+    };
+
+    xdg.configFile =
+      let
+        libDir = ./lib;
+        contents = builtins.readDir libDir;
+        names = lib.attrNames contents;
+        files = lib.filter (name: contents.${name} == "regular") names;
+        linkLibFile = name:
+          lib.nameValuePair
+            "direnv/lib/${name}"
+            { source = libDir + "/${name}"; };
+      in
+      lib.my.genAttrs' files linkLibFile;
+
+    home.sessionVariables = {
+      DIRENV_DEFAULT_FLAKE = cfg.defaultFlake;
+    };
+  };
+}

home/direnv/lib/nix.sh

@@ -0,0 +1,32 @@
+#shellcheck shell=bash
+
+use_pkgs() {
+    if ! has nix; then
+        # shellcheck disable=2016
+        log_error 'use_pkgs: `nix` is not in PATH'
+        return 1
+    fi
+
+    # Use user-provided default value, or fallback to nixpkgs
+    local DEFAULT_FLAKE="${DIRENV_DEFAULT_FLAKE:-nixpkgs}"
+
+    # Allow changing the default flake through a command line switch
+    if [ "$1" = "-f" ] || [ "$1" = "--flake" ]; then
+        DEFAULT_FLAKE="$2"
+        shift 2
+    fi
+
+
+    # Allow specifying a full installable, or just a package name and use the default flake
+    local packages=()
+    for pkg; do
+        if [[ $pkg =~ .*#.* ]]; then
+            packages+=("$pkg")
+        else
+            packages+=("$DEFAULT_FLAKE#$pkg")
+        fi
+    done
+
+    # shellcheck disable=2154
+    direnv_load nix shell "${packages[@]}" --command "$direnv" dump
+}

home/direnv/lib/postgres.sh

@@ -0,0 +1,22 @@
+#shellcheck shell=bash
+
+layout_postgres() {
+    if ! has postgres || ! has initdb; then
+        # shellcheck disable=2016
+        log_error 'layout_postgres: `postgres` and `initdb` are not in PATH'
+        return 1
+    fi
+
+    # shellcheck disable=2155
+    export PGDATA="$(direnv_layout_dir)/postgres"
+    export PGHOST="$PGDATA"
+
+    if [[ ! -d "$PGDATA" ]]; then
+        initdb
+        cat >> "$PGDATA/postgresql.conf" << EOF
+listen_addresses = ''
+unix_socket_directories = '$PGHOST'
+EOF
+        echo "CREATE DATABASE $USER;" | postgres --single -E postgres
+    fi
+}

home/direnv/lib/python.sh

@@ -0,0 +1,25 @@
+#shellcheck shell=bash
+
+layout_poetry() {
+    if ! has poetry; then
+        # shellcheck disable=2016
+        log_error 'layout_poetry: `poetry` is not in PATH'
+        return 1
+    fi
+
+    if [[ ! -f pyproject.toml ]]; then
+        # shellcheck disable=2016
+        log_error 'layout_poetry: no pyproject.toml found. Use `poetry new` or `poetry init` to create one first'
+        return 1
+    fi
+
+    # create venv if it doesn't exist
+    poetry run true
+
+    # shellcheck disable=2155
+    export VIRTUAL_ENV=$(poetry env info --path)
+    export POETRY_ACTIVE=1
+    PATH_add "$VIRTUAL_ENV/bin"
+    watch_file pyproject.toml
+    watch_file poetry.lock
+}

home/discord/default.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.discord;
+
+  jsonFormat = pkgs.formats.json { };
+in
+{
+  options.my.home.discord = with lib; {
+    enable = mkEnableOption "discord configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      discord
+    ];
+
+    xdg.configFile."discord/settings.json".source =
+      jsonFormat.generate "discord.json" {
+        # Do not keep me from using the app just to force an update
+        SKIP_HOST_UPDATE = true;
+      };
+  };
+}

home/documentation/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.documentation;
 in
 {
-  options.my.home.documentation = with lib.my; {
-    enable = mkDisableOption "documentation integration";
+  options.my.home.documentation = with lib; {
+    enable = my.mkDisableOption "documentation integration";
   };
 
   # Add documentation for user packages

home/feh/default.nix

@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.feh;
+in
+{
+  options.my.home.feh = with lib; {
+    enable = mkEnableOption "feh configuration";
+  };
+
+  config.programs.feh = lib.mkIf cfg.enable {
+    enable = true;
+  };
+}

home/firefox/default.nix

@@ -0,0 +1,83 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.firefox;
+in
+{
+  imports = [
+    ./tridactyl
+  ];
+
+  options.my.home.firefox = with lib; {
+    enable = mkEnableOption "firefox configuration";
+
+    tridactyl = {
+      enable = mkOption {
+        type = types.bool;
+        description = "tridactyl configuration";
+        example = false;
+        default = config.my.home.firefox.enable;
+      };
+    };
+
+    ff2mpv = {
+      enable = mkOption {
+        type = types.bool;
+        description = "ff2mpv configuration";
+        example = false;
+        default = config.my.home.mpv.enable;
+      };
+    };
+  };
+
+  config.programs.firefox = lib.mkIf cfg.enable {
+    enable = true;
+
+    package = pkgs.firefox.override {
+      cfg = {
+        enableTridactylNative = cfg.tridactyl.enable;
+      };
+
+      extraNativeMessagingHosts = with pkgs; ([ ]
+        # Watch videos using mpv
+        ++ lib.optional cfg.ff2mpv.enable ambroisie.ff2mpv-go
+      );
+    };
+
+    profiles = {
+      default = {
+        id = 0;
+
+        settings = {
+          "browser.bookmarks.showMobileBookmarks" = true; # Mobile bookmarks
+          "browser.download.useDownloadDir" = false; # Ask for download location
+          "browser.in-content.dark-mode" = true; # Dark mode
+          "browser.newtabpage.activity-stream.feeds.section.topstories" = false; # Disable top stories
+          "browser.newtabpage.activity-stream.feeds.sections" = false;
+          "browser.newtabpage.activity-stream.feeds.system.topstories" = false; # Disable top stories
+          "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; # Disable pocket
+          "extensions.pocket.enabled" = false; # Disable pocket
+          "media.eme.enabled" = true; # Enable DRM
+          "media.gmp-widevinecdm.enabled" = true; # Enable DRM
+          "media.gmp-widevinecdm.visible" = true; # Enable DRM
+          "signon.autofillForms" = false; # Disable built-in form-filling
+          "signon.rememberSignons" = false; # Disable built-in password manager
+          "ui.systemUsesDarkTheme" = true; # Dark mode
+        };
+
+        extensions = with pkgs.nur.repos.rycee.firefox-addons; ([
+          bitwarden
+          consent-o-matic
+          form-history-control
+          reddit-comment-collapser
+          reddit-enhancement-suite
+          refined-github
+          sponsorblock
+          ublock-origin
+        ]
+        ++ lib.optional (cfg.tridactyl.enable) tridactyl
+        ++ lib.optional (cfg.ff2mpv.enable) ff2mpv
+        );
+      };
+    };
+  };
+}

home/firefox/tridactyl/default.nix

@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.firefox.tridactyl;
+
+  term = config.my.home.terminal.program;
+
+  vimCommandLine = {
+    alacritty = ''-e "vim" "%f" "+normal!%lGzv%c|"'';
+    # Termite wants the whole command in a single argument...
+    termite = ''-e "vim %f '+normal!%lGzv%c|'"'';
+  };
+in
+{
+  config = lib.mkIf cfg.enable {
+    xdg.configFile."tridactyl/tridactylrc".source = pkgs.substituteAll {
+      src = ./tridactylrc;
+
+      editorcmd = lib.concatStringsSep " " [
+        # Use my configured terminal
+        term
+        # Make it easy to pick out with a window class name
+        "--class tridactyl_editor"
+        # Open vim with the cursor in the correct position
+        vimCommandLine.${term}
+      ];
+    };
+  };
+}

home/firefox/tridactyl/tridactylrc

@@ -0,0 +1,82 @@
+" Shamelessly taken from bovine3dom's example configuration file from the docs
+
+" Basics {{{
+" Use dark color scheme
+colorscheme dark
+
+" Make tridactyl open Vim in my prefered terminal
+set editorcmd @editorcmd@
+
+" Remove editor file after use
+alias editor_rm composite editor | jsb -p tri.native.run(`rm -f '${JS_ARG[0]}'`)
+bind --mode=insert <C-i> editor_rm
+bind --mode=input <C-i> editor_rm
+" }}}
+
+" Binds {{{
+" Reddit et al. {{{
+" Toggle comments on Reddit, Hacker News, Lobste.rs
+bind ;c hint -Jc [class*="expand"],[class*="togg"],[class="comment_folder"]
+
+" Make `gu` take me back to subreddit from comments
+bindurl reddit.com gu urlparent 3
+
+" Only hint search results on Google
+bindurl www.google.com f hint -Jc #search div:not(.action-menu) > a
+bindurl www.google.com F hint -Jbc #search div:not(.action-menu) > a
+
+" Only hint search results on DuckDuckGo
+bindurl ^https://duckduckgo.com f hint -Jc [data-testid="result-title-a"]
+bindurl ^https://duckduckgo.com F hint -Jbc [data-testid="result-title-a"]
+
+" Only hint item pages on Hacker News
+bindurl news.ycombinator.com ;f hint -Jc .age > a
+bindurl news.ycombinator.com ;F hint -Jtc .age > a
+" }}}
+
+" Better bindings {{{
+" Handy multiwindow binds
+bind gd tabdetach
+bind gD composite tabduplicate; tabdetach
+
+" Duplicate a tab without detaching window
+bind <Space>d tabduplicate
+
+" Make yy use canonical links on the few websites that support them
+bind yy clipboard yankcanon
+" }}}
+
+" Search {{{
+" Case insensitive only if fully lowercase
+set findcase smart
+
+" Search forward/backward
+bind / fillcmdline find
+bind ? fillcmdline find -?
+
+" Go to next/previous match
+bind n findnext 1
+bind N findnext -1
+
+" Because :nohls never works
+bind <Space><Space> nohlsearch
+
+" Use browser's native find when using Ctrl-F
+unbind <C-f>
+" }}}
+" }}}
+
+" Redirections {{{
+" Always redirect Reddit to the old site
+autocmd DocStart ^http(s?)://www.reddit.com js tri.excmds.urlmodify("-t", "www", "old")
+" Use a better Twitter front-end
+autocmd DocStart ^http(s?)://twitter.com js tri.excmds.urlmodify("-t", "twitter.com", "nitter.net")
+" }}}
+
+" Disabled websites {{{
+blacklistadd netflix.com
+blacklistadd primevideo.com
+blacklistadd jellyfin.belanyi.fr
+" }}}
+
+" vim: set filetype=vim foldmethod=marker:

home/flameshot/default.nix

@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.flameshot;
+in
+{
+  options.my.home.flameshot = with lib; {
+    enable = mkEnableOption "flameshot configuration";
+  };
+
+  config.services.flameshot = lib.mkIf cfg.enable {
+    enable = true;
+  };
+}

home/fzf/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.fzf;
+in
+{
+  options.my.home.fzf = with lib; {
+    enable = my.mkDisableOption "fzf configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.fzf = {
+      enable = true;
+    };
+  };
+}

home/gammastep/default.nix

@@ -0,0 +1,44 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.gammastep;
+
+  mkTempOption = with lib; description: default: mkOption {
+    inherit description default;
+    type = types.int;
+    example = 1000;
+  };
+
+  mkTimeOption = with lib; description: default: mkOption {
+    inherit description default;
+    type = types.str;
+    example = "12:00-14:00";
+  };
+in
+{
+  options.my.home.gammastep = with lib; {
+    enable = mkEnableOption "gammastep configuration";
+
+    temperature = {
+      day = mkTempOption "Colour temperature to use during the day" 6500;
+      night = mkTempOption "Colour temperature to use during the night" 2000;
+    };
+
+    times = {
+      dawn = mkTimeOption "Dawn time" "6:00-7:30";
+      dusk = mkTimeOption "Dusk time" "18:30-20:00";
+    };
+  };
+
+  config.services.gammastep = lib.mkIf cfg.enable {
+    enable = true;
+
+    tray = true;
+
+    dawnTime = cfg.times.dawn;
+    duskTime = cfg.times.dusk;
+
+    temperature = {
+      inherit (cfg.temperature) day night;
+    };
+  };
+}

home/gdb/default.nix

@@ -0,0 +1,38 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.gdb;
+in
+{
+  options.my.home.gdb = with lib; {
+    enable = my.mkDisableOption "gdb configuration";
+
+    rr = {
+      enable = my.mkDisableOption "rr configuration";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.rr;
+        defaultText = literalExample "pkgs.rr";
+        description = ''
+          Package providing rr
+        '';
+      };
+    };
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      home.packages = with pkgs; [
+        gdb
+      ];
+
+      xdg.configFile."gdb/gdbinit".source = ./gdbinit;
+    })
+
+    (lib.mkIf cfg.rr.enable {
+      home.packages = [
+        cfg.rr.package
+      ];
+    })
+  ];
+}

home/gdb/gdbinit

@@ -0,0 +1,24 @@
+ # Keep a history of all commands in each directory
+set history save on
+
+# Enable those pretty-printers
+enable pretty-printer
+
+# Pretty formatting of structures
+set print pretty on
+# Show derived type based on VTable
+set print object on
+# Show static members
+set print static-members on
+# Show VTable
+set print vtbl on
+# Demangle types
+set print demangle on
+
+# Read python scrips in the load path
+set auto-load python-scripts
+
+# Allow autoloading project-local .gdbinit files
+add-auto-load-safe-path ~/git/
+# Allow autoloading from the Nix store
+add-auto-load-safe-path /nix/store

home/git/default.ignore

@@ -24,3 +24,11 @@ compile_commands.json
 # Swap and backup files
 *~
 ~.swp
+
+# Direnv files
+.envrc
+.direnv/
+
+# Project-local neovim configuration files
+.nvim.lua
+.nvimrc

home/git/default.nix

@@ -1,34 +1,73 @@
 { config, pkgs, lib, ... }:
 let
   cfg = config.my.home.git;
+
+  inherit (lib.my) mkMailAddress;
 in
 {
-  options.my.home.git = with lib.my; {
-    enable = mkDisableOption "git configuration";
+  options.my.home.git = with lib; {
+    enable = my.mkDisableOption "git configuration";
   };
 
+  config.home.packages = with pkgs; lib.mkIf cfg.enable [
+    git-absorb
+    git-revise
+    tig
+  ];
+
   config.programs.git = lib.mkIf cfg.enable {
     enable = true;
 
     # Who am I?
-    userEmail = "bruno@belanyi.fr";
+    userEmail = mkMailAddress "bruno" "belanyi.fr";
     userName = "Bruno BELANYI";
 
     # I want the full experience
-    package = pkgs.gitAndTools.gitFull;
+    package = pkgs.gitFull;
 
     aliases = {
-      lol = "log --graph --decorate --pretty=oneline --abbrev-commit";
+      git = "!git";
+      lol = "log --graph --decorate --pretty=oneline --abbrev-commit --topo-order";
       lola = "lol --all";
       assume = "update-index --assume-unchanged";
       unassume = "update-index --no-assume-unchanged";
       assumed = "!git ls-files -v | grep ^h | cut -c 3-";
+      pick = "log -p -G";
       push-new = "!git push -u origin "
         + ''"$(git branch | grep '^* ' | cut -f2- -d' ')"'';
+      root = "git rev-parse --show-toplevel";
     };
 
     lfs.enable = true;
 
+    delta = {
+      enable = true;
+
+      options = {
+        features = "diff-highlight decorations";
+
+        # Less jarring style for `diff-highlight` emulation
+        diff-highlight = {
+          minus-style = "red";
+          minus-non-emph-style = "red";
+          minus-emph-style = "bold red 52";
+
+          plus-style = "green";
+          plus-non-emph-style = "green";
+          plus-emph-style = "bold green 22";
+
+          whitespace-error-style = "reverse red";
+        };
+
+        # Personal preference for easier reading
+        decorations = {
+          commit-style = "raw"; # Do not recolor meta information
+          keep-plus-minus-markers = true;
+          paging = "always";
+        };
+      };
+    };
+
     # There's more
     extraConfig = {
       # Makes it a bit more readable
@@ -62,13 +101,6 @@ in
         whitespace = "red reverse";
       };
 
-      "color.diff-highlight" = {
-        oldNormal = "red bold";
-        oldHighlight = "red bold 52";
-        newNormal = "green bold";
-        newHighlight = "green bold 22";
-      };
-
       commit = {
         # Show my changes when writing the message
         verbose = true;
@@ -89,15 +121,14 @@ in
         defaultBranch = "main";
       };
 
-      pager =
-        let
-          diff-highlight = "${pkgs.gitAndTools.gitFull}/share/git/contrib/diff-highlight/diff-highlight";
-        in
-        {
-          diff = "${diff-highlight} | less";
-          log = "${diff-highlight} | less";
-          show = "${diff-highlight} | less";
-        };
+      # Local configuration, not-versioned
+      include = {
+        path = "config.local";
+      };
+
+      merge = {
+        conflictStyle = "zdiff3";
+      };
 
       pull = {
         # Avoid useless merge commits
@@ -114,11 +145,42 @@ in
         autoSquash = true;
         autoStash = true;
       };
+
+      url = {
+        "git@git.belanyi.fr:" = {
+          insteadOf = "https://git.belanyi.fr/";
+        };
+
+        "git@github.com:" = {
+          insteadOf = "https://github.com/";
+        };
+
+        "git@gitlab.com:" = {
+          insteadOf = "https://gitlab.com/";
+        };
+      };
     };
 
     # Multiple identities
     includes = [
-      { path = ./epita.config; condition = "gitdir:~/git/EPITA/"; }
+      {
+        condition = "gitdir:~/git/EPITA/";
+        contents = {
+          user = {
+            name = "Bruno BELANYI";
+            email = mkMailAddress "bruno.belanyi" "epita.fr";
+          };
+        };
+      }
+      {
+        condition = "gitdir:~/git/work/";
+        contents = {
+          user = {
+            name = "Bruno BELANYI";
+            email = mkMailAddress "ambroisie" "google.com";
+          };
+        };
+      }
     ];
 
     ignores =

home/git/epita.config

@@ -1,4 +0,0 @@
-[user]
-	email = bruno.belanyi@epita.fr
-	name = Bruno BELANYI
-# vim: set ft=gitconfig:

home/gpg.nix

@@ -1,24 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.home.gpg;
-in
-{
-  options.my.home.gpg = with lib.my; {
-    enable = mkDisableOption "gpg configuration";
-  };
-
-  config = lib.mkIf cfg.enable {
-    programs.gpg = {
-      enable = true;
-    };
-
-    services.gpg-agent = {
-      enable = true;
-      enableSshSupport = true; # One agent to rule them all
-      pinentryFlavor = "tty";
-      extraConfig = ''
-        allow-loopback-pinentry
-      '';
-    };
-  };
-}

home/gpg/default.nix

@@ -0,0 +1,36 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.gpg;
+in
+{
+  options.my.home.gpg = with lib; {
+    enable = my.mkDisableOption "gpg configuration";
+
+    pinentry = mkOption {
+      type = types.str;
+      default = "tty";
+      example = "gtk2";
+      description = "Which pinentry interface to use";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.gpg = {
+      enable = true;
+    };
+
+    services.gpg-agent = {
+      enable = true;
+      enableSshSupport = true; # One agent to rule them all
+      pinentryFlavor = cfg.pinentry;
+      extraConfig = ''
+        allow-loopback-pinentry
+      '';
+    };
+
+    home.shellAliases = {
+      # Sometime `gpg-agent` errors out...
+      reset-agent = "gpg-connect-agent updatestartuptty /bye";
+    };
+  };
+}

home/gtk/default.nix

@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.gtk;
+in
+{
+  options.my.home.gtk = with lib; {
+    enable = mkEnableOption "GTK configuration";
+  };
+
+  config.gtk = lib.mkIf cfg.enable {
+    enable = true;
+
+    font = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Sans";
+    };
+
+    gtk2 = {
+      # That sweet, sweet clean home that I am always aiming for...
+      configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+    };
+
+    iconTheme = {
+      package = pkgs.gnome.gnome-themes-extra;
+      name = "Adwaita";
+    };
+
+    theme = {
+      package = pkgs.gnome.gnome-themes-extra;
+      name = "Adwaita";
+    };
+  };
+}

home/htop/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.htop;
 in
 {
-  options.my.home.htop = with lib.my; {
-    enable = mkDisableOption "htop configuration";
+  options.my.home.htop = with lib; {
+    enable = my.mkDisableOption "htop configuration";
   };
 
   config.programs.htop = lib.mkIf cfg.enable {

home/jq/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.jq;
 in
 {
-  options.my.home.jq = with lib.my; {
-    enable = mkDisableOption "jq configuration";
+  options.my.home.jq = with lib; {
+    enable = my.mkDisableOption "jq configuration";
   };
 
   config.programs.jq = lib.mkIf cfg.enable {

home/mail/accounts/default.nix

@@ -0,0 +1,94 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.mail;
+
+  inherit (lib.my) mkMailAddress;
+
+  mkConfig = { domain, address, passName, aliases ? [ ], primary ? false }: {
+    realName = lib.mkDefault "Bruno BELANYI";
+    userName = lib.mkDefault (mkMailAddress address domain);
+    passwordCommand =
+      lib.mkDefault [ (lib.getExe pkgs.ambroisie.rbw-pass) "Mail" passName ];
+
+    address = mkMailAddress address domain;
+    aliases = builtins.map (lib.flip mkMailAddress domain) aliases;
+
+    inherit primary;
+
+    himalaya = {
+      enable = cfg.himalaya.enable;
+      # FIXME: try to actually configure it at some point
+      backend = "imap";
+      sender = "smtp";
+    };
+
+    msmtp = {
+      enable = cfg.msmtp.enable;
+    };
+  };
+
+  migaduConfig = {
+    imap = {
+      host = "imap.migadu.com";
+      port = 993;
+      tls = {
+        enable = true;
+      };
+    };
+    smtp = {
+      host = "smtp.migadu.com";
+      port = 465;
+      tls = {
+        enable = true;
+      };
+    };
+  };
+
+  gmailConfig = {
+    flavor = "gmail.com";
+    folders = {
+      drafts = "[Gmail]/Drafts";
+      sent = "[Gmail]/Sent Mail";
+      trash = "[Gmail]/Trash";
+    };
+  };
+
+  office365Config = {
+    flavor = "outlook.office365.com";
+  };
+in
+{
+  config.accounts.email.accounts = {
+    personal = lib.mkMerge [
+      # Common configuraton
+      (mkConfig {
+        domain = "belanyi.fr";
+        address = "bruno";
+        passName = "Migadu";
+        aliases = [ "admin" "postmaster" ];
+        primary = true; # This is my primary email
+      })
+      migaduConfig
+    ];
+
+    gmail = lib.mkMerge [
+      # Common configuraton
+      (mkConfig {
+        domain = "gmail.com";
+        address = "brunobelanyi";
+        passName = "GMail";
+      })
+      gmailConfig
+    ];
+
+    epita = lib.mkMerge [
+      # Common configuration
+      (mkConfig {
+        domain = "epita.fr";
+        address = "bruno.belanyi";
+        passName = "EPITA";
+      })
+      office365Config
+    ];
+  };
+}

home/mail/default.nix

@@ -0,0 +1,31 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.mail;
+
+  mkRelatedOption = desc: lib.mkEnableOption desc // { default = cfg.enable; };
+in
+{
+  imports = [
+    ./accounts
+    ./himalaya
+    ./msmtp
+  ];
+
+  options.my.home.mail = with lib; {
+    enable = my.mkDisableOption "email configuration";
+
+    himalaya = {
+      enable = mkEnableOption "himalaya configuration";
+    };
+
+    msmtp = {
+      enable = mkRelatedOption "msmtp configuration";
+    };
+  };
+
+  config = {
+    accounts.email = {
+      maildirBasePath = "mail";
+    };
+  };
+}

home/mail/himalaya/default.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.mail.himalaya;
+in
+{
+  config.programs.himalaya = lib.mkIf cfg.enable {
+    enable = true;
+
+    settings = {
+      notify-cmd =
+        let
+          notify-send = lib.getExe pkgs.libnotify;
+        in
+        pkgs.writeScript "mail-notifier" ''
+          SENDER="$1"
+          SUBJECT="$2"
+          ${notify-send} \
+            -c himalaya \
+            -- "$(printf 'Received email from %s\n\n%s' "$SENDER" "$SUBJECT")"
+        '';
+    };
+  };
+}

home/mail/msmtp/default.nix

@@ -0,0 +1,9 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.mail.msmtp;
+in
+{
+  config.programs.msmtp = lib.mkIf cfg.enable {
+    enable = true;
+  };
+}

home/mpv/default.nix

@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.mpv;
+in
+{
+  options.my.home.mpv = with lib; {
+    enable = mkEnableOption "mpv configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.mpv = {
+      enable = true;
+
+      scripts = [
+        pkgs.mpvScripts.mpris # Allow controlling using media keys
+      ];
+    };
+  };
+}

home/nix-index/default.nix

@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.nix-index;
+in
+{
+  options.my.home.nix-index = with lib; {
+    enable = my.mkDisableOption "nix-index configuration";
+  };
+
+  config.programs.nix-index = lib.mkIf cfg.enable {
+    enable = true;
+  };
+}

home/nix/default.nix

@@ -0,0 +1,82 @@
+# Nix related settings
+{ config, inputs, lib, pkgs, ... }:
+let
+  cfg = config.my.home.nix;
+
+  channels = lib.my.merge [
+    {
+      # Allow me to use my custom package using `nix run self#pkg`
+      self = inputs.self;
+      # Add NUR to run some packages that are only present there
+      nur = inputs.nur;
+      # Use pinned nixpkgs when using `nix run pkgs#<whatever>`
+      pkgs = inputs.nixpkgs;
+    }
+    (lib.optionalAttrs cfg.overrideNixpkgs {
+      # ... And with `nix run nixpkgs#<whatever>`
+      nixpkgs = inputs.nixpkgs;
+    })
+  ];
+in
+{
+  options.my.home.nix = with lib; {
+    enable = my.mkDisableOption "nix configuration";
+
+    linkInputs = my.mkDisableOption "link inputs to `$XDG_CONFIG_HOME/nix/inputs`";
+
+    addToRegistry = my.mkDisableOption "add inputs and self to registry";
+
+    addToNixPath = my.mkDisableOption "add inputs and self to nix path";
+
+    overrideNixpkgs = my.mkDisableOption "point nixpkgs to pinned system version";
+  };
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    {
+      assertions = [
+        {
+          assertion = cfg.addToNixPath -> cfg.linkInputs;
+          message = ''
+            enabling `my.home.nix.addToNixPath` needs to have
+            `my.home.nix.linkInputs = true`
+          '';
+        }
+      ];
+    }
+
+    {
+      nix = {
+        package = lib.mkDefault pkgs.nix; # NixOS module sets it unconditionally
+
+        settings = {
+          experimental-features = [ "nix-command" "flakes" ];
+        };
+      };
+    }
+
+    (lib.mkIf cfg.addToRegistry {
+      nix.registry =
+        let
+          makeEntry = v: { flake = v; };
+          makeEntries = lib.mapAttrs (lib.const makeEntry);
+        in
+        makeEntries channels;
+    })
+
+    (lib.mkIf cfg.linkInputs {
+      xdg.configFile =
+        let
+          makeLink = n: v: {
+            name = "nix/inputs/${n}";
+            value = { source = v.outPath; };
+          };
+          makeLinks = lib.mapAttrs' makeLink;
+        in
+        makeLinks channels;
+    })
+
+    (lib.mkIf cfg.addToNixPath {
+      home.sessionVariables.NIX_PATH = "${config.xdg.configHome}/nix/inputs\${NIX_PATH:+:$NIX_PATH}";
+    })
+  ]);
+}

home/nixpkgs/default.nix

@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.nixpkgs;
+in
+{
+  options.my.home.nixpkgs = with lib; {
+    enable = mkEnableOption "nixpkgs configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      nixpkgs-review
+    ];
+
+    home.sessionVariables = {
+      GITHUB_TOKEN = ''$(cat "${config.age.secrets."github/token".path}")'';
+      GITHUB_API_TOKEN = ''$(cat "${config.age.secrets."github/token".path}")'';
+    };
+  };
+}

home/nm-applet/default.nix

@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.nm-applet;
+in
+{
+  options.my.home.nm-applet = with lib; {
+    enable = mkEnableOption "network-manager-applet configuration";
+  };
+
+  config.services.network-manager-applet = lib.mkIf cfg.enable {
+    enable = true;
+  };
+}

home/packages.nix

@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.home.packages;
-in
-{
-  options.my.home.packages = with lib.my; {
-    enable = mkDisableOption "user packages";
-  };
-
-  config.home.packages = with pkgs; lib.mkIf cfg.enable [
-    # Git related
-    gitAndTools.git-absorb
-    gitAndTools.git-revise
-    gitAndTools.tig
-    # Dev work
-    rr
-    # Terminal prettiness
-    termite.terminfo
-  ];
-}

home/packages/default.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.packages;
+in
+{
+  options.my.home.packages = with lib; {
+    enable = my.mkDisableOption "user packages";
+
+    additionalPackages = mkOption {
+      type = with types; listOf package;
+      default = [ ];
+      example = literalExample ''
+        with pkgs; [
+          quasselClient
+        ]
+      '';
+    };
+  };
+
+  config.home.packages = with pkgs; lib.mkIf cfg.enable ([
+    fd
+    file
+    mosh
+    ripgrep
+  ] ++ cfg.additionalPackages);
+}

home/pager.nix

@@ -1,18 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.home.pager;
-in
-{
-  options.my.home.pager = with lib.my; {
-    enable = mkDisableOption "pager configuration";
-  };
-
-  config.programs.lesspipe.enable = cfg.enable;
-
-  config.home.sessionVariables = lib.mkIf cfg.enable {
-    # My default pager
-    PAGER = "less";
-    # Clear the screen on start and exit
-    LESS = "-R -+X -c";
-  };
-}

home/pager/default.nix

@@ -0,0 +1,21 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.pager;
+in
+{
+  options.my.home.pager = with lib; {
+    enable = my.mkDisableOption "pager configuration";
+  };
+
+
+  config = lib.mkIf cfg.enable {
+    home.sessionVariables = {
+      # My default pager
+      PAGER = "less";
+      # Clear the screen on start and exit
+      LESS = "-R -+X -c";
+      # Better XDG compliance
+      LESSHISTFILE = "${config.xdg.dataHome}/less/history";
+    };
+  };
+}

home/power-alert/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.power-alert;
+in
+{
+  options.my.home.power-alert = with lib; {
+    enable = mkEnableOption "power-alert configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.poweralertd = {
+      enable = true;
+    };
+  };
+}

home/secrets/.gitattributes

@@ -1,3 +0,0 @@
-* filter=git-crypt diff=git-crypt
-.gitattributes !filter !diff
-/default.nix !filter !diff

home/secrets/default.nix

@@ -1,19 +1,25 @@
-{ lib, ... }:
+{ config, inputs, lib, options, ... }:
 
-with lib;
-let
-  canaryHash = builtins.hashFile "sha256" ./canary;
-  expectedHash =
-    "9df8c065663197b5a1095122d48e140d3677d860343256abd5ab6e4fb4c696ab";
-in
-if canaryHash != expectedHash then
-  abort "Secrets are not readable. Have you run `git-crypt unlock`?"
-else {
-  options.my.secrets = mkOption {
-    type = types.attrs;
-  };
+{
+  imports = [
+    inputs.agenix.homeManagerModules.age
+  ];
 
-  config.my.secrets = {
-    # Home-manager secrets go here
+  config.age = {
+    secrets =
+      let
+        toName = lib.removeSuffix ".age";
+        toSecret = name: { ... }: {
+          file = ./. + "/${name}";
+        };
+        convertSecrets = n: v: lib.nameValuePair (toName n) (toSecret n v);
+        secrets = import ./secrets.nix;
+      in
+      lib.mapAttrs' convertSecrets secrets;
+
+    # Add my usual agenix key to the defaults
+    identityPaths = options.age.identityPaths.default ++ [
+      "${config.home.homeDirectory}/.ssh/agenix"
+    ];
   };
 }

home/secrets/secrets.nix

@@ -0,0 +1,9 @@
+# Common secrets
+let
+  keys = import ../../keys;
+
+  all = builtins.attrValues keys.users;
+in
+{
+  "github/token.age".publicKeys = all;
+}

home/ssh/default.nix

@@ -3,13 +3,18 @@ let
   cfg = config.my.home.ssh;
 in
 {
-  options.my.home.ssh = with lib.my; {
-    enable = mkDisableOption "ssh configuration";
+  options.my.home.ssh = with lib; {
+    enable = my.mkDisableOption "ssh configuration";
   };
 
-  config.programs.ssh = {
+  config.programs.ssh = lib.mkIf cfg.enable {
     enable = true;
 
+    includes = [
+      # Local configuration, not-versioned
+      "config.local"
+    ];
+
     matchBlocks = {
       "github.com" = {
         hostname = "github.com";
@@ -29,8 +34,8 @@ in
         user = "git";
       };
 
-      "gitea.belanyi.fr" = {
-        hostname = "gitea.belanyi.fr";
+      "git.belanyi.fr" = {
+        hostname = "git.belanyi.fr";
         identityFile = "~/.ssh/shared_rsa";
         user = "git";
       };

home/terminal/alacritty/default.nix

@@ -0,0 +1,52 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.terminal;
+in
+{
+  config = lib.mkIf (cfg.program == "alacritty") {
+    programs.alacritty = {
+      enable = true;
+
+      settings = {
+        font = {
+          size = 5.5;
+        };
+
+        colors = {
+          primary = {
+            background = cfg.colors.background;
+            foreground = cfg.colors.foreground;
+
+            bright_foreground = cfg.colors.foregroundBold;
+          };
+
+          cursor = {
+            cursor = cfg.colors.cursor;
+          };
+
+          normal = {
+            black = cfg.colors.black;
+            red = cfg.colors.red;
+            green = cfg.colors.green;
+            yellow = cfg.colors.yellow;
+            blue = cfg.colors.blue;
+            magenta = cfg.colors.magenta;
+            cyan = cfg.colors.cyan;
+            white = cfg.colors.white;
+          };
+
+          bright = {
+            black = cfg.colors.blackBold;
+            red = cfg.colors.redBold;
+            green = cfg.colors.greenBold;
+            yellow = cfg.colors.yellowBold;
+            blue = cfg.colors.blueBold;
+            magenta = cfg.colors.magentaBold;
+            cyan = cfg.colors.cyanBold;
+            white = cfg.colors.whiteBold;
+          };
+        };
+      };
+    };
+  };
+}

home/terminal/default.nix

@@ -0,0 +1,62 @@
+{ config, lib, ... }:
+let
+  mkColorOption = with lib; description: default: mkOption {
+    inherit description default;
+    example = "#abcdef";
+    type = types.strMatching "#[0-9a-f]{6}";
+  };
+
+  cfg = config.my.home.terminal;
+in
+{
+  imports = [
+    ./alacritty
+    ./termite
+  ];
+
+  options.my.home = with lib; {
+    terminal = {
+      program = mkOption {
+        type = with types; nullOr (enum [ "alacritty" "termite" ]);
+        default = null;
+        example = "termite";
+        description = "Which terminal to use for home session";
+      };
+
+      colors = {
+        background = mkColorOption "Background color" "#161616";
+        foreground = mkColorOption "Foreground color" "#ffffff";
+        foregroundBold = mkColorOption "Foreground bold color" "#ffffff";
+        cursor = mkColorOption "Cursor color" "#ffffff";
+
+        black = mkColorOption "Black" "#222222";
+        blackBold = mkColorOption "Black bold" "#666666";
+
+        red = mkColorOption "Red" "#e84f4f";
+        redBold = mkColorOption "Red bold" "#d23d3d";
+
+        green = mkColorOption "Green" "#b7ce42";
+        greenBold = mkColorOption "Green bold" "#bde077";
+
+        yellow = mkColorOption "Yellow" "#fea63c";
+        yellowBold = mkColorOption "Yellow bold" "#ffe863";
+
+        blue = mkColorOption "Blue" "#66aabb";
+        blueBold = mkColorOption "Blue bold" "#aaccbb";
+
+        magenta = mkColorOption "Magenta" "#b7416e";
+        magentaBold = mkColorOption "Magenta bold" "#e16a98";
+
+        cyan = mkColorOption "Cyan" "#6d878d";
+        cyanBold = mkColorOption "Cyan bold" "#42717b";
+
+        white = mkColorOption "White" "#dddddd";
+        whiteBold = mkColorOption "White bold" "#cccccc";
+      };
+    };
+  };
+
+  config.home.sessionVariables = lib.mkIf (cfg.program != null) {
+    TERMINAL = cfg.program;
+  };
+}

home/terminal/termite/default.nix

@@ -0,0 +1,53 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.terminal;
+in
+{
+  config = lib.mkIf (cfg.program == "termite") {
+    programs.termite = {
+      enable = true;
+
+      # Niceties
+      browser = "${pkgs.xdg-utils}/bin/xdg-open";
+      clickableUrl = true;
+      dynamicTitle = true;
+      fullscreen = false;
+      mouseAutohide = true;
+      urgentOnBell = true;
+
+      # Look and feel
+      allowBold = true;
+      audibleBell = false;
+      cursorBlink = "system";
+      font = "Monospace 9";
+      scrollbar = "off";
+
+
+      # Colors
+      backgroundColor = cfg.colors.background;
+      cursorColor = cfg.colors.cursor;
+      foregroundColor = cfg.colors.foreground;
+      foregroundBoldColor = cfg.colors.foregroundBold;
+      colorsExtra = with cfg.colors; ''
+        # Normal colors
+        color0 = ${black}
+        color1 = ${red}
+        color2 = ${green}
+        color3 = ${yellow}
+        color4 = ${blue}
+        color5 = ${magenta}
+        color6 = ${cyan}
+        color7 = ${white}
+        # Bold colors
+        color8 = ${blackBold}
+        color9 = ${redBold}
+        color10 = ${greenBold}
+        color11 = ${yellowBold}
+        color12 = ${blueBold}
+        color13 = ${magentaBold}
+        color14 = ${cyanBold}
+        color15 = ${whiteBold}
+      '';
+    };
+  };
+}

home/tmux.nix

@@ -1,47 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.home.tmux;
-in
-{
-  options.my.home.tmux = with lib.my; {
-    enable = mkDisableOption "tmux terminal multiplexer";
-  };
-
-  config.programs.tmux = lib.mkIf cfg.enable {
-    enable = true;
-
-    keyMode = "vi"; # Home-row keys and other niceties
-    clock24 = true; # I'm one of those heathens
-    escapeTime = 0; # Let vim do its thing instead
-    historyLimit = 5000; # Bigger buffer
-    terminal = "tmux-256color"; # I want accurate termcap info
-
-    plugins = with pkgs.tmuxPlugins; [
-      # Open high-lighted files in copy mode
-      open
-      # Better pane management
-      pain-control
-      # Better session management
-      sessionist
-      # X clipboard integration
-      yank
-      {
-        # Show when prefix has been pressed
-        plugin = prefix-highlight;
-        extraConfig = ''
-          # Also show when I'm in copy or sync mode
-          set -g @prefix_highlight_show_copy_mode 'on'
-          set -g @prefix_highlight_show_sync_mode 'on'
-          # Show prefix mode in status bar
-          set -g status-right '#{prefix_highlight} %a %Y-%m-%d %H:%M'
-        '';
-      }
-    ];
-
-    extraConfig = ''
-      # Better vim mode
-      bind-key -T copy-mode-vi 'v' send -X begin-selection
-      bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
-    '';
-  };
-}

home/tmux/default.nix

@@ -0,0 +1,80 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.tmux;
+  hasGUI = lib.any lib.id [
+    config.my.home.x.enable
+    (config.my.home.wm.windowManager != null)
+  ];
+in
+{
+  options.my.home.tmux = with lib; {
+    enable = my.mkDisableOption "tmux terminal multiplexer";
+
+    enabledPassthrough = mkEnableOption "tmux DCS passthrough sequence";
+  };
+
+  config.programs.tmux = lib.mkIf cfg.enable {
+    enable = true;
+
+    keyMode = "vi"; # Home-row keys and other niceties
+    clock24 = true; # I'm one of those heathens
+    escapeTime = 0; # Let vim do its thing instead
+    historyLimit = 50000; # Bigger buffer
+    terminal = "tmux-256color"; # I want accurate termcap info
+
+    plugins = with pkgs.tmuxPlugins; [
+      # Open high-lighted files in copy mode
+      open
+      # Better pane management
+      pain-control
+      # Better session management
+      sessionist
+      {
+        # X clipboard integration
+        plugin = yank;
+        extraConfig = ''
+          # Use 'clipboard' because of misbehaving apps (e.g: firefox)
+          set -g @yank_selection_mouse 'clipboard'
+          # Stay in copy mode after yanking
+          set -g @yank_action 'copy-pipe'
+        '';
+      }
+      {
+        # Show when prefix has been pressed
+        plugin = prefix-highlight;
+        extraConfig = ''
+          # Also show when I'm in copy or sync mode
+          set -g @prefix_highlight_show_copy_mode 'on'
+          set -g @prefix_highlight_show_sync_mode 'on'
+          # Show prefix mode in status bar
+          set -g status-right '#{prefix_highlight} %a %Y-%m-%d %H:%M'
+        '';
+      }
+    ];
+
+    extraConfig = ''
+      # Better vim mode
+      bind-key -T copy-mode-vi 'v' send -X begin-selection
+      ${
+        lib.optionalString
+          (!hasGUI)
+          "bind-key -T copy-mode-vi 'y' send -X copy-selection"
+      }
+      # Block selection in vim mode
+      bind-key -Tcopy-mode-vi 'C-v' send -X begin-selection \; send -X rectangle-toggle
+
+      # Allow any application to send OSC52 escapes to set the clipboard
+      set -s set-clipboard on
+
+      # Longer session names in status bar
+      set -g status-left-length 16
+
+      ${
+        lib.optionalString cfg.enabledPassthrough ''
+          # Allow any application to use the tmux DCS for passthrough
+          set -g allow-passthrough on
+        ''
+      }
+    '';
+  };
+}

home/udiskie/default.nix

@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.udiskie;
+in
+{
+  options.my.home.udiskie = with lib; {
+    enable = mkEnableOption "udiskie configuration";
+  };
+
+  config.services.udiskie = lib.mkIf cfg.enable {
+    enable = true;
+  };
+}

home/vim/after/ftplugin/bash.vim

@@ -1,14 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Use shfmt as ALE fixer for bash
-let b:ale_fixers=[ 'shfmt' ]
-let b:undo_ftplugin.='|unlet! b:ale_fixers'
-
-" Indent with 4 spaces, simplify script, indent switch cases, use Bash variant
-let b:ale_sh_shfmt_options='-i 4 -s -ci -ln bash'
-let b:undo_ftplugin.='|unlet! b:ale_sh_shfmt_options'
-
-" Use bash dialect explicitly, require explicit empty string test
-let b:ale_sh_shellcheck_options='-s bash -o avoid-nullary-conditions'
-let b:undo_ftplugin.='|unlet! b:ale_sh_shellcheck_options'

home/vim/after/ftplugin/beancount.vim

@@ -7,7 +7,3 @@ let b:undo_ftplugin.='|setlocal shiftwidth<'
 
 " Have automatic padding of transactions so that decimal is on 52nd column
 let g:beancount_separator_col=52
-
-" Automatic padding for transactions
-nnoremap <buffer> <leader>= :AlignCommodity<CR>
-vnoremap <buffer> <leader>= :AlignCommodity<CR>

home/vim/after/ftplugin/c.vim

@@ -1,14 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" More warnings and the usual version in flags for Clang
-let b:ale_c_clang_options='-Wall -Wextra -pedantic -std=c99'
-let b:undo_ftplugin.='|unlet! b:ale_c_clang_options'
-
-" More warnings and the usual version in flags for GCC
-let b:ale_c_gcc_options='-Wall -Wextra -pedantic -std=c99'
-let b:undo_ftplugin.='|unlet! b:ale_c_gcc_options'
-
-" Use compile_commands.json to look for additional flags
-let b:ale_c_parse_compile_commands=1
-let b:undo_ftplugin.='|unlet! b:ale_c_parse_compile_commands'

home/vim/after/ftplugin/cpp.vim

@@ -1,14 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" More warnings and the usual version in flags for Clang
-let b:ale_cpp_clang_options='-Wall -Wextra -pedantic -std=c++17'
-let b:undo_ftplugin.='|unlet! b:ale_cpp_clang_options'
-
-" More warnings and the usual version in flags for GCC
-let b:ale_cpp_gcc_options='-Wall -Wextra -pedantic -std=c++17'
-let b:undo_ftplugin.='|unlet! b:ale_cpp_gcc_options'
-
-" Use compile_commands.json to look for additional flags
-let b:ale_c_parse_compile_commands=1
-let b:undo_ftplugin.='|unlet! b:ale_c_parse_compile_commands'

home/vim/after/ftplugin/d.vim

@@ -1,6 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Use my desired ALE fixer for D
-let b:ale_fixers=[ 'dfmt' ]
-let b:undo_ftplugin.='|unlet! b:ale_fixers'

home/vim/after/ftplugin/gitsendemail.vim

@@ -1,2 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()

home/vim/after/ftplugin/haskell.vim

@@ -5,26 +5,6 @@ call ftplugined#check_undo_ft()
 setlocal shiftwidth=2
 let b:undo_ftplugin.='|setlocal shiftwidth<'
 
-" Use my desired ALE fixers for Haskell
-let b:ale_fixers=[ 'brittany' ]
-let b:undo_ftplugin.='|unlet! b:ale_fixers'
-
-" Use stack-managed `hlint`
-let b:ale_haskell_hlint_executable='stack'
-let b:undo_ftplugin.='|unlet! b:ale_haskell_hlint_executable'
-
-" Use stack-managed `brittany`
-let b:ale_haskell_brittany_executable='stack'
-let b:undo_ftplugin.='|unlet! b:ale_haskell_brittany_executable'
-
-" Use dynamic libraries because of Arch linux, with default ALE options
-let b:ale_haskell_ghc_options='--dynamic -fno-code -v0'
-let b:undo_ftplugin.='|unlet! b:ale_haskell_ghc_options'
-
-" Automatically format files when saving them
-let b:ale_fix_on_save=1
-let b:undo_ftplugin='|unlet! b:ale_lint_on_save'
-
 " Change max length of a line to 100 for this buffer to match official guidelines
 setlocal colorcolumn=100
 let b:undo_ftplugin.='|setlocal colorcolumn<'

home/vim/after/ftplugin/json.vim

@@ -1,6 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Use my desired ALE fixer for JSON
-let b:ale_fixers=[ 'jq' ]
-let b:undo_ftplugin.='|unlet! b:ale_fixers'

home/vim/after/ftplugin/markdown.vim

@@ -1,10 +1,6 @@
 " Create the `b:undo_ftplugin` variable if it doesn't exist
 call ftplugined#check_undo_ft()
 
-" Let ALE know that I want Markdown linters
-let b:ale_linter_aliases=[ 'markdown' ]
-let b:undo_ftplugin.='|unlet! b:ale_linter_aliases'
-
 " Use a small indentation value on Pandoc files
 setlocal shiftwidth=2
 let b:undo_ftplugin.='|setlocal shiftwidth<'

home/vim/after/ftplugin/nix.vim

@@ -0,0 +1,6 @@
+" Create the `b:undo_ftplugin` variable if it doesn't exist
+call ftplugined#check_undo_ft()
+
+" Use a small indentation value on Nix files
+setlocal shiftwidth=2
+let b:undo_ftplugin.='|setlocal shiftwidth<'

home/vim/after/ftplugin/python.vim

@@ -1,40 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Use my desired ALE fixers for python
-let b:ale_fixers=[ 'black', 'isort' ]
-let b:undo_ftplugin.='|unlet! b:ale_fixers'
-" Use my desired ALE linters for python
-let b:ale_linters=[ 'flake8', 'mypy', 'pylint', 'pyls' ]
-let b:undo_ftplugin.='|unlet! b:ale_linters'
-
-" Use pyls inside the python environment if needed
-let b:ale_python_pyls_auto_pipenv=1
-let b:undo_ftplugin.='|unlet! b:ale_python_pyls_auto_pipenv'
-
-" Disable pycodestyle checks from pyls because I'm already using flake8
-let b:ale_python_pyls_config={
-  \     'pyls': {
-  \         'plugins': {
-  \             'pycodestyle': {
-  \                 'enabled': v:false
-  \             },
-  \         },
-  \     },
-  \  }
-let b:undo_ftplugin.='|unlet! b:ale_python_pyls_config'
-
-" Don't use mypy to check for syntax errors
-let b:ale_python_mypy_ignore_invalid_syntax=1
-let b:undo_ftplugin.='|unlet! b:ale_python_mypy_ignore_invalid_syntax'
-" Use mypy inside the python environment if needed
-let b:ale_python_mypy_auto_pipenv=1
-let b:undo_ftplugin.='|unlet! b:ale_python_mypy_auto_pipenv'
-
-" Automatically format files when saving them
-let b:ale_fix_on_save=1
-let b:undo_ftplugin='|unlet! b:ale_lint_on_save'
-
-" Change max length of a line to 88 for this buffer to match black's settings
-setlocal colorcolumn=88
-let b:undo_ftplugin.='|setlocal colorcolumn<'

home/vim/after/ftplugin/qf.vim

@@ -1,8 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Use h/l to go to the previous/next non-empty quickfix or location list
-nnoremap <silent> <buffer> h :call quickfixed#older()<CR>
-let b:undo_ftplugin.='|nunmap <buffer> h'
-nnoremap <silent> <buffer> l :call quickfixed#newer()<CR>
-let b:undo_ftplugin.='|nunmap <buffer> l'

home/vim/after/ftplugin/rust.vim

@@ -1,31 +1,6 @@
 " Create the `b:undo_ftplugin` variable if it doesn't exist
 call ftplugined#check_undo_ft()
 
-" Check tests too
-let b:ale_rust_cargo_check_tests=1
-let b:undo_ftplugin='|unlet! b:ale_rust_cargo_check_tests'
-
-" Check examples too
-let b:ale_rust_cargo_check_examples=1
-let b:undo_ftplugin='|unlet! b:ale_rust_cargo_check_examples'
-
-" Use clippy if it's available instead of just cargo check
-let b:ale_rust_cargo_use_clippy=executable('cargo-clippy')
-let b:undo_ftplugin='|unlet! b:ale_rust_cargo_use_clippy'
-
-" Use rust-analyzer instead of RLS as a linter
-let b:ale_linters=[ 'cargo', 'analyzer' ]
-let b:undo_ftplugin='|unlet! b:ale_linters'
-
-
-" Use rustfmt as ALE fixer for rust
-let b:ale_fixers=[ 'rustfmt' ]
-let b:undo_ftplugin.='|unlet! b:ale_fixers'
-
-" Automatically format files when saving them
-let b:ale_fix_on_save=1
-let b:undo_ftplugin='|unlet! b:ale_lint_on_save'
-
 " Change max length of a line to 99 for this buffer to match official guidelines
 setlocal colorcolumn=99
 let b:undo_ftplugin.='|setlocal colorcolumn<'

home/vim/after/ftplugin/sh.vim

@@ -1,14 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Use shfmt as ALE fixer for sh
-let b:ale_fixers=[ 'shfmt' ]
-let b:undo_ftplugin.='|unlet! b:ale_fixers'
-
-" Indent with 4 spaces, simplify the code, indent switch cases, use POSIX
-let b:ale_sh_shfmt_options='-i 4 -s -ci -ln posix'
-let b:undo_ftplugin.='|unlet! b:ale_sh_shfmt_options'
-
-" Require explicit empty string test
-let b:ale_sh_shellcheck_options='-o avoid-nullary-conditions'
-let b:undo_ftplugin.='|unlet! b:ale_sh_shellcheck_options'

home/vim/after/ftplugin/tiger.vim

@@ -0,0 +1,6 @@
+" Create the `b:undo_ftplugin` variable if it doesn't exist
+call ftplugined#check_undo_ft()
+
+" Use a small indentation value on tiger files
+setlocal shiftwidth=2
+let b:undo_ftplugin.='|setlocal shiftwidth<'

home/vim/after/ftplugin/zsh.vim

@@ -1,14 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Use shfmt as ALE fixer for zsh
-let b:ale_fixers=[ 'shfmt' ]
-let b:undo_ftplugin.='|unlet! b:ale_fixers'
-
-" Indent with 4 spaces, simplify script, indent switch cases, use Bash variant
-let b:ale_sh_shfmt_options='-i 4 -s -ci -ln bash'
-let b:undo_ftplugin.='|unlet! b:ale_sh_shfmt_options'
-
-" Use bash dialect explicitly, require explicit empty string test
-let b:ale_sh_shellcheck_options='-s bash -o avoid-nullary-conditions'
-let b:undo_ftplugin.='|unlet! b:ale_sh_shellcheck_options'

home/vim/after/plugin/mappings/ale.vim

@@ -1,2 +0,0 @@
-" Use ALE LSP-powered symbol information
-nnoremap <Leader>K :ALEHover<CR>

home/vim/after/plugin/mappings/commentary.lua

@@ -0,0 +1,10 @@
+local wk = require("which-key")
+
+local keys = {
+    name = "Comment/uncomment",
+    c = "Current line",
+    u = "Uncomment the current and adjacent commented lines",
+    ["gc"] = "Uncomment the current and adjacent commented lines",
+}
+
+wk.register(keys, { prefix = "gc" })

home/vim/after/plugin/mappings/fugitive.vim

@@ -1,10 +0,0 @@
-" Visual bindings for merging diffs as in normal mode
-xnoremap dp :diffput<cr>
-xnoremap do :diffget<cr>
-
-" Open status window
-nnoremap <Leader>gs :Gstatus<CR>
-" Open diff view of current buffer: the up/left window is the current index
-nnoremap <Leader>gd :Gdiffsplit!<CR>
-" Open current file log in new tab, populate its location list with history
-nnoremap <Leader>gl :sp<CR><C-w>T:Gllog --follow -- %:p<CR>