WIP

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

.drone.yml

@@ -1,24 +1,27 @@
+---
 kind: pipeline
-name: check config
+type: exec
+name: NixOS config check
 
 steps:
-  - name: format check
-    image: nixos/nix
+- name: nix flake check
   commands:
-      - nix-shell -p nixpkgs-fmt --run 'nixpkgs-fmt . --check'
+  - nix flake check
 
-  - name: notify
-    image: plugins/matrix
-    settings:
-      homeserver:
+- name: notifiy
+  commands:
+  - nix run .#matrix-notifier
+  environment:
+    ADDRESS:
       from_secret: matrix_homeserver
-      roomid:
+    ROOM:
       from_secret: matrix_roomid
-      username:
+    USER:
       from_secret: matrix_username
-      password:
+    PASS:
       from_secret: matrix_password
-      trigger:
+  when:
     status:
       - failure
       - success
+...

.envrc

@@ -6,3 +6,4 @@ use_flake() {
 
 ulimit -s unlimited # Bypass current bug in `nix` flakes evaluation
 use flake
+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

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

@@ -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/id_ed25519.pub" 644
+    get_doc "SysAdmin/SSH" "agenix-private" "$HOME/.ssh/id_ed25519" 600
 }
 
 get_pgp() {
@@ -78,7 +80,7 @@ get_pgp() {
 }
 
 get_creds() {
-    BW_SESSION="$(bw login --raw)"
+    BW_SESSION="$(bw login --raw || bw unlock --raw)"
     export BW_SESSION
 
     get_ssh

flake.lock

@@ -1,12 +1,64 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1662046976,
+        "narHash": "sha256-BrTReGRhkVm/Kmmf4zQrL+oYWy0sds/BDBgXNX1CL3c=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "9f136ecfa5bf954538aed3245e4408cf87c85097",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "ref": "main",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
+    "devshell": {
+      "locked": {
+        "lastModified": 1642188268,
+        "narHash": "sha256-DNz4xScpXIn7rSDohdayBpPR9H9OWCMDOgTYegX081k=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "696acc29668b644df1740b69e1601119bf6da83b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "futils": {
       "locked": {
-        "lastModified": 1619345332,
-        "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -20,14 +72,17 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
+        ],
+        "utils": [
+          "futils"
         ]
       },
       "locked": {
-        "lastModified": 1619558193,
-        "narHash": "sha256-DljP5/9EX0eXEPhzCUFqFEHkkcFuXJBx1PTgcv0OgyM=",
+        "lastModified": 1661824092,
+        "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "18ad12d52b8cebbb57013865eec2be5125de050a",
+        "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6",
         "type": "github"
       },
       "original": {
@@ -37,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": 1619464443,
-        "narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=",
+        "lastModified": 1662019588,
+        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17",
+        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
         "type": "github"
       },
       "original": {
@@ -55,11 +149,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1619628114,
-        "narHash": "sha256-s3pQyvMfXVmbQOX224yOWQf6zi8406sShFF4u17LVQ0=",
+        "lastModified": 1662103084,
+        "narHash": "sha256-zE6ftit1nllgrXJ3hnt/h/Ev+JsjkJQLKAgO5M31R5s=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0615e756dc14986c4968fa478c0bd080d621cb2b",
+        "rev": "65fef905eaad9a585a3841103ed3f45608a50c56",
         "type": "github"
       },
       "original": {
@@ -69,12 +163,39 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-utils": [
+          "futils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1660830093,
+        "narHash": "sha256-HUhx3a82C7bgp2REdGFeHJdhEAzMGCk3V8xIvfBqg1I=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "8cb8ea5f1c7bc2984f460587fddd5f2e558f6eb8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "master",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "agenix": "agenix",
         "futils": "futils",
         "home-manager": "home-manager",
+        "matrix-appservices": "matrix-appservices",
         "nixpkgs": "nixpkgs",
-        "nur": "nur"
+        "nur": "nur",
+        "pre-commit-hooks": "pre-commit-hooks"
       }
     }
   },

flake.nix

@@ -1,6 +1,16 @@
 {
   description = "NixOS configuration with flakes";
   inputs = {
+    agenix = {
+      type = "github";
+      owner = "ryantm";
+      repo = "agenix";
+      ref = "main";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+
     futils = {
       type = "github";
       owner = "numtide";
@@ -15,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";
       };
     };
 
@@ -31,11 +55,40 @@
       repo = "NUR";
       ref = "master";
     };
+
+    pre-commit-hooks = {
+      type = "github";
+      owner = "cachix";
+      repo = "pre-commit-hooks.nix";
+      ref = "master";
+      inputs = {
+        flake-utils.follows = "futils";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
   };
 
-  outputs = { self, futils, home-manager, nixpkgs, nur } @ inputs:
+  outputs =
+    inputs @
+    { self
+    , agenix
+    , futils
+    , home-manager
+    , matrix-appservices
+    , nixpkgs
+    , nur
+    , pre-commit-hooks
+    }:
     let
-      inherit (futils.lib) eachDefaultSystem;
+      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; };
@@ -51,27 +104,26 @@
             nur.overlay
           ];
         }
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.users.ambroisie = import ./home;
-          # Nix Flakes compatibility
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-        }
+        # Include generic settings
+        ./modules
+        # Include bundles of settings
+        ./profiles
       ];
 
       buildHost = name: system: lib.nixosSystem {
         inherit system;
         modules = defaultModules ++ [
-          (./. + "/${name}.nix")
+          (./. + "/machines/${name}")
         ];
         specialArgs = {
           # Use my extended lib in NixOS configuration
           inherit lib;
+          # Inject inputs to use them in global registry
+          inherit inputs;
         };
       };
     in
