WIP

It's potentially more customizable, and integrates with tree-sitter. It
also allows for buffer/filetype specific pairs.

.drone.yml

@@ -1,14 +1,16 @@
-labels:
-  backend: local
+---
+kind: pipeline
+type: exec
+name: NixOS config check
 
 steps:
 - name: nix flake check
-  image: bash
   commands:
   - nix flake check
 
 - name: notifiy
-  image: bash
+  commands:
+  - nix run .#matrix-notifier
   environment:
     ADDRESS:
       from_secret: matrix_homeserver
@@ -18,9 +20,8 @@ steps:
       from_secret: matrix_username
     PASS:
       from_secret: matrix_password
-  commands:
-  - nix run '.#matrix-notifier'
   when:
     status:
-    - failure
-    - success
+      - failure
+      - success
+...

.envrc

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

.stylua.toml

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

bootstrap.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i bash -p bitwarden-cli git gnupg jq nix
-# shellcheck shell=bash
+#! nix-shell -i bash -p bitwarden-cli git gnupg jq nixFlakes
 
 # Command failure is script failure
 set -e
@@ -11,6 +10,7 @@ BOLD_GREEN="\e[0;1;32m"
 
 RESET="\e[0m"
 
+DEST="$HOME/.config/nixpkgs"
 BW_SESSION=""
 
 warn() {
@@ -58,8 +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_doc "SysAdmin/SSH" "agenix-public" "$HOME/.ssh/id_ed25519.pub" 644
+    get_doc "SysAdmin/SSH" "agenix-private" "$HOME/.ssh/id_ed25519" 600
 }
 
 get_pgp() {
@@ -87,6 +87,15 @@ get_creds() {
     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

@@ -2,23 +2,16 @@
   "nodes": {
     "agenix": {
       "inputs": {
-        "darwin": "darwin",
-        "home-manager": [
-          "home-manager"
-        ],
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "systems": [
-          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1715290355,
-        "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=",
+        "lastModified": 1662046976,
+        "narHash": "sha256-BrTReGRhkVm/Kmmf4zQrL+oYWy0sds/BDBgXNX1CL3c=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
+        "rev": "9f136ecfa5bf954538aed3245e4408cf87c85097",
         "type": "github"
       },
       "original": {
@@ -28,36 +21,29 @@
         "type": "github"
       }
     },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
+    "devshell": {
       "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "lastModified": 1642188268,
+        "narHash": "sha256-DNz4xScpXIn7rSDohdayBpPR9H9OWCMDOgTYegX081k=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "696acc29668b644df1740b69e1601119bf6da83b",
         "type": "github"
       },
       "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
+        "owner": "numtide",
+        "repo": "devshell",
         "type": "github"
       }
     },
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
         "type": "github"
       },
       "original": {
@@ -66,81 +52,37 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1715865404,
-        "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "main",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "futils": {
-      "inputs": {
-        "systems": [
-          "systems"
-        ]
-      },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
         "owner": "numtide",
-        "ref": "main",
+        "ref": "master",
         "repo": "flake-utils",
         "type": "github"
       }
     },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
+        ],
+        "utils": [
+          "futils"
         ]
       },
       "locked": {
-        "lastModified": 1715930644,
-        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
+        "lastModified": 1661824092,
+        "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
+        "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6",
         "type": "github"
       },
       "original": {
@@ -150,13 +92,52 @@
         "type": "github"
       }
     },
+    "matrix-appservices": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-compat": "flake-compat",
+        "nixlib": "nixlib",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1662227278,
+        "narHash": "sha256-n58O7wTmORHg+cwYrbKjnlKi3UQkDug9l0FY9RB6zIM=",
+        "owner": "coffeetables",
+        "repo": "nix-matrix-appservices",
+        "rev": "41c1418781dbdfae5d1c15a29b7f1b8f67e5d69f",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "coffeetables",
+        "ref": "main",
+        "repo": "nix-matrix-appservices",
+        "type": "gitlab"
+      }
+    },
+    "nixlib": {
+      "locked": {
+        "lastModified": 1643502816,
+        "narHash": "sha256-Wrbt6Gs+hjXD3HUICPBJHKnHEUqiyx8rzHCgvqC1Bok=",
+        "owner": "divnix",
+        "repo": "nixpkgs.lib",
+        "rev": "ebed7ec5bcb5d01e298535989c6c321df18b631a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715961556,
-        "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
+        "lastModified": 1662019588,
+        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
+        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
         "type": "github"
       },
       "original": {
@@ -168,11 +149,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1716149933,
-        "narHash": "sha256-0Ui2HmmKvSqxXfT5kCzTu2EO+kqYxavPZHROxQLsI14=",
+        "lastModified": 1662103084,
+        "narHash": "sha256-zE6ftit1nllgrXJ3hnt/h/Ev+JsjkJQLKAgO5M31R5s=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0d0e224fe23a49977d871ae2fe2f14c84b03322a",
+        "rev": "65fef905eaad9a585a3841103ed3f45608a50c56",
         "type": "github"
       },
       "original": {
@@ -184,21 +165,19 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
+        "flake-utils": [
+          "futils"
         ],
-        "nixpkgs-stable": [
+        "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1715870890,
-        "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=",
+        "lastModified": 1660830093,
+        "narHash": "sha256-HUhx3a82C7bgp2REdGFeHJdhEAzMGCk3V8xIvfBqg1I=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1",
+        "rev": "8cb8ea5f1c7bc2984f460587fddd5f2e558f6eb8",
         "type": "github"
       },
       "original": {
@@ -211,29 +190,12 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "flake-parts": "flake-parts",
         "futils": "futils",
         "home-manager": "home-manager",
+        "matrix-appservices": "matrix-appservices",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
-        "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "ref": "main",
-        "repo": "default",
-        "type": "github"
+        "pre-commit-hooks": "pre-commit-hooks"
       }
     }
   },

flake.nix

@@ -7,19 +7,7 @@
       repo = "agenix";
       ref = "main";
       inputs = {
-        home-manager.follows = "home-manager";
         nixpkgs.follows = "nixpkgs";
-        systems.follows = "systems";
-      };
-    };
-
-    flake-parts = {
-      type = "github";
-      owner = "hercules-ci";
-      repo = "flake-parts";
-      ref = "main";
-      inputs = {
-        nixpkgs-lib.follows = "nixpkgs";
       };
     };
 
@@ -27,10 +15,7 @@
       type = "github";
       owner = "numtide";
       repo = "flake-utils";