-    eachDefaultSystem
+    eachMySystem
       (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
@@ -79,30 +131,56 @@
       rec {
         apps = {
           diff-flake = futils.lib.mkApp { drv = packages.diff-flake; };
+          default = apps.diff-flake;
         };
 
-          defaultApp = apps.diff-flake;
+        checks = {
+          pre-commit = pre-commit-hooks.lib.${system}.run {
+            src = ./.;
 
-          devShell = pkgs.mkShell {
+            hooks = {
+              nixpkgs-fmt = {
+                enable = true;
+              };
+
+              shellcheck = {
+                enable = true;
+              };
+            };
+          };
+        };
+
+        devShells = {
+          default = pkgs.mkShell {
             name = "NixOS-config";
-            buildInputs = with pkgs; [
-              git-crypt
+
+            nativeBuildInputs = with pkgs; [
               gitAndTools.pre-commit
-              gnupg
               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;
       }) // {
-      overlay = self.overlays.pkgs;
-
-      overlays = {
+      overlays = import ./overlays // {
         lib = final: prev: { inherit lib; };
-        pkgs = final: prev: { ambroisie = import ./pkgs { pkgs = prev; }; };
+        pkgs = final: prev: {
+          ambroisie = prev.recurseIntoAttrs (import ./pkgs { pkgs = prev; });
+        };
       };
 
       nixosConfigurations = lib.mapAttrs buildHost {
+        aramis = "x86_64-linux";
         porthos = "x86_64-linux";
       };
     };

home/bat/default.nix

@@ -10,6 +10,8 @@ in
   config.programs.bat = lib.mkIf cfg.enable {
     enable = true;
     config = {
+      theme = "gruvbox-dark";
+
       pager = with config.home.sessionVariables; "${PAGER} ${LESS}";
     };
   };

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/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,38 @@
 { ... }:
 {
   imports = [
-    ./bat.nix
-    ./direnv.nix
-    ./documentation.nix
+    ./bat
+    ./bluetooth
+    ./comma
+    ./direnv
+    ./discord
+    ./documentation
+    ./feh
+    ./firefox
+    ./flameshot
+    ./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-index
+    ./nm-applet
+    ./packages
+    ./pager
+    ./power-alert
+    ./ssh
+    ./terminal
+    ./tmux
+    ./udiskie
     ./vim
-    ./xdg.nix
+    ./wm
+    ./x
+    ./xdg
+    ./zathura
     ./zsh
   ];
 
@@ -23,4 +41,7 @@
 
   # Who am I?
   home.username = "ambroisie";
+
+  # Start services automatically
+  systemd.user.startServices = "sd-switch";
 }

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/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,84 @@
+{ 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.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
+      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

@@ -0,0 +1,78 @@
+" 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
+" FIXME: make it follow my prefered terminal
+set editorcmd termite --class tridactyl_editor -e 'vim %f'
+" }}}
+
+" 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 [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
+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/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,7 @@ compile_commands.json
 # Swap and backup files
 *~
 ~.swp
+
+# Direnv files
+.envrc
+.direnv/

home/git/default.nix

@@ -1,34 +1,72 @@
 { 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";
   };
 
+  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 {
     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;
 
     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' ')"'';
     };
 
     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 +100,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,14 +120,8 @@ 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";
+      merge = {
+        conflictStyle = "zdiff3";
       };
 
       pull = {
@@ -114,11 +139,33 @@ in
         autoSquash = true;
         autoStash = true;
       };
+
+      url = {
+        "git@gitea.belanyi.fr:" = {
+          insteadOf = "https://gitea.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";
+          };
+        };
+      }
     ];
 
     ignores =

home/git/epita.config

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

home/gpg/default.nix

@@ -3,8 +3,15 @@ let
   cfg = config.my.home.gpg;
 in
 {
-  options.my.home.gpg = with lib.my; {
-    enable = mkDisableOption "gpg configuration";
+  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 {
@@ -15,7 +22,7 @@ in
     services.gpg-agent = {
       enable = true;
       enableSshSupport = true; # One agent to rule them all
-      pinentryFlavor = "tty";
+      pinentryFlavor = cfg.pinentry;
       extraConfig = ''
         allow-loopback-pinentry
       '';

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/mail/accounts/default.nix

@@ -0,0 +1,91 @@
+{ 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 [ "${pkgs.ambroisie.bw-pass}/bin/bw-pass" "Mail" passName ];
+
+    address = mkMailAddress address domain;
+    aliases = builtins.map (lib.flip mkMailAddress domain) aliases;
+
+    inherit primary;
+
+    himalaya = {
+      enable = cfg.himalaya.enable;
+    };
+
+    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 = mkRelatedOption "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 = "${pkgs.libnotify}/bin/notify-send";
+        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.my; {
+    enable = mkDisableOption "nix-index configuration";
+  };
+
+  config.programs.nix-index = lib.mkIf cfg.enable {
+    enable = true;
+  };
+}

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,27 @@
+{ 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
+    termite.terminfo
+  ] ++ 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,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/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 +0,0 @@
-{ lib, ... }:
-
-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;
-  };
-
-  config.my.secrets = {
-    # Home-manager secrets go here
-  };
-}

home/ssh/default.nix

@@ -7,7 +7,7 @@ in
     enable = mkDisableOption "ssh configuration";
   };
 
-  config.programs.ssh = {
+  config.programs.ssh = lib.mkIf cfg.enable {
     enable = true;
 
     matchBlocks = {
@@ -40,6 +40,12 @@ in
         identityFile = "~/.ssh/shared_rsa";
         user = "ambroisie";
       };
+
+      work = {
+        hostname = "workspaces.dgexsol.fr";
+        identityFile = "~/.ssh/shared_rsa";
+        user = "bruno_belanyi";
+      };
     };
 
     extraConfig = ''

home/terminal/default.nix

@@ -0,0 +1,61 @@
+{ 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 = [
+    ./termite
+  ];
+
+  options.my.home = with lib; {
+    terminal = {
+      program = mkOption {
+        type = with types; nullOr (enum [ "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/default.nix

@@ -1,6 +1,7 @@
 { 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; {
@@ -13,7 +14,7 @@ in
     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
+    historyLimit = 50000; # Bigger buffer
     terminal = "tmux-256color"; # I want accurate termcap info
 
     plugins = with pkgs.tmuxPlugins; [
@@ -23,8 +24,16 @@ in
       pain-control
       # Better session management
       sessionist
+      (lib.optionalAttrs hasGUI {
         # X clipboard integration
-      yank
+        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;
@@ -41,7 +50,13 @@ in
     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
+      ${
+        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/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/pandoc.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/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.vim

@@ -0,0 +1,12 @@
+lua << EOF
+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" })
+EOF

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>

home/vim/after/plugin/mappings/fzf.vim

@@ -1,38 +0,0 @@
-" Only git-tracked files, Vim needs to be in a Git repository
-nnoremap <Leader>fg :GFiles<CR>
-
-" All files
-nnoremap <Leader>ff :Files<CR>
-
-" Currently open buffers
-nnoremap <Leader>fb :Buffers<CR>
-
-" Buffer history
-nnoremap <Leader>fh :History<CR>
-
-" Tags in buffer
-nnoremap <Leader>ft :BTags<CR>
-
-" Tags in all project files
-nnoremap <Leader>fT :Tags<CR>
-
-" Snippets for the current fileytpe (using Ultisnips)
-nnoremap <Leader>fs :Snippets<CR>
-
-" All available commands
-nnoremap <Leader>f: :Commands<CR>
-
-" All commits (using fugitive)
-nnoremap <Leader>fc :Commits<CR>
-
-" All commits for the current buffer (using fugitive)
-nnoremap <Leader>fC :BCommits<CR>
-
-" Select normal mode mapping by searching for its name
-nmap <Leader><Tab> <Plug>(fzf-maps-n)
-
-" Select visual mode mapping by searching for its name
-xmap <Leader><Tab> <Plug>(fzf-maps-x)
-
-" Select operator pending mode mapping by searching for its name
-omap <Leader><Tab> <Plug>(fzf-maps-o)

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

@@ -1,8 +1,9 @@
-" Yank until the end of line with Y, to be more consistent with D and C
-nnoremap Y y$
+lua << EOF
+local wk = require("which-key")
 
-" Run make silently, then skip the 'Press ENTER to continue'
-noremap <Leader>m :silent! :make! \| :redraw!<CR>
+local keys = {
+    ["<leader>"] = { "<cmd>nohls<CR>", "Clear search highlight" },
+}
 
-" Remove search-highlighting
-noremap <Leader><Leader> :nohls<CR>
+wk.register(keys, { prefix = "<leader>" })
+EOF

home/vim/after/plugin/mappings/qf.vim

@@ -1,11 +0,0 @@
-" Next and previous in quick-fix list
-nmap <Leader>fn <Plug>(qf_qf_next)
-nmap <Leader>fp <Plug>(qf_qf_previous)
-
-" Next and previous in location list
-nmap <Leader>ln <Plug>(qf_loc_next)
-nmap <Leader>lp <Plug>(qf_loc_previous)
-
-" Toggle quick-fix and location lists
-nmap <Leader>tf <Plug>(qf_qf_toggle)
-nmap <Leader>tl <Plug>(qf_loc_toggle)

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

@@ -0,0 +1,18 @@
+lua << EOF
+local wk = require("which-key")
+local telescope_builtin = require("telescope.builtin")
+
+local keys = {
+    f = {
+        name = "Fuzzy finder",
+        b = { telescope_builtin.buffers, "Open buffers" },
+        f = { telescope_builtin.git_files, "Git tracked files" },
+        F = { telescope_builtin.find_files, "Files" },
+        g = { telescope_builtin.live_grep, "Grep string" },
+        G = { telescope_builtin.grep_string, "Grep string under cursor" },
+    },
+}
+
+wk.register(keys, { prefix = "<leader>" })
+EOF
+

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

@@ -0,0 +1,32 @@
+lua << EOF
+local wk = require("which-key")
+
+local motions = {
+    ["]m"] = "Next method start",
+    ["]M"] = "Next method end",
+    ["]S"] = "Next statement start",
+    ["]]"] = "Next class start",
+    ["]["] = "Next class end",
+    ["[m"] = "Previous method start",
+    ["[M"] = "Previous method end",
+    ["[S"] = "Previous statement start",
+    ["[["] = "Previous class start",
+    ["[]"] = "Previous class end",
+}
+
+local objects = {
+    ["aa"] = "a parameter",
+    ["ia"] = "inner parameter",
+    ["ab"] = "a block",
+    ["ib"] = "inner block",
+    ["ac"] = "a class",
+    ["ic"] = "inner class",
+    ["af"] = "a function",
+    ["if"] = "inner function",
+    ["ak"] = "a comment",
+    ["aS"] = "a statement",
+}
+
+wk.register(motions, { mode = "n" })
+wk.register(objects, { mode = "o" })
+EOF

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

@@ -1,7 +1,125 @@
-" Better fr layout mappings for vim-unimpaired and other '[' and ']' commands
-nmap ( [
-nmap ) ]
-omap ( [
-omap ) ]
-xmap ( [
-xmap ) ]
+lua << EOF
+local wk = require("which-key")
+
+local keys = {
+    -- Edition and navigation mappins
+    ["["] = {
+        name = "Previous",
+        ["<space>"] = "Insert blank line above",
+        ["<C-L>"] = "Previous location list file",
+        ["<C-Q>"] = "Previous quickfix list file",
+        ["<C-T>"] = "Previous tag in preview window",
+        a = "Previous argument",
+        A = "First argument",
+        b = "Previous buffer",
+        B = "First buffer",
+        e = "Exchange previous line",
+        f = "Previous file in directory",
+        l = "Previous location list entry",
+        L = "First Location list entry",
+        n = "Previous conflict marker/diff hunk",
+        p = "Paste line above",
+        P = "Paste line above",
+        q = "Previous quickfix list entry",
+        Q = "First quickfix list entry",
+        t = "Previous matching tag",
+        T = "First matching tag",
+        z = "Previous fold",
+        -- Encoding
+        C = "C string encode",
+        u = "URL encode",
+        x = "XML encode",
+        y = "C string encode",
+        -- Custom
+        d = { vim.diagnostic.goto_prev, "Previous diagnostic" }
+    },
+    ["]"] = {
+        name = "Next",
+        ["<space>"] = "Insert blank line below",
+        ["<C-L>"] = "Next location list file",
+        ["<C-Q>"] = "Next quickfix list file",
+        ["<C-T>"] = "Next tag in preview window",
+        a = "Next argument",
+        A = "Last argument",
+        b = "Next buffer",
+        B = "Last buffer",
+        e = "Exchange next line",
+        f = "Next file in directory",
+        l = "Next location list entry",
+        L = "Last Location list entry",
+        n = "Next conflict marker/diff hunk",
+        p = "Paste line below",
+        P = "Paste line below",
+        q = "Next quickfix list entry",
+        Q = "Last quickfix list entry",
+        t = "Next matching tag",
+        T = "Last matching tag",
+        z = "Next fold",
+        -- Decoding
+        C = "C string decode",
+        u = "URL decode",
+        x = "XML decode",
+        y = "C string decode",
+        -- Custom
+        d = { vim.diagnostic.goto_next, "Next diagnostic" }
+    },
+
+    -- Option mappings
+    ["[o"] = {
+        name = "Enable option",
+        b = "Light background",
+        c = "Cursor line",
+        d = "Diff",
+        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",
+        u = "Cursor column",
+        v = "Virtual editing",
+        w = "Text wrapping",
+        x = "Cursor line and column",
+        z = "Spell checking",
+    },
+    ["]o"] = {
+        name = "Option off",
+        b = "Light background",
+        c = "Cursor line",
+        d = "Diff",
+        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",
+        r = "Relative line numbers",
+        u = "Cursor column",
+        v = "Virtual editing",
+        w = "Text wrapping",
+        x = "Cursor line and column",
+        z = "Spell checking",
+    },
+    ["yo"] = {
+        name = "Option toggle",
+        b = "Light background",
+        c = "Cursor line",
+        d = "Diff",
+        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",
+        r = "Relative line numbers",
+        u = "Cursor column",
+        v = "Virtual editing",
+        w = "Text wrapping",
+        x = "Cursor line and column",
+        z = "Spell checking",
+    },
+}
+
+wk.register(keys)
+EOF

home/vim/autoload/quickfixed.vim

@@ -1,68 +0,0 @@
-" Taken from the Vimways article
-
-function! s:isLocation()
-  " Get dictionary of properties of the current window
-  let wininfo = filter(getwininfo(), {i,v -> v.winnr == winnr()})[0]
-  return wininfo.loclist
-endfunction
-
-function! s:length()
-  " Get the size of the current quickfix/location list
-  return len(s:isLocation() ? getloclist(0) : getqflist())
-endfunction
-
-function! s:getProperty(key, ...)
-  " getqflist() and getloclist() expect a dictionary argument
-  " If a 2nd argument has been passed in, use it as the value, else 0
-  let l:what = {a:key : a:0 ? a:1 : 0}
-  let l:listdict = s:isLocation() ? getloclist(0, l:what) : getqflist(l:what)
-  return get(l:listdict, a:key)
-endfunction
-
-function! s:isFirst()
-  return s:getProperty('nr') <= 1
-endfunction
-
-function! s:isLast()
-  return s:getProperty('nr') == s:getProperty('nr', '$')
-endfunction
-
-function! s:history(goNewer)
-  " Build the command: one of colder/cnewer/lolder/lnewer
-  let l:cmd = (s:isLocation() ? 'l' : 'c') . (a:goNewer ? 'newer' : 'older')
-
-  " Apply the cmd repeatedly until we hit a non-empty list, or first/last list
-  " is reached
-  while 1
-    if (a:goNewer && s:isLast()) || (!a:goNewer && s:isFirst()) | break | endif
-    " Run the command. Use :silent to suppress message-history output.
-    " Note that the :try wrapper is no longer necessary
-    silent execute l:cmd
-    if s:length() | break | endif
-  endwhile
-
-  " Echo a description of the new quickfix / location list.
-  " And make it look like a rainbow.
-  let l:nr = s:getProperty('nr')
-  let l:last = s:getProperty('nr', '$')
-  echohl MoreMsg | echon '('
-  echohl Identifier | echon l:nr
-  if l:last > 1
-    echohl LineNr | echon ' of '
-    echohl Identifier | echon l:last
-  endif
-  echohl MoreMsg | echon ') '
-  echohl MoreMsg | echon '['
-  echohl Identifier | echon s:length()
-  echohl MoreMsg | echon '] '
-  echohl Normal | echon s:getProperty('title')
-  echohl None
-endfunction
-
-function! quickfixed#older()
-  call s:history(0)
-endfunction
-
-function! quickfixed#newer()
-  call s:history(1)
-endfunction

home/vim/default.nix

@@ -13,6 +13,7 @@ let
       "after"
       "autoload"
       "ftdetect"
+      "lua"
       "plugin"
     ];
 in
@@ -30,11 +31,9 @@ in
 
     plugins = with pkgs.vimPlugins; [
       # Theming
-      lightline-vim # Fancy status bar
-      {
-        plugin = onedark-vim; # Nice dark theme
-        optional = true; # Needs to be `packadd`-ed manually...
-      }
+      vim-gruvbox8 # Nice dark theme
+      lualine-nvim # A lua-based status line
+      lualine-lsp-progress # Show progress for LSP servers
 
       # tpope essentials
       vim-commentary # Easy comments
@@ -43,7 +42,6 @@ in
       vim-git # Sane git syntax files
       vim-repeat # Enanche '.' for plugins
       vim-rsi # Readline mappings
-      vim-surround # Deal with pairs
       vim-unimpaired # Some ex command mappings
       vim-vinegar # Better netrw
 
@@ -57,20 +55,54 @@ in
       vim-toml
 
       # General enhancements
-      fastfold # Better folding
       vim-qf # Better quick-fix list
 
       # Other wrappers
-      fzfWrapper # The vim plugin inside the 'fzf' package
-      fzf-vim # Fuzzy commands
       git-messenger-vim # A simple blame window
 
       # LSP and linting
-      ale # Asynchronous Linting Engine
-      lightline-ale # Status bar integration
+      nvim-lspconfig # Easy LSP configuration
+      lsp_lines-nvim # Show diagnostics *over* regions
+      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
+      nvim-cmp # Completion engine
+      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
+      friendly-snippets # LSP snippets collection
+      luasnip # Snippet manager compatible with LSP
+
+      # UX improvements
+      dressing-nvim # Integrate native UI hooks with Telescope etc...
+      gitsigns-nvim # Fast git UI integration
+      nvim-surround # Deal with pairs, now in Lua
+      telescope-fzf-native-nvim # Use 'fzf' fuzzy matching algorithm
+      telescope-lsp-handlers-nvim # Use 'telescope' for various LSP actions
+      telescope-nvim # Fuzzy finder interface
+      which-key-nvim # Show available mappings
     ];
 
     extraConfig = builtins.readFile ./init.vim;
+
+    # Linters, formatters, etc...
+    extraPackages = with pkgs; [
+      # C/C++
+      clang-tools
+
+      # Nix
+      nixpkgs-fmt
+
+      # Shell
+      shellcheck
+      shfmt
+    ];
   };
 
   config.xdg.configFile = lib.mkIf cfg.enable configFiles;

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/init.vim

@@ -13,6 +13,13 @@ set wildmenu
 " Enable syntax high-lighting and file-type specific plugins
 syntax on
 filetype plugin indent on
+
+" Map leader to space (needs the noremap trick to avoid moving the cursor)
+nnoremap <Space> <Nop>
+let mapleader=" "
+
+" Map localleader to '!' (if I want to filter text, I use visual mode)
+let maplocalleader="!"
 " }}}
 
 " Indentation configuration {{{
@@ -65,13 +72,20 @@ set lazyredraw
 " Timeout quickly on shortcuts, I can't wait two seconds to delete in visual
 set timeoutlen=500
 
+" Timeout quickly for CursorHold events (and also swap file)
+set updatetime=250
+
 " Set dark mode by default
 set background=dark
 
-" Load it manually because of autoload functions...
-packadd! onedark-vim
-" Use onedark
-colorscheme onedark
+" 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
+" Use my preferred colorscheme
+colorscheme gruvbox8
 " }}}
 
 " Search parameters {{{

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/mappings/leader.vim

@@ -1,6 +0,0 @@
-" Map leader to space (needs the noremap trick to avoid moving the cursor)
-nnoremap <Space> <Nop>
-let mapleader=" "
-
-" Map localleader to '!' (if I want to filter text, I use visual mode)
-let maplocalleader="!"

home/vim/plugin/settings/ale.vim

@@ -1,24 +0,0 @@
-" Always display the sign column to avoid moving the buffer all the time
-let g:ale_sign_column_always=1
-
-" Change the way ALE display messages
-let g:ale_echo_msg_info_str='I'
-let g:ale_echo_msg_warning_str='W'
-let g:ale_echo_msg_error_str='E'
-
-" The message displayed in the command line area
-let g:ale_echo_msg_format='[%linter%][%severity%]%(code):% %s'
-
-" The message displayed in the location list
-let g:ale_loclist_msg_format='[%linter%]%(code):% %s'
-
-" Don't lint every time I change the buffer
-let g:ale_lint_on_text_changed=0
-" Don't lint on leaving insert mode
-let g:ale_lint_on_insert_leave=0
-" Don't lint on entering a buffer
-let g:ale_lint_on_enter=0
-" Do lint on save
-let g:ale_lint_on_save=1
-" Lint on changing the filetype
-let g:ale_lint_on_filetype_changed=1

home/vim/plugin/settings/completion.vim

@@ -0,0 +1,64 @@
+" 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")
+
+cmp.setup({
+    snippet = {
+        expand = function(args)
+            luasnip.lsp_expand(args.body)
+        end,
+    },
+    mapping = {
+        ["<Tab>"] = function(fallback)
+            if luasnip.expand_or_jumpable() then
+                luasnip.expand_or_jump()
+            else
+                fallback()
+            end
+        end,
+        ["<S-Tab>"] = function(fallback)
+            if luasnip.jumpable(-1) then
+                luasnip.jump(-1)
+            else
+                fallback()
+            end
+        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-f>"] = cmp.mapping.scroll_docs(5),
+        ["<C-y>"] = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = false }),
+        ["<C-e>"] = cmp.mapping.abort(),
+    },
+    view = {
+        entries = "native",
+    },
+    sources = {
+        { name = "path", priority_weight = 110 },
+        { name = "nvim_lsp", priority_weight = 100 },
+        { name = "nvim_lua", priority_weight = 90 },
+        { name = "luasnip", priority_weight = 80 },
+        { name = "buffer", max_item_count = 5, priority_weight = 50 },
+    },
+    sorting = {
+        priority_weight = 100,
+        comparators = {
+            cmp.config.compare.offset,
+            cmp.config.compare.exact,
+            cmp.config.compare.score,
+            cmp_under_comparator.under,
+            cmp.config.compare.kind,
+            cmp.config.compare.sort_text,
+            cmp.config.compare.length,
+            cmp.config.compare.order,
+        },
+    },
+    experimental = {
+        ghost_text = true,
+    },
+})
+EOF

home/vim/plugin/settings/dressing.vim

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

home/vim/plugin/settings/fzf.vim

@@ -1,8 +0,0 @@
-" Use a floating window when availble
-if has('nvim-0.4.0') || has("patch-8.2.0191")
-    let g:fzf_layout = { 'window': {
-                \ 'width': 0.9,
-                \ 'height': 0.7,
-                \ 'highlight': 'Comment',
-                \ 'rounded': v:false } }
-endif

home/vim/plugin/settings/git.vim

@@ -0,0 +1,63 @@
+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,
+    },
+})
+
+local keys = {
+    -- Navigation
+    ["[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" },
+        D = { function() gitsigns.diffthis("~") end, "Diff buffer against last commit" },
+        g = { "<cmd>Git<CR>", "Git status" },
+        h = { gitsigns.toggle_deleted, "Show deleted hunks" },
+        L = { "<cmd>:sp<CR><C-w>T:Gllog --follow -- %:p<CR>", "Current buffer log" },
+        m = { "<Plug>(git-messenger)", "Current line blame" },
+        p = { gitsigns.preview_hunk, "Preview hunk" },
+        r = { gitsigns.reset_hunk, "Restore hunk" },
+        R = { gitsigns.reset_buffer, "Restore buffer" },
+        s = { gitsigns.stage_hunk, "Stage hunk" },
+        S = { gitsigns.stage_buffer, "Stage buffer" },
+        u = { gitsigns.undo_stage_hunk, "Undo stage hunk" },
+        ["["] = { gitsigns.prev_hunk, "Previous hunk" },
+        ["]"] = { gitsigns.next_hunk, "Next hunk" },
+    },
+}
+
+local objects = {
+    ["ih"] = { gitsigns.select_hunk, "Git hunk" },
+}
+
+local visual = {
+    ["ih"] = { gitsigns.select_hunk, "Git hunk" },
+
+    -- Only the actual command can make use of the visual selection...
+    ["<leader>g"] = {
+        name = "Git",
+        p = { ":Gitsigns preview_hunk<CR>", "Preview selection" },
+        r = { ":Gitsigns reset_hunk<CR>", "Restore selection" },
+        s = { ":Gitsigns stage_hunk<CR>", "Stage selection" },
+        u = { ":Gitsigns undo_stage_hunk<CR>", "Undo stage selection" },
+    },
+}
+
+wk.register(keys, { buffer = bufnr })
+wk.register(objects, { buffer = bufnr, mode = "o" })
+wk.register(visual, { buffer = bufnr, mode = "x" })
+EOF

home/vim/plugin/settings/gruvbox.vim

@@ -1,5 +0,0 @@
-" Use the high-contrast theme
-let g:gruvbox_contrast_dark='hard'
-
-" Enable italics because urxvt supports them
-let g:gruvbox_italic=1

home/vim/plugin/settings/lightline.vim

@@ -1,81 +0,0 @@
-" Initialise light-line setting structure
-let g:lightline={}
-
-" Use the wombat colorscheme
-let g:lightline.colorscheme='onedark'
-
-" Status-line for active buffer
-let g:lightline.active={
-  \     'left': [
-  \         [ 'mode', 'paste' ],
-  \         [ 'gitbranch', 'readonly', 'filename', 'modified' ],
-  \         [ 'spell' ],
-  \     ],
-  \     'right': [
-  \         [ 'lineinfo' ],
-  \         [ 'percent' ],
-  \         [ 'fileformat', 'fileencoding', 'filetype' ],
-  \         [ 'linter_check', 'linter_errors', 'linter_warn', 'linter_ok' ],
-  \         [ 'ctags_status' ],
-  \     ]
-  \ }
-
-" Status-line for inactive buffer
-let g:lightline.inactive={
-  \     'left': [
-  \         [ 'filename' ],
-  \     ],
-  \     'right': [
-  \         [ 'lineinfo' ],
-  \         [ 'percent' ],
-  \     ],
-  \ }
-
-" Which component should be written using which function
-let g:lightline.component_function={
-  \     'readonly': 'LightlineReadonly',
-  \     'modified': 'LightlineModified',
-  \     'gitbranch': 'LightlineFugitive',
-  \ }
-
-" Which component can be expanded by using which function
-let g:lightline.component_expand={
-  \    'linter_check': 'lightline#ale#checking',
-  \    'linter_warn': 'lightline#ale#warnings',
-  \    'linter_errors': 'lightline#ale#errors',
-  \    'linter_ok': 'lightline#ale#ok',
-  \ }
-
-" How to color custom components
-let g:lightline.component_type={
-  \   'readonly': 'error',
-  \   'linter_checking': 'left',
-  \   'linter_warn': 'warning',
-  \   'linter_errors': 'error',
-  \   'linter_ok': 'left',
-  \ }
-
-" Show pretty icons instead of text for linting status
-let g:lightline#ale#indicator_checking='⏳'
-let g:lightline#ale#indicator_warnings='◆'
-let g:lightline#ale#indicator_errors='✗'
-let g:lightline#ale#indicator_ok='✓'
-
-" Show a lock icon when editing a read-only file when it makes sense
-function! LightlineReadonly()
-    return &ft!~?'help\|vimfiler\|netrw' && &readonly ? '' : ''
-endfunction
-
-" Show a '+' when the buffer is modified, '-' if not, when it makes sense
-function! LightlineModified()
-    return &ft=~'help\|vimfiler\|netrw' ? '' : &modified ? '+' : &modifiable ? '' : '-'
-endfunction
-
-" Show branch name with nice icon in status line, when it makes sense
-function! LightlineFugitive()
-    if &ft!~?'help\|vimfiler\|netrw' && exists('*fugitive#head')
-            let branch=fugitive#head()
-            return branch!=#'' ? ' '.branch : ''
-    endif
-    return ''
-endfunction

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

@@ -0,0 +1,63 @@
+lua << EOF
+local lualine = require("lualine")
+local utils = require("ambroisie.utils")
+
+local function list_spell_languages()
+    if not vim.opt.spell:get() then
+        return ""
+    end
+
+    return table.concat(vim.opt.spelllang:get(), ", ")
+end
+
+local function list_lsp_clients()
+    local client_names = utils.list_lsp_clients()
+
+    if #client_names == 0 then
+        return ""
+    end
+
+    return "[ " .. table.concat(client_names, " ") .. " ]"
+end
+
+lualine.setup({
+    options = {
+        icons_enabled = false,
+        section_separators = "",
+        component_separators = "|",
+    },
+    sections = {
+        lualine_a = {
+            { "mode" },
+        },
+        lualine_b = {
+            { "FugitiveHead" },
+            { "filename", symbols = { readonly = "🔒" } },
+        },
+        lualine_c = {
+            { list_spell_languages },
+            { "lsp_progress" },
+        },
+        lualine_x = {
+            { list_lsp_clients },
+            {
+                "diagnostics",
+                -- Only use the diagnostics API
+                sources = { "nvim_diagnostic" },
+            },
+        },
+        lualine_y = {
+            { "fileformat" },
+            { "encoding" },
+            { "filetype" },
+        },
+        lualine_z = {
+            "location",
+        },
+    },
+    extensions = {
+        "fugitive",
+        "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/surround.vim

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

home/vim/plugin/settings/telescope.vim

@@ -0,0 +1,26 @@
+lua << EOF
+local telescope = require("telescope")
+
+telescope.setup({
+    defaults = {
+        mappings = {
+            i = {
+                ["<C-h>"] = "which_key",
+                -- I want the normal readline mappings rather than scrolling
+                ["<C-u>"] = false,
+            }
+        }
+    },
+    extensions = {
+        fzf = {
+            fuzzy = true,
+            override_generic_sorter = true,
+            override_file_sorter = true,
+            case_mode = "smart_case",
+        },
+    },
+})
+
+telescope.load_extension("fzf")
+telescope.load_extension("lsp_handlers")
+EOF