-      ref = "main";
-      inputs = {
-        systems.follows = "systems";
-      };
+      ref = "master";
     };
 
     home-manager = {
@@ -40,6 +25,20 @@
       ref = "master";
       inputs = {
         nixpkgs.follows = "nixpkgs";
+        utils.follows = "futils";
+      };
+    };
+
+    matrix-appservices = {
+      type = "gitlab";
+      owner = "coffeetables";
+      repo = "nix-matrix-appservices";
+      ref = "main";
+      inputs = {
+        # devshell.follows = "devshell";
+        # flake-compat.follows = "flake-compat";
+        # nixlib.follows = "nixlib";
+        nixpkgs.follows = "nixpkgs";
       };
     };
 
@@ -63,19 +62,126 @@
       repo = "pre-commit-hooks.nix";
       ref = "master";
       inputs = {
+        flake-utils.follows = "futils";
         nixpkgs.follows = "nixpkgs";
-        nixpkgs-stable.follows = "nixpkgs";
       };
     };
-
-    systems = {
-      type = "github";
-      owner = "nix-systems";
-      repo = "default";
-      ref = "main";
-    };
   };
 
-  # Can't eta-reduce a flake outputs...
-  outputs = inputs: import ./flake inputs;
+  outputs =
+    inputs @
+    { self
+    , agenix
+    , futils
+    , home-manager
+    , matrix-appservices
+    , nixpkgs
+    , nur
+    , pre-commit-hooks
+    }:
+    let
+      inherit (futils.lib) eachSystem system;
+
+      mySystems = [
+        system.aarch64-linux
+        system.x86_64-darwin
+        system.x86_64-linux
+      ];
+
+      eachMySystem = eachSystem mySystems;
+
+      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
+          ];
+        }
+        # Include generic settings
+        ./modules
+        # Include bundles of settings
+        ./profiles
+      ];
+
+      buildHost = name: system: lib.nixosSystem {
+        inherit system;
+        modules = defaultModules ++ [
+          (./. + "/machines/${name}")
+        ];
+        specialArgs = {
+          # Use my extended lib in NixOS configuration
+          inherit lib;
+          # Inject inputs to use them in global registry
+          inherit inputs;
+        };
+      };
+    in
+    eachMySystem
+      (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      rec {
+        apps = {
+          diff-flake = futils.lib.mkApp { drv = packages.diff-flake; };
+          default = apps.diff-flake;
+        };
+
+        checks = {
+          pre-commit = pre-commit-hooks.lib.${system}.run {
+            src = ./.;
+
+            hooks = {
+              nixpkgs-fmt = {
+                enable = true;
+              };
+
+              shellcheck = {
+                enable = true;
+              };
+            };
+          };
+        };
+
+        devShells = {
+          default = pkgs.mkShell {
+            name = "NixOS-config";
+
+            nativeBuildInputs = with pkgs; [
+              gitAndTools.pre-commit
+              nixpkgs-fmt
+            ];
+
+            inherit (self.checks.${system}.pre-commit) shellHook;
+          };
+        };
+
+        packages =
+          let
+            inherit (futils.lib) filterPackages flattenTree;
+            packages = import ./pkgs { inherit pkgs; };
+            flattenedPackages = flattenTree packages;
+            finalPackages = filterPackages system flattenedPackages;
+          in
+          finalPackages;
+      }) // {
+      overlays = import ./overlays // {
+        lib = final: prev: { inherit lib; };
+        pkgs = final: prev: {
+          ambroisie = prev.recurseIntoAttrs (import ./pkgs { pkgs = prev; });
+        };
+      };
+
+      nixosConfigurations = lib.mapAttrs buildHost {
+        aramis = "x86_64-linux";
+        porthos = "x86_64-linux";
+      };
+    };
 }

flake/apps.nix

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

flake/checks.nix

@@ -1,33 +0,0 @@
-{ 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

@@ -1,22 +0,0 @@
-{ flake-parts
-, systems
-, ...
-} @ inputs:
-let
-  mySystems = import systems;
-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

@@ -1,19 +0,0 @@
-{ ... }:
-{
-  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

@@ -1,62 +0,0 @@
-{ self, inputs, lib, ... }:
-let
-  defaultModules = [
-    # Include generic settings
-    "${self}/modules/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;
-    };
-  };
-
-  homes = {
-    "ambroisie@bazin" = "x86_64-linux";
-    "ambroisie@mousqueton" = "x86_64-linux";
-  };
-in
-{
-  perSystem = { system, ... }: {
-    # Work-around for https://github.com/nix-community/home-manager/issues/3075
-    legacyPackages = {
-      homeConfigurations =
-        let
-          filteredHomes = lib.filterAttrs (_: v: v == system) homes;
-          allHomes = filteredHomes // {
-            # Default configuration
-            ambroisie = system;
-          };
-        in
-        lib.mapAttrs mkHome allHomes;
-    };
-  };
-}

flake/lib.nix

@@ -1,11 +0,0 @@
-{ 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

@@ -1,35 +0,0 @@
-{ self, inputs, lib, ... }:
-let
-  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/nixos"
-  ];
-
-  buildHost = name: system: lib.nixosSystem {
-    inherit system;
-    modules = defaultModules ++ [
-      "${self}/hosts/nixos/${name}"
-    ];
-    specialArgs = {
-      # Use my extended lib in NixOS configuration
-      inherit (self) 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

@@ -1,17 +0,0 @@
-{ 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

@@ -1,13 +0,0 @@
-{ 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

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

home/bat/default.nix

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

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

@@ -0,0 +1,47 @@
+{ ... }:
+{
+  imports = [
+    ./bat
+    ./bluetooth
+    ./comma
+    ./direnv
+    ./discord
+    ./documentation
+    ./feh
+    ./firefox
+    ./flameshot
+    ./gammastep
+    ./gdb
+    ./git
+    ./gpg
+    ./gtk
+    ./htop
+    ./jq
+    ./mail
+    ./mpv
+    ./nix-index
+    ./nm-applet
+    ./packages
+    ./pager
+    ./power-alert
+    ./ssh
+    ./terminal
+    ./tmux
+    ./udiskie
+    ./vim
+    ./wm
+    ./x
+    ./xdg
+    ./zathura
+    ./zsh
+  ];
+
+  # First sane reproducible version
+  home.stateVersion = "20.09";
+
+  # Who am I?
+  home.username = "ambroisie";
+
+  # Start services automatically
+  systemd.user.startServices = "sd-switch";
+}

home/direnv/default.nix

@@ -7,9 +7,9 @@ in
     enable = my.mkDisableOption "direnv configuration";
 
     defaultFlake = mkOption {
-      type = with types; nullOr str;
-      default = null;
-      example = "pkgs";
+      type = types.str;
+      default = "pkgs";
+      example = "nixpkgs";
       description = ''
         Which flake from the registry should be used for
         <command>use pkgs</command> by default.
@@ -39,7 +39,7 @@ in
       in
       lib.my.genAttrs' files linkLibFile;
 
-    home.sessionVariables = lib.mkIf (cfg.defaultFlake != null) {
+    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/documentation/default.nix

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

home/firefox/default.nix

@@ -33,10 +33,13 @@ in
     enable = true;
 
     package = pkgs.firefox.override {
-      nativeMessagingHosts = ([ ]
-        ++ lib.optional cfg.tridactyl.enable pkgs.tridactyl-native
+      cfg = {
+        enableTridactylNative = cfg.tridactyl.enable;
+      };
+
+      extraNativeMessagingHosts = with pkgs; ([ ]
         # Watch videos using mpv
-        ++ lib.optional cfg.ff2mpv.enable pkgs.ff2mpv-go
+        ++ lib.optional cfg.ff2mpv.enable ambroisie.ff2mpv-go
       );
     };
 
@@ -54,27 +57,28 @@ in
           "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
+          "media.gmp-widevinecdm.enabled" = 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
-        );
       };
     };
+
+    extensions = with pkgs.nur.repos.rycee.firefox-addons; ([
+      bitwarden
+      consent-o-matic
+      form-history-control
+      https-everywhere
+      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,9 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.firefox.tridactyl;
+in
+{
+  config = lib.mkIf cfg.enable {
+    xdg.configFile."tridactyl/tridactylrc".source = ./tridactylrc;
+  };
+}

home/firefox/tridactyl/tridactylrc

@@ -5,12 +5,8 @@
 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
+" FIXME: make it follow my prefered terminal
+set editorcmd termite --class tridactyl_editor -e 'vim %f'
 " }}}
 
 " Binds {{{
@@ -22,12 +18,12 @@ bind ;c hint -Jc [class*="expand"],[class*="togg"],[class="comment_folder"]
 bindurl reddit.com gu urlparent 3
 
 " Only hint search results on Google
-bindurl www.google.com f hint -Jc #search a
-bindurl www.google.com F hint -Jbc #search a
+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"]
+bindurl ^https://duckduckgo.com f hint -Jc [class~=result__a]
+bindurl ^https://duckduckgo.com F hint -Jbc [class~=result__a]
 
 " Only hint item pages on Hacker News
 bindurl news.ycombinator.com ;f hint -Jc .age > a
@@ -69,6 +65,8 @@ 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 {{{

home/gdb/default.nix

@@ -20,26 +20,19 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
       home.packages = with pkgs; [
         gdb
       ];
 
-      xdg = {
-        configFile."gdb/gdbinit".source = ./gdbinit;
-        dataFile. "gdb/.keep".text = "";
-      };
-
-      home.sessionVariables = {
-        GDBHISTFILE = "${config.xdg.dataHome}/gdb/gdb_history";
-      };
-    }
+      xdg.configFile."gdb/gdbinit".source = ./gdbinit;
+    })
 
     (lib.mkIf cfg.rr.enable {
       home.packages = [
         cfg.rr.package
       ];
     })
-  ]);
+  ];
 }

home/git/default.ignore

@@ -28,7 +28,3 @@ compile_commands.json
 # Direnv files
 .envrc
 .direnv/
-
-# Project-local neovim configuration files
-.nvim.lua
-.nvimrc

home/git/default.nix

@@ -5,17 +5,14 @@ let
   inherit (lib.my) mkMailAddress;
 in
 {
-  options.my.home.git = with lib; {
-    enable = my.mkDisableOption "git configuration";
-
-    # I want the full experience by default
-    package = mkPackageOption pkgs "git" { default = [ "gitFull" ]; };
+  options.my.home.git = with lib.my; {
+    enable = mkDisableOption "git configuration";
   };
 
-  config.home.packages = with pkgs; lib.mkIf cfg.enable [
-    git-absorb
-    git-revise
-    tig
+  config.home.packages = with pkgs.gitAndTools; lib.mkIf cfg.enable [
+    gitAndTools.git-absorb
+    gitAndTools.git-revise
+    gitAndTools.tig
   ];
 
   config.programs.git = lib.mkIf cfg.enable {
@@ -25,7 +22,8 @@ in
     userEmail = mkMailAddress "bruno" "belanyi.fr";
     userName = "Bruno BELANYI";
 
-    inherit (cfg) package;
+    # I want the full experience
+    package = pkgs.gitAndTools.gitFull;
 
     aliases = {
       git = "!git";
@@ -37,7 +35,6 @@ in
       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;
@@ -123,11 +120,6 @@ in
         defaultBranch = "main";
       };
 
-      # Local configuration, not-versioned
-      include = {
-        path = "config.local";
-      };
-
       merge = {
         conflictStyle = "zdiff3";
       };
@@ -148,13 +140,9 @@ in
         autoStash = true;
       };
 
-      rerere = {
-        enabled = true;
-      };
-
       url = {
-        "git@git.belanyi.fr:" = {
-          insteadOf = "https://git.belanyi.fr/";
+        "git@gitea.belanyi.fr:" = {
+          insteadOf = "https://gitea.belanyi.fr/";
         };
 
         "git@github.com:" = {
@@ -178,15 +166,6 @@ in
           };
         };
       }
-      {
-        condition = "gitdir:~/git/work/";
-        contents = {
-          user = {
-            name = "Bruno BELANYI";
-            email = mkMailAddress "ambroisie" "google.com";
-          };
-        };
-      }
     ];
 
     ignores =

home/gpg/default.nix

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

home/htop/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.htop;
 in
 {
-  options.my.home.htop = with lib; {
-    enable = my.mkDisableOption "htop configuration";
+  options.my.home.htop = with lib.my; {
+    enable = 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; {
-    enable = my.mkDisableOption "jq configuration";
+  options.my.home.jq = with lib.my; {
+    enable = mkDisableOption "jq configuration";
   };
 
   config.programs.jq = lib.mkIf cfg.enable {

home/mail/accounts/default.nix

@@ -8,7 +8,7 @@ let
     realName = lib.mkDefault "Bruno BELANYI";
     userName = lib.mkDefault (mkMailAddress address domain);
     passwordCommand =
-      lib.mkDefault [ (lib.getExe pkgs.ambroisie.rbw-pass) "Mail" passName ];
+      lib.mkDefault [ "${pkgs.ambroisie.bw-pass}/bin/bw-pass" "Mail" passName ];
 
     address = mkMailAddress address domain;
     aliases = builtins.map (lib.flip mkMailAddress domain) aliases;
@@ -17,7 +17,6 @@ let
 
     himalaya = {
       enable = cfg.himalaya.enable;
-      # FIXME: try to actually configure it at some point
     };
 
     msmtp = {

home/mail/default.nix

@@ -15,7 +15,7 @@ in
     enable = my.mkDisableOption "email configuration";
 
     himalaya = {
-      enable = mkEnableOption "himalaya configuration";
+      enable = mkRelatedOption "himalaya configuration";
     };
 
     msmtp = {

home/mail/himalaya/default.nix

@@ -9,7 +9,7 @@ in
     settings = {
       notify-cmd =
         let
-          notify-send = lib.getExe pkgs.libnotify;
+          notify-send = "${pkgs.libnotify}/bin/notify-send";
         in
         pkgs.writeScript "mail-notifier" ''
           SENDER="$1"

home/mpv/default.nix

@@ -13,8 +13,6 @@ in
 
       scripts = [
         pkgs.mpvScripts.mpris # Allow controlling using media keys
-        pkgs.mpvScripts.mpv-cheatsheet # Show some simple mappings on '?'
-        pkgs.mpvScripts.uosc # Nicer UI
       ];
     };
   };

home/nix-index/default.nix

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

home/packages/default.nix

@@ -6,10 +6,6 @@ in
   options.my.home.packages = with lib; {
     enable = my.mkDisableOption "user packages";
 
-    allowAliases = mkEnableOption "allow package aliases";
-
-    allowUnfree = my.mkDisableOption "allow unfree packages";
-
     additionalPackages = mkOption {
       type = with types; listOf package;
       default = [ ];
@@ -21,15 +17,11 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; ([
-      fd
-      file
-      ripgrep
-    ] ++ cfg.additionalPackages);
-
-    nixpkgs.config = {
-      inherit (cfg) allowAliases allowUnfree;
-    };
-  };
+  config.home.packages = with pkgs; lib.mkIf cfg.enable ([
+    fd
+    file
+    mosh
+    ripgrep
+    termite.terminfo
+  ] ++ cfg.additionalPackages);
 }

home/pager/default.nix

@@ -0,0 +1,36 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.pager;
+in
+{
+  options.my.home.pager = with lib.my; {
+    enable = 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";
+    };
+
+    programs.zsh.localVariables = {
+      # Colored man pages
+      LESS_TERMCAP_mb = "$(tput bold; tput setaf 2)";
+      LESS_TERMCAP_md = "$(tput bold; tput setaf 6)";
+      LESS_TERMCAP_me = "$(tput sgr0)";
+      LESS_TERMCAP_so = "$(tput bold; tput setaf 3; tput setab 4)";
+      LESS_TERMCAP_se = "$(tput rmso; tput sgr0)";
+      LESS_TERMCAP_us = "$(tput bold; tput setaf 2)";
+      LESS_TERMCAP_ue = "$(tput rmul; tput sgr0)";
+      LESS_TERMCAP_mr = "$(tput rev)";
+      LESS_TERMCAP_mh = "$(tput dim)";
+      LESS_TERMCAP_ZN = "$(tput ssubm)";
+      LESS_TERMCAP_ZV = "$(tput rsubm)";
+      LESS_TERMCAP_ZO = "$(tput ssupm)";
+      LESS_TERMCAP_ZW = "$(tput rsupm)";
+    };
+  };
+}

home/ssh/default.nix

@@ -0,0 +1,55 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.home.ssh;
+in
+{
+  options.my.home.ssh = with lib.my; {
+    enable = mkDisableOption "ssh configuration";
+  };
+
+  config.programs.ssh = lib.mkIf cfg.enable {
+    enable = true;
+
+    matchBlocks = {
+      "github.com" = {
+        hostname = "github.com";
+        identityFile = "~/.ssh/shared_rsa";
+        user = "git";
+      };
+
+      "gitlab.com" = {
+        hostname = "gitlab.com";
+        identityFile = "~/.ssh/shared_rsa";
+        user = "git";
+      };
+
+      "git.sr.ht" = {
+        hostname = "git.sr.ht";
+        identityFile = "~/.ssh/shared_rsa";
+        user = "git";
+      };
+
+      "gitea.belanyi.fr" = {
+        hostname = "gitea.belanyi.fr";
+        identityFile = "~/.ssh/shared_rsa";
+        user = "git";
+      };
+
+      porthos = {
+        hostname = "91.121.177.163";
+        identityFile = "~/.ssh/shared_rsa";
+        user = "ambroisie";
+      };
+
+      work = {
+        hostname = "workspaces.dgexsol.fr";
+        identityFile = "~/.ssh/shared_rsa";
+        user = "bruno_belanyi";
+      };
+    };
+
+    extraConfig = ''
+      AddKeysToAgent yes
+    '';
+  };
+}

home/terminal/default.nix

@@ -10,14 +10,13 @@ let
 in
 {
   imports = [
-    ./alacritty
     ./termite
   ];
 
   options.my.home = with lib; {
     terminal = {
       program = mkOption {
-        type = with types; nullOr (enum [ "alacritty" "termite" ]);
+        type = with types; nullOr (enum [ "termite" ]);
         default = null;
         example = "termite";
         description = "Which terminal to use for home session";

home/tmux/default.nix

@@ -0,0 +1,62 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.tmux;
+  hasGUI = config.my.home.x.enable || (config.my.home.wm != null);
+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 = 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
+      (lib.optionalAttrs hasGUI {
+        # 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
+    '';
+  };
+}

home/vim/after/ftplugin/gitcommit.vim

@@ -4,7 +4,3 @@ call ftplugined#check_undo_ft()
 " Enable spell checking on commit messages
 setlocal spell
 let b:undo_ftplugin.='|setlocal spell<'
-
-" Change max length of a line to 72 for this buffer
-setlocal colorcolumn=72
-let b:undo_ftplugin.='|setlocal colorcolumn<'

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

@@ -1,3 +1,4 @@
+lua << EOF
 local wk = require("which-key")
 
 local keys = {
@@ -8,3 +9,4 @@ local keys = {
 }
 
 wk.register(keys, { prefix = "gc" })
+EOF

home/vim/after/plugin/mappings/misc.vim

@@ -1,3 +1,4 @@
+lua << EOF
 local wk = require("which-key")
 
 local keys = {
@@ -5,3 +6,4 @@ local keys = {
 }
 
 wk.register(keys, { prefix = "<leader>" })
+EOF

home/vim/after/plugin/mappings/telescope.vim

@@ -1,3 +1,4 @@
+lua << EOF
 local wk = require("which-key")
 local telescope_builtin = require("telescope.builtin")
 
@@ -13,3 +14,5 @@ local keys = {
 }
 
 wk.register(keys, { prefix = "<leader>" })
+EOF
+

home/vim/after/plugin/mappings/tree-sitter-textobjects.vim

@@ -1,3 +1,4 @@
+lua << EOF
 local wk = require("which-key")
 
 local motions = {
@@ -28,3 +29,4 @@ local objects = {
 
 wk.register(motions, { mode = "n" })
 wk.register(objects, { mode = "o" })
+EOF

home/vim/after/plugin/mappings/unimpaired.vim

@@ -1,7 +1,6 @@
+lua << EOF
 local wk = require("which-key")
 
-local lsp = require("ambroisie.lsp")
-
 local keys = {
     -- Edition and navigation mappins
     ["["] = {
@@ -32,7 +31,7 @@ local keys = {
         x = "XML encode",
         y = "C string encode",
         -- Custom
-        d = { lsp.goto_prev_diagnostic, "Previous diagnostic" },
+        d = { vim.diagnostic.goto_prev, "Previous diagnostic" }
     },
     ["]"] = {
         name = "Next",
@@ -62,7 +61,7 @@ local keys = {
         x = "XML decode",
         y = "C string decode",
         -- Custom
-        d = { lsp.goto_next_diagnostic, "Next diagnostic" },
+        d = { vim.diagnostic.goto_next, "Next diagnostic" }
     },
 
     -- Option mappings
@@ -71,14 +70,13 @@ local keys = {
         b = "Light background",
         c = "Cursor line",
         d = "Diff",
-        f = { "<cmd>FormatEnable<CR>", "LSP Formatting" },
+        e = { "<cmd>lwindow<CR>", "Location list" },
+        f = { "<cmd>cwindow<CR>", "Quickfix list" },
         h = "Search high-lighting",
         i = "Case insensitive search",
         l = "List mode",
         n = "Line numbers",
         r = "Relative line numbers",
-        p = { "<cmd>lwindow<CR>", "Location list" },
-        q = { "<cmd>cwindow<CR>", "Quickfix list" },
         u = "Cursor column",
         v = "Virtual editing",
         w = "Text wrapping",
@@ -90,13 +88,12 @@ local keys = {
         b = "Light background",
         c = "Cursor line",
         d = "Diff",
-        f = { "<cmd>FormatDisable<CR>", "LSP Formatting" },
+        e = { "<cmd>lclose<CR>", "Location list" },
+        f = { "<cmd>cclose<CR>", "Quickfix list" },
         h = "Search high-lighting",
         i = "Case insensitive search",
         l = "List mode",
         n = "Line numbers",
-        p = { "<cmd>lclose<CR>", "Location list" },
-        q = { "<cmd>cclose<CR>", "Quickfix list" },
         r = "Relative line numbers",
         u = "Cursor column",
         v = "Virtual editing",
@@ -109,13 +106,12 @@ local keys = {
         b = "Light background",
         c = "Cursor line",
         d = "Diff",
-        f = { "<cmd>FormatToggle<CR>", "LSP Formatting" },
+        e = { "<Plug>(qf_loc_toggle)", "Location list" },
+        f = { "<Plug>(qf_qf_toggle)", "Quickfix list" },
         h = "Search high-lighting",
         i = "Case insensitive search",
         l = "List mode",
         n = "Line numbers",
-        p = { "<Plug>(qf_loc_toggle)", "Location list" },
-        q = { "<Plug>(qf_qf_toggle)", "Quickfix list" },
         r = "Relative line numbers",
         u = "Cursor column",
         v = "Virtual editing",
@@ -126,3 +122,4 @@ local keys = {
 }
 
 wk.register(keys)
+EOF

home/vim/default.nix

@@ -18,16 +18,12 @@ let
     ];
 in
 {
-  options.my.home.vim = with lib; {
-    enable = my.mkDisableOption "vim configuration";
+  options.my.home.vim = with lib.my; {
+    enable = mkDisableOption "vim configuration";
   };
 
   config.programs.neovim = lib.mkIf cfg.enable {
     enable = true;
-
-    # This is the best editor
-    defaultEditor = true;
-
     # All the aliases
     viAlias = true;
     vimAlias = true;
@@ -35,7 +31,7 @@ in
 
     plugins = with pkgs.vimPlugins; [
       # Theming
-      gruvbox-nvim # Nice dark theme
+      vim-gruvbox8 # Nice dark theme
       lualine-nvim # A lua-based status line
       lualine-lsp-progress # Show progress for LSP servers
 
@@ -54,35 +50,34 @@ in
       vim-beancount
       vim-jsonnet
       vim-nix
+      vim-pandoc
+      vim-pandoc-syntax
       vim-toml
 
       # General enhancements
       vim-qf # Better quick-fix list
-      nvim-osc52 # Send clipboard data through terminal escape for SSH
 
       # Other wrappers
       git-messenger-vim # A simple blame window
 
       # LSP and linting
       nvim-lspconfig # Easy LSP configuration
-      lsp-format-nvim # Simplified formatting configuration
       lsp_lines-nvim # Show diagnostics *over* regions
-      none-ls-nvim # LSP integration for linters and formatters
-      nvim-treesitter.withAllGrammars # Better highlighting
+      null-ls-nvim # LSP integration for linters and formatters
+      (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) # Better highlighting
       nvim-treesitter-textobjects # More textobjects
       nvim-ts-context-commentstring # Comment string in nested language blocks
       plenary-nvim # 'null-ls', 'telescope' dependency
 
       # Completion
-      luasnip # Snippet manager compatible with LSP
-      friendly-snippets # LSP snippets collection
       nvim-cmp # Completion engine
-      cmp-async-path # More responsive path completion
       cmp-buffer # Words from open buffers
       cmp-nvim-lsp # LSP suggestions
       cmp-nvim-lua # NeoVim lua API
+      cmp-path # Path name suggestions
       cmp-under-comparator # Sort items that start with '_' lower
-      cmp_luasnip # Snippet suggestions from LuaSnip
+      friendly-snippets # LSP snippets collection
+      luasnip # Snippet manager compatible with LSP
 
       # UX improvements
       dressing-nvim # Integrate native UI hooks with Telescope etc...
@@ -105,7 +100,7 @@ in
       nixpkgs-fmt
 
       # Shell
-      nodePackages.bash-language-server
+      shellcheck
       shfmt
     ];
   };

home/vim/ftdetect/automake.vim

@@ -0,0 +1,2 @@
+" Use Automake filetype for `local.am` files, explicit `set` to force override
+au BufNewFile,BufRead local.am set filetype=automake

home/vim/ftdetect/tiger.vim

@@ -0,0 +1,3 @@
+" Use Tiger filetype for programs and header files
+au BufNewFile,BufRead *.tig setfiletype tiger
+au BufNewFile,BufRead *.tih setfiletype tiger

home/vim/ftdetect/tikz.vim

@@ -0,0 +1,2 @@
+" Use LaTeX filetype for TikZ files
+au BufNewFile,BufRead *.tikz setfiletype tex

home/vim/init.vim

@@ -66,11 +66,6 @@ set list
 " Show a tab as an arrow, trailing spaces as ¤, non-breaking spaces as dots
 set listchars=tab:>─,trail:·,nbsp:¤
 
-" Use patience diff
-set diffopt+=algorithm:patience
-" Align similar lines in each hunk
-set diffopt+=linematch:50
-
 " Don't redraw when executing macros
 set lazyredraw
 
@@ -80,33 +75,17 @@ set timeoutlen=500
 " Timeout quickly for CursorHold events (and also swap file)
 set updatetime=250
 
-" Disable all mouse integrations
-set mouse=
-
 " Set dark mode by default
 set background=dark
 
+" Include plug-in integration
+let g:gruvbox_plugin_hi_groups=1
+" Include filetype integration
+let g:gruvbox_filetype_hi_groups=1
 " 24 bit colors
 set termguicolors
-" Setup some overrides for gruvbox
-lua << EOF
-local gruvbox = require("gruvbox")
-local colors = gruvbox.palette
-
-gruvbox.setup({
-    overrides = {
-        -- Only URLs should be underlined
-        ["@string.special.path"] = { link = "GruvboxOrange" },
-        -- Revert back to the better diff highlighting
-        DiffAdd = { fg = colors.green, bg = "NONE" },
-        DiffChange = { fg = colors.aqua, bg = "NONE" },
-        DiffDelete = { fg = colors.red, bg = "NONE" },
-        DiffText = { fg = colors.yellow, bg = colors.bg0 },
-    }
-})
-EOF
 " Use my preferred colorscheme
-colorscheme gruvbox
+colorscheme gruvbox8
 " }}}
 
 " Search parameters {{{
@@ -119,10 +98,12 @@ set ignorecase
 set smartcase
 " }}}
 
-" Project-local settings {{{
+" Import settings when inside a git repository {{{
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Securely read `.nvim.lua` or `.nvimrc`.
-set exrc
+let git_settings=system("git config --get vim.settings")
+if strlen(git_settings)
+    exe "set" git_settings
+endif
 " }}}
 
 " vim: foldmethod=marker

home/vim/lua/ambroisie/lsp.lua

@@ -0,0 +1,84 @@
+local M = {}
+
+-- shared LSP configuration callback
+-- @param client native client configuration
+-- @param bufnr int? buffer number of the attched client
+M.on_attach = function(client, bufnr)
+    -- Diagnostics
+    vim.diagnostic.config({
+        -- Disable virtual test next to affected regions
+        virtual_text = false,
+        -- Show diagnostics signs
+        signs = true,
+        -- Underline offending regions
+        underline = true,
+        -- Do not bother me in the middle of insertion
+        update_in_insert = false,
+        -- Show highest severity first
+        severity_sort = true,
+    })
+
+    vim.cmd([[
+        augroup DiagnosticsHover
+            autocmd! * <buffer>
+            " Show diagnostics on "hover"
+            autocmd CursorHold,CursorHoldI <buffer> lua vim.diagnostic.open_float(nil, {focus=false, scope="cursor"})
+        augroup END
+    ]])
+
+    -- Format on save
+    if client.resolved_capabilities.document_formatting then
+        vim.cmd([[
+            augroup LspFormatting
+                autocmd! * <buffer>
+                autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_sync()
+            augroup END
+        ]])
+    end
+
+    -- Mappings
+    local wk = require("which-key")
+
+    local function list_workspace_folders()
+        local utils = require("ambroisie.utils")
+        utils.dump(vim.lsp.buf.list_workspace_folders())
+    end
+
+    local function show_line_diagnostics()
+        vim.diagnostic.open_float(nil, { scope="line" })
+    end
+
+    local function show_buffer_diagnostics()
+        vim.diagnostic.open_float(nil, { scope="buffer" })
+    end
+
+    local keys = {
+        K = { vim.lsp.buf.hover, "Show symbol information" },
+        ["<C-k>"] = { vim.lsp.buf.signature_help, "Show signature information" },
+        ["gd"] = { vim.lsp.buf.definition, "Go to definition" },
+        ["gD"] = { vim.lsp.buf.declaration, "Go to declaration" },
+        ["gi"] = { vim.lsp.buf.implementation, "Go to implementation" },
+        ["gr"] = { vim.lsp.buf.references, "List all references" },
+
+        ["<leader>c"] = {
+            name = "Code",
+            a = { vim.lsp.buf.code_action, "Code actions" },
+            d = { show_line_diagnostics, "Show line diagnostics" },
+            D = { show_buffer_diagnostics, "Show buffer diagnostics" },
+            r = { vim.lsp.buf.rename, "Rename symbol" },
+            s = { vim.lsp.buf.signature_help, "Show signature" },
+            t = { vim.lsp.buf.type_definition, "Go to type definition" },
+            w = {
+                name = "Workspace",
+                a = { vim.lsp.buf.add_workspace_folder, "Add folder to workspace" },
+                l = { list_workspace_folders, "List folders in workspace" },
+                r = { vim.lsp.buf.remove_workspace_folder, "Remove folder from workspace" },
+            },
+        },
+    }
+
+    wk.register(keys, { buffer = bufnr })
+end
+
+
+return M

home/vim/lua/ambroisie/utils.lua

@@ -0,0 +1,37 @@
+local M = {}
+
+-- pretty print lua object
+-- @param obj any object to pretty print
+M.dump = function(obj)
+    print(vim.inspect(obj))
+end
+
+--- checks if a given command is executable
+---@param cmd string? command to check
+---@return boolean executable
+M.is_executable = function(cmd)
+    return cmd and vim.fn.executable(cmd) == 1
+end
+
+--- return a function that checks if a given command is executable
+---@param cmd string? command to check
+---@return fun(cmd: string): boolean executable
+M.is_executable_condition = function(cmd)
+    return function() return M.is_executable(cmd) end
+end
+
+-- list all active LSP clients for current buffer
+-- @param bufnr int? buffer number
+-- @return table all active LSP client names
+M.list_lsp_clients = function(bufnr)
+    local clients = vim.lsp.buf_get_clients(bufnr)
+    local names = {}
+
+    for _, client in ipairs(clients) do
+        table.insert(names, client.name)
+    end
+
+    return names
+end
+
+return M

home/vim/plugin/abbreviations.vim

@@ -0,0 +1,5 @@
+" A few useful sets of abbreviations
+
+" A few things that are hard to write in ASCII
+abbreviate (R) ©
+abbreviate (TM) ™

home/vim/plugin/numbertoggle.vim

@@ -0,0 +1,13 @@
+" Idea for toggling taken from jeffkreeftmeijer
+
+" Show line numbers
+set number
+
+augroup numbertoggle
+    autocmd!
+    " Toggle numbers between relative and absolute when changing buffers
+    autocmd BufEnter,FocusGained,InsertLeave,WinEnter * if &nu | set rnu   | endif
+    autocmd BufLeave,FocusLost,InsertEnter,WinLeave   * if &nu | set nornu | endif
+    " Disable line numbers and relative line numbers in terminal
+    autocmd TermOpen * setlocal nonu nornu
+augroup END

home/vim/plugin/settings/completion.vim

@@ -1,6 +1,7 @@
--- Show completion menu in all cases, and don't select anything
-vim.opt.completeopt = { "menu", "menuone", "noselect" }
+" Show completion menu in all cases, and don't select anything
+set completeopt=menu,menuone,noselect
 
+lua << EOF
 local cmp = require("cmp")
 local cmp_under_comparator = require("cmp-under-comparator")
 local luasnip = require("luasnip")
@@ -28,7 +29,7 @@ cmp.setup({
         end,
         ["<C-n>"] = cmp.mapping(cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), { "i", "c" }),
         ["<C-p>"] = cmp.mapping(cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), { "i", "c" }),
-        ["<C-d>"] = cmp.mapping.scroll_docs(-5),
+        ["<C-d>"] = cmp.mapping.scroll_docs(-5), 
         ["<C-f>"] = cmp.mapping.scroll_docs(5),
         ["<C-y>"] = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = false }),
         ["<C-e>"] = cmp.mapping.abort(),
@@ -37,7 +38,7 @@ cmp.setup({
         entries = "native",
     },
     sources = {
-        { name = "async_path", priority_weight = 110 },
+        { name = "path", priority_weight = 110 },
         { name = "nvim_lsp", priority_weight = 100 },
         { name = "nvim_lua", priority_weight = 90 },
         { name = "luasnip", priority_weight = 80 },
@@ -60,3 +61,4 @@ cmp.setup({
         ghost_text = true,
     },
 })
+EOF

home/vim/plugin/settings/dressing.vim

@@ -1,6 +1,8 @@
+lua << EOF
 local dressing = require("dressing")
 
 dressing.setup({
     -- Use a relative prompt size
     prefer_width = 0.4,
 })
+EOF

home/vim/plugin/settings/fastfold.vim

@@ -0,0 +1,5 @@
+" Intercept all fold commands
+let g:fastfold_fold_command_suffixes=[
+  \     'x', 'X', 'a', 'A', 'o', 'O', 'c', 'C',
+  \     'r', 'R', 'm', 'M', 'i', 'n', 'N'
+  \ ]

home/vim/plugin/settings/git.vim

@@ -1,7 +1,11 @@
-local gitsigns = require("gitsigns")
+lua << EOF
+local gitsigns = require('gitsigns')
 local wk = require("which-key")
 
 gitsigns.setup({
+    -- I dislike the full-green sign column when this happens
+    attach_to_untracked = false,
+
     current_line_blame_opts = {
         -- Show the blame quickly
         delay = 100,
@@ -13,13 +17,13 @@ local keys = {
     ["[c"] = { "&diff ? '[c' : '<cmd>Gitsigns prev_hunk<CR>'", "Previous hunk/diff", expr = true },
     ["]c"] = { "&diff ? ']c' : '<cmd>Gitsigns next_hunk<CR>'", "Next hunk/diff", expr = true },
 
+
     -- Commands
     ["<leader>g"] = {
         name = "Git",
         -- Actions
         b = { gitsigns.toggle_current_line_blame, "Toggle blame virtual text" },
         d = { gitsigns.diffthis, "Diff buffer" },
-        -- stylua: ignore
         D = { function() gitsigns.diffthis("~") end, "Diff buffer against last commit" },
         g = { "<cmd>Git<CR>", "Git status" },
         h = { gitsigns.toggle_deleted, "Show deleted hunks" },
@@ -56,3 +60,4 @@ local visual = {
 wk.register(keys, { buffer = bufnr })
 wk.register(objects, { buffer = bufnr, mode = "o" })
 wk.register(visual, { buffer = bufnr, mode = "x" })
+EOF

home/vim/plugin/settings/lspconfig.vim

@@ -0,0 +1,41 @@
+lua << EOF
+local lspconfig = require("lspconfig")
+local lsp = require("ambroisie.lsp")
+local utils = require("ambroisie.utils")
+
+-- Inform servers we are able to do completion, snippets, etc...
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
+
+-- C/C++
+if utils.is_executable("clangd") then
+    lspconfig.clangd.setup({
+        capabilities = capabilities,
+        on_attach = lsp.on_attach,
+    })
+end
+
+-- Nix
+if utils.is_executable("rnix-lsp") then
+    lspconfig.rnix.setup({
+        capabilities = capabilities,
+        on_attach = lsp.on_attach,
+    })
+end
+
+-- Python
+if utils.is_executable("pyright") then
+    lspconfig.pyright.setup({
+        capabilities = capabilities,
+        on_attach = lsp.on_attach,
+    })
+end
+
+-- Rust
+if utils.is_executable("rust-analyzer") then
+    lspconfig.rust_analyzer.setup({
+        capabilities = capabilities,
+        on_attach = lsp.on_attach,
+    })
+end
+EOF

home/vim/plugin/settings/lualine.vim

@@ -1,3 +1,4 @@
+lua << EOF
 local lualine = require("lualine")
 local utils = require("ambroisie.utils")
 
@@ -10,7 +11,7 @@ local function list_spell_languages()
 end
 
 local function list_lsp_clients()
-    local client_names = utils.list_lsp_clients(0)
+    local client_names = utils.list_lsp_clients()
 
     if #client_names == 0 then
         return ""
@@ -59,3 +60,4 @@ lualine.setup({
         "quickfix",
     },
 })
+EOF

home/vim/plugin/settings/luasnip.vim

@@ -0,0 +1,3 @@
+lua << EOF
+require("luasnip.loaders.from_vscode").load()
+EOF

home/vim/plugin/settings/null-ls.vim

@@ -0,0 +1,125 @@
+lua << EOF
+local null_ls = require("null-ls")
+local lsp = require("ambroisie.lsp")
+local utils = require("ambroisie.utils")
+
+null_ls.setup({
+    on_attach = lsp.on_attach,
+})
+
+-- C, C++
+null_ls.register({
+    null_ls.builtins.formatting.clang_format.with({
+        -- Only used if available, but prefer clangd formatting if available
+        condition = function()
+            return utils.is_executable("clang-format") and not utils.is_executable("clangd")
+        end,
+    }),
+})
+
+-- Haskell
+null_ls.register({
+    null_ls.builtins.formatting.brittany.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("brittany"),
+    }),
+})
+
+-- Nix
+null_ls.register({
+    null_ls.builtins.formatting.nixpkgs_fmt.with({
+        -- Only used if available, but prefer rnix if available
+        condition = function()
+            return utils.is_executable("nixpkgs-fmt") and not utils.is_executable("rnix-lsp")
+        end,
+    }),
+})
+
+-- Python
+null_ls.register({
+    null_ls.builtins.diagnostics.flake8.with({
+        -- Only used if available, but prefer pflake8 if available
+        condition = function()
+            return utils.is_executable("flake8") and not utils.is_executable("pflake8")
+        end,
+    }),
+    null_ls.builtins.diagnostics.pyproject_flake8.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("pflake8"),
+    }),
+    null_ls.builtins.diagnostics.mypy.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("mypy"),
+    }),
+    null_ls.builtins.diagnostics.pylint.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("pylint"),
+    }),
+    null_ls.builtins.formatting.black.with({
+        extra_args = { "--fast" },
+        -- Only used if available
+        condition = utils.is_executable_condition("black"),
+    }),
+    null_ls.builtins.formatting.isort.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("isort"),
+    }),
+})
+
+
+-- Shell (non-POSIX)
+null_ls.register({
+    null_ls.builtins.code_actions.shellcheck.with({
+        -- Restrict to bash and zsh
+        filetypes = { "bash", "zsh" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shellcheck"),
+    }),
+    null_ls.builtins.diagnostics.shellcheck.with({
+        -- Show error code in message
+        diagnostics_format = "[#{c}] #{m}",
+        -- Require explicit empty string test, use bash dialect
+        extra_args = { "-s", "bash", "-o", "avoid-nullary-conditions" },
+        -- Restrict to bash and zsh
+        filetypes = { "bash", "zsh" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shellcheck"),
+    }),
+    null_ls.builtins.formatting.shfmt.with({
+        -- Indent with 4 spaces, simplify the code, indent switch cases,
+        -- add space after redirection, use bash dialect
+        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "bash" },
+        -- Restrict to bash and zsh
+        filetypes = { "bash", "zsh" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shfmt"),
+    }),
+})
+
+-- Shell (POSIX)
+null_ls.register({
+    null_ls.builtins.code_actions.shellcheck.with({
+    -- Restrict to POSIX sh
+        filetypes = { "sh" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shellcheck"),
+    }),
+    null_ls.builtins.diagnostics.shellcheck.with({
+        -- Show error code in message
+        diagnostics_format = "[#{c}] #{m}",
+        -- Require explicit empty string test
+        extra_args = { "-o", "avoid-nullary-conditions" },
+        -- Restrict to POSIX sh
+        filetypes = { "sh" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shellcheck"),
+    }),
+    null_ls.builtins.formatting.shfmt.with({
+        -- Indent with 4 spaces, simplify the code, indent switch cases,
+        -- add space after redirection, use POSIX
+        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "posix" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shfmt"),
+    }),
+})
+EOF

home/vim/plugin/settings/pandoc.vim

@@ -0,0 +1,20 @@
+" Which code-block languages should I expect to be high-lighted.
+let g:pandoc#syntax#codeblocks#embeds#langs=[
+  \     "bash=sh",
+  \     "c",
+  \     "cpp",
+  \     "go",
+  \     "haskell",
+  \     "python",
+  \     "rust",
+  \     "sh",
+  \     "vim",
+  \     "yaml",
+  \     "tex",
+  \     "toml",
+  \     "perl",
+  \     "json",
+  \     "latex=tex",
+  \     "make",
+  \     "makefile=make",
+  \ ]

home/vim/plugin/settings/surround.vim

@@ -1,3 +1,5 @@
+lua << EOF
 require("nvim-surround").setup({
     -- No configuration at the moment
 })
+EOF

home/vim/plugin/settings/telescope.vim

@@ -1,3 +1,4 @@
+lua << EOF
 local telescope = require("telescope")
 
 telescope.setup({
@@ -7,8 +8,8 @@ telescope.setup({
                 ["<C-h>"] = "which_key",
                 -- I want the normal readline mappings rather than scrolling
                 ["<C-u>"] = false,
-            },
-        },
+            }
+        }
     },
     extensions = {
         fzf = {
@@ -22,3 +23,4 @@ telescope.setup({
 
 telescope.load_extension("fzf")
 telescope.load_extension("lsp_handlers")
+EOF

home/vim/plugin/settings/tree-sitter.vim

@@ -1,3 +1,4 @@
+lua << EOF
 local ts_config = require("nvim-treesitter.configs")
 ts_config.setup({
     highlight = {
@@ -8,6 +9,9 @@ ts_config.setup({
     indent = {
         enable = true,
     },
+    context_commentstring = {
+        enable = true,
+    },
     textobjects = {
         select = {
             enable = true,
@@ -51,3 +55,4 @@ ts_config.setup({
         },
     },
 })
+EOF

home/vim/plugin/settings/which-key.vim

@@ -1,2 +1,4 @@
+lua << EOF
 local wk = require("which-key")
 wk.setup()
+EOF

home/vim/plugin/signtoggle.vim

@@ -0,0 +1,8 @@
+augroup signtoggle
+    autocmd!
+    " Only show the sign column for the current focused buffer
+    autocmd BufEnter,FocusGained,WinEnter * set signcolumn=yes
+    autocmd BufLeave,FocusLost,WinLeave   * set signcolumn=no
+    " Disable the sign column in terminal
+    autocmd TermOpen * setlocal signcolumn=no
+augroup END

home/wm/cursor/default.nix

@@ -8,7 +8,7 @@ in
 {
   config = lib.mkIf cfg.enable {
     home.pointerCursor = {
-      package = pkgs.vimix-cursors;
+      package = pkgs.ambroisie.vimix-cursors;
       name = "Vimix-cursors";
 
       x11 = {