WIP: home: vim: notify

The unstructured attributes are hard-deprecated.

.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: notify
-  image: bash
+- name: notifiy
+  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": 1723293904,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "lastModified": 1646105662,
+        "narHash": "sha256-jdXCZbGZL0SWWi29GnAOFHUh/QvvP0IyaVLv1ZTDkBI=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "297cd58b418249240b9f1f155d52b1b17f292884",
         "type": "github"
       },
       "original": {
@@ -28,107 +21,22 @@
         "type": "github"
       }
     },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "main",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "futils": {
-      "inputs": {
-        "systems": [
-          "systems"
-        ]
-      },
       "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
         "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": [
@@ -136,11 +44,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735381016,
-        "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
+        "lastModified": 1646559628,
+        "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
+        "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68",
         "type": "github"
       },
       "original": {
@@ -152,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735291276,
-        "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
+        "lastModified": 1646497237,
+        "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
+        "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
         "type": "github"
       },
       "original": {
@@ -167,21 +75,12 @@
       }
     },
     "nur": {
-      "inputs": {
-        "flake-parts": [
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
       "locked": {
-        "lastModified": 1735408823,
-        "narHash": "sha256-1VjQeMQer5nXNYtw+BG+s78ucaEoxO5oqj+yRmM8MMs=",
+        "lastModified": 1646721260,
+        "narHash": "sha256-r8ZWtEwiRxLKOtsT2yvU9Rs1oqL/RsSkPkgupXsw1bU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "8283ea92deac8cdb6fd63ff04049ac9e879bf5eb",
+        "rev": "25adb63e9381cb0342cdbe2d2d56266f4974a2c5",
         "type": "github"
       },
       "original": {
@@ -193,21 +92,19 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
+        "flake-utils": [
+          "futils"
         ],
-        "nixpkgs-stable": [
+        "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1734797603,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "lastModified": 1646153636,
+        "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b",
         "type": "github"
       },
       "original": {
@@ -220,50 +117,11 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "flake-parts": "flake-parts",
         "futils": "futils",
         "home-manager": "home-manager",
         "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"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "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 = {
@@ -55,10 +40,6 @@
       owner = "nix-community";
       repo = "NUR";
       ref = "master";
-      inputs = {
-        flake-parts.follows = "flake-parts";
-        nixpkgs.follows = "nixpkgs";
-      };
     };
 
     pre-commit-hooks = {
@@ -67,19 +48,118 @@
       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
+    , nixpkgs
+    , nur
+    , pre-commit-hooks
+    }:
+    let
+      inherit (futils.lib) eachDefaultSystem;
+
+      lib = nixpkgs.lib.extend (self: super: {
+        my = import ./lib { inherit inputs; pkgs = nixpkgs; lib = self; };
+      });
+
+      defaultModules = [
+        ({ ... }: {
+          # Let 'nixos-version --json' know about the Git revision
+          system.configurationRevision = self.rev or "dirty";
+        })
+        {
+          nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
+            nur.overlay
+          ];
+        }
+        # 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
+    eachDefaultSystem
+      (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      rec {
+        apps = {
+          diff-flake = futils.lib.mkApp { drv = packages.diff-flake; };
+        };
+
+        checks = {
+          pre-commit = pre-commit-hooks.lib.${system}.run {
+            src = ./.;
+
+            hooks = {
+              nixpkgs-fmt = {
+                enable = true;
+              };
+
+              shellcheck = {
+                enable = true;
+              };
+            };
+          };
+        };
+
+        defaultApp = apps.diff-flake;
+
+        devShell = 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;
+      }) // {
+      overlay = self.overlays.pkgs;
+
+      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.overlays.default
-      ];
-    };
-
-    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.overlays.default
-      ];
-    }
-    # 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

@@ -0,0 +1,17 @@
+{ 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;
+    nix-direnv = {
+      # A better `use_nix`
+      enable = true;
+    };
+  };
+}

home/discord/default.nix

@@ -7,13 +7,11 @@ in
 {
   options.my.home.discord = with lib; {
     enable = mkEnableOption "discord configuration";
-
-    package = mkPackageOption pkgs "discord" { };
   };
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
-      cfg.package
+      discord
     ];
 
     xdg.configFile."discord/settings.json".source =

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

@@ -4,30 +4,26 @@
 " Use dark color scheme
 colorscheme dark
 
-" Make tridactyl open Vim in my preferred 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
+" 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, LWN
-bind ;c hint -Jc [class*="expand"],[class*="togg"],[class="comment_folder"],[class="CommentTitle"]
+" Toggle comments on Reddit, Hacker News, Lobste.rs
+bind ;c hint -c [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 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"]
-bindurl ^https://duckduckgo.com F hint -Jbc [data-testid="result"]
+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

home/gdb/default.nix

@@ -0,0 +1,42 @@
+{ 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
+      ];
+
+      # FIXME: waiting for commit 64aaad6349d2b2c45063a5383f877ce9a3a0c354
+      xdg.configFile."gdb/gdbinit".source = ./gdbinit;
+
+      # FIXME: remove once `gdb` is updated from version 10.2
+      home.file.".gdbinit".source = ./gdbinit;
+    })
+
+    (lib.mkIf cfg.rr.enable {
+      home.packages = [
+        cfg.rr.package
+      ];
+    })
+  ];
+}

home/gdb/gdbinit

@@ -19,6 +19,6 @@ set print demangle on
 set auto-load python-scripts
 
 # Allow autoloading project-local .gdbinit files
-add-auto-load-safe-path ~/git/
+set auto-load safe-path ~/git/
 # Allow autoloading from the Nix store
-add-auto-load-safe-path /nix/store
+set auto-load safe-path /nix/store

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,15 +120,6 @@ in
         defaultBranch = "main";
       };
 
-      # Local configuration, not-versioned
-      include = {
-        path = "config.local";
-      };
-
-      merge = {
-        conflictStyle = "zdiff3";
-      };
-
       pull = {
         # Avoid useless merge commits
         rebase = true;
@@ -148,13 +136,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 +162,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/gtk/default.nix

@@ -21,12 +21,12 @@ in
     };
 
     iconTheme = {
-      package = pkgs.gnome-themes-extra;
+      package = pkgs.gnome.gnome-themes-extra;
       name = "Adwaita";
     };
 
     theme = {
-      package = pkgs.gnome-themes-extra;
+      package = pkgs.gnome.gnome-themes-extra;
       name = "Adwaita";
     };
   };

home/htop/default.nix

@@ -3,8 +3,8 @@ let
   cfg = config.my.home.htop;
 in
 {
-  options.my.home.htop = with lib; {
-    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 = {
@@ -52,13 +51,27 @@ let
   };
 
   office365Config = {
-    flavor = "outlook.office365.com";
+    imap = {
+      host = "outlook.office365.com";
+      port = 993;
+      tls = {
+        enable = true;
+      };
+    };
+    smtp = {
+      host = "outlook.office365.com";
+      port = 587;
+      tls = {
+        enable = true;
+        useStartTls = true;
+      };
+    };
   };
 in
 {
   config.accounts.email.accounts = {
     personal = lib.mkMerge [
-      # Common configuration
+      # Common configuraton
       (mkConfig {
         domain = "belanyi.fr";
         address = "bruno";
@@ -70,7 +83,7 @@ in
     ];
 
     gmail = lib.mkMerge [
-      # Common configuration
+      # Common configuraton
       (mkConfig {
         domain = "gmail.com";
         address = "brunobelanyi";

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,16 +17,12 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; ([
-      fd
-      file
-      ripgrep
-      tree
-    ] ++ cfg.additionalPackages);
-
-    nixpkgs.config = {
-      inherit (cfg) allowAliases allowUnfree;
-    };
-  };
+  config.home.packages = with pkgs; lib.mkIf cfg.enable ([
+    fd
+    file
+    mosh
+    ripgrep
+    rr
+    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/ftplugin/netrw.vim

@@ -0,0 +1,6 @@
+" Create the `b:undo_ftplugin` variable if it doesn't exist
+call ftplugined#check_undo_ft()
+
+" Don't show Netrw in buffer list
+setlocal bufhidden=delete
+let b:undo_ftplugin='|setlocal bufhidden<'

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

@@ -0,0 +1,9 @@
+lua << EOF
+local wk = require("which-key")
+
+local keys = {
+    ["<leader>"] = { "<cmd>nohls<CR>", "Clear search highlight" },
+}
+
+wk.register(keys, { prefix = "<leader>" })
+EOF

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

@@ -0,0 +1,20 @@
+lua << EOF
+local wk = require("which-key")
+local telescope = require("telescope")
+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" },
+        n = { telescope.extensions.notify.notify, "Notification history" },
+    },
+}
+
+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

@@ -0,0 +1,125 @@
+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/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,20 +31,29 @@ 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
 
       # tpope essentials
+      vim-commentary # Easy comments
       vim-eunuch # UNIX integrations
       vim-fugitive # A 'git' wrapper
       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
 
       # Languages
+      rust-vim
       vim-beancount
+      vim-jsonnet
+      vim-nix
+      vim-pandoc
+      vim-pandoc-syntax
+      vim-toml
 
       # General enhancements
       vim-qf # Better quick-fix list
@@ -57,30 +62,27 @@ in
       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...
       gitsigns-nvim # Fast git UI integration
-      nvim-surround # Deal with pairs, now in Lua
-      oil-nvim # Better alternative to NetrW
+      nvim-notify # Better notification API
       telescope-fzf-native-nvim # Use 'fzf' fuzzy matching algorithm
       telescope-lsp-handlers-nvim # Use 'telescope' for various LSP actions
       telescope-nvim # Fuzzy finder interface
@@ -98,11 +100,8 @@ in
       nixpkgs-fmt
 
       # Shell
-      bash-language-server
+      shellcheck
       shfmt
-
-      # Generic
-      typos-lsp
     ];
   };
 

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

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

home/vim/init.vim

@@ -1,4 +1,4 @@
-" Basic configuration {{{
+" Basic configuraion {{{
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Use UTF-8
 set encoding=utf-8
@@ -38,10 +38,10 @@ set tabstop=8
 
 " File parameters {{{
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Disable swap files
+" Disable backups, we have source control for that
+set nobackup
+" Disable swapfiles too
 set noswapfile
-" Enable undo files
-set undofile
 " }}}
 
 " UI and UX parameters {{{
@@ -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,37 +75,15 @@ 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
 
-" 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 },
-        -- Directories "pop" better in blue
-        Directory = { link = "GruvboxBlueBold" },
-    },
-    italic = {
-        -- Comments should not be italic, for e.g: box drawing
-        comments = false,
-    },
-})
-EOF
+" Include plug-in integration
+let g:gruvbox_plugin_hi_groups=1
+" Include filetype integration
+let g:gruvbox_filetype_hi_groups=1
 " Use my preferred colorscheme
-colorscheme gruvbox
+colorscheme gruvbox8
 " }}}
 
 " Search parameters {{{
@@ -123,10 +96,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,83 @@
+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" },
+        ["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 },
@@ -56,7 +57,5 @@ cmp.setup({
             cmp.config.compare.order,
         },
     },
-    experimental = {
-        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

@@ -0,0 +1,66 @@
+lua << EOF
+local gitsigns = require('gitsigns')
+
+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,
+    },
+
+    on_attach = function(bufnr)
+        local wk = require("which-key")
+
+        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" })
+    end,
+})
+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 ""
@@ -30,7 +31,7 @@ lualine.setup({
             { "mode" },
         },
         lualine_b = {
-            { "FugitiveHead" },
+            { "branch" },
             { "filename", symbols = { readonly = "🔒" } },
         },
         lualine_c = {
@@ -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/notify.vim

@@ -0,0 +1,9 @@
+lua << EOF
+local notify = require("notify")
+
+notify.setup({
+    stages = "slide",
+})
+
+vim.notify = notify
+EOF

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

@@ -0,0 +1,119 @@
+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
+        condition = utils.is_executable_condition("flake8"),
+    }),
+    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/telescope.vim

@@ -0,0 +1,18 @@
+lua << EOF
+local telescope = require("telescope")
+
+telescope.setup({
+    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")
+telescope.load_extension("notify")
+EOF

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

@@ -0,0 +1,58 @@
+lua << EOF
+local ts_config = require("nvim-treesitter.configs")
+ts_config.setup({
+    highlight = {
+        enable = true,
+        -- Avoid duplicate highlighting
+        additional_vim_regex_highlighting = false,
+    },
+    indent = {
+        enable = true,
+    },
+    context_commentstring = {
+        enable = true,
+    },
+    textobjects = {
+        select = {
+            enable = true,
+            -- Jump to matching text objects
+            lookahead = true,
+            keymaps = {
+                ["aa"] = "@parameter.outer",
+                ["ia"] = "@parameter.inner",
+                ["ab"] = "@block.outer",
+                ["ib"] = "@block.inner",
+                ["ac"] = "@class.outer",
+                ["ic"] = "@class.inner",
+                ["af"] = "@function.outer",
+                ["if"] = "@function.inner",
+                ["ak"] = "@comment.outer",
+                ["aS"] = "@statement.outer",
+            },
+        },
+        move = {
+            enable = true,
+            -- Add to jump list
+            set_jumps = true,
+            goto_next_start = {
+                ["]m"] = "@function.outer",
+                ["]S"] = "@statement.outer",
+                ["]]"] = "@class.outer",
+            },
+            goto_next_end = {
+                ["]M"] = "@function.outer",
+                ["]["] = "@class.outer",
+            },
+            goto_previous_start = {
+                ["[m"] = "@function.outer",
+                ["[S"] = "@statement.outer",
+                ["[["] = "@class.outer",
+            },
+            goto_previous_end = {
+                ["[M"] = "@function.outer",
+                ["[]"] = "@class.outer",
+            },
+        },
+    },
+})
+EOF

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

@@ -0,0 +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/default.nix

@@ -10,7 +10,6 @@ let
 in
 {
   imports = [
-    ./cursor
     ./dunst
     ./i3
     ./i3bar
@@ -26,41 +25,12 @@ in
       description = "Which window manager to use for home session";
     };
 
-    cursor = {
-      enable = mkRelatedOption "dunst configuration" [ "i3" ];
-    };
-
     dunst = {
       enable = mkRelatedOption "dunst configuration" [ "i3" ];
     };
 
     i3bar = {
       enable = mkRelatedOption "i3bar configuration" [ "i3" ];
-
-      vpn = {
-        enable = my.mkDisableOption "VPN configuration";
-
-        blockConfigs = mkOption {
-          type = with types; listOf (attrsOf str);
-          default = [
-            {
-              active_format = " VPN ";
-              service = "wg-quick-wg";
-            }
-            {
-              active_format = " VPN (LAN) ";
-              service = "wg-quick-lan";
-            }
-          ];
-          example = [
-            {
-              active_format = " WORK ";
-              service = "some-service-name";
-            }
-          ];
-          description = "list of block configurations, merged with the defaults";
-        };
-      };
     };
 
     rofi = {
@@ -72,8 +42,8 @@ in
 
       command = mkOption {
         type = types.str;
-        default = "${lib.getExe pkgs.i3lock} -n -c 000000";
-        example = "\${lib.getExe pkgs.i3lock} -n -i lock.png";
+        default = "${pkgs.i3lock}/bin/i3lock -n -c 000000";
+        example = "\${pkgs.i3lock}/bin/i3lock -n -i lock.png";
         description = "Locker command to run";
       };
 

home/wm/i3/default.nix

@@ -27,13 +27,13 @@ let
   genMovementBindings = f: addVimKeyBindings (lib.my.genAttrs' movementKeys f);
 
   # Used in multiple scripts to show messages through keybindings
-  notify-send = lib.getExe pkgs.libnotify;
+  notify-send = "${pkgs.libnotify}/bin/notify-send";
 
   # Screen backlight management
-  changeBacklight = lib.getExe pkgs.ambroisie.change-backlight;
+  changeBacklight = "${pkgs.ambroisie.change-backlight}/bin/change-backlight";
 
   # Audio and volume management
-  changeAudio = lib.getExe pkgs.ambroisie.change-audio;
+  changeAudio = "${pkgs.ambroisie.change-audio}/bin/change-audio";
 
   # Lock management
   toggleXautolock =
@@ -61,8 +61,8 @@ in
       ambroisie.dragger # drag-and-drop from the CLI
       ambroisie.i3-get-window-criteria # little helper for i3 configuration
       arandr # Used by a mapping
+      pamixer # Used by a mapping
       playerctl # Used by a mapping
-      xdotool # Used by 'rofi-rbw', in a mapping
     ];
 
     xsession.windowManager.i3 = {
@@ -73,12 +73,14 @@ in
 
         bars =
           let
-            i3status-rs = lib.getExe config.programs.i3status-rust.package;
+            barConfigPath =
+              config.xdg.configFile."i3status-rust/config-top.toml".target;
+            i3status-rs =
+              "${config.programs.i3status-rust.package}/bin/i3status-rs";
           in
-          assert [ "top" ] == lib.attrNames config.programs.i3status-rust.bars;
           [
             {
-              statusCommand = "${i3status-rs} config-top.toml";
+              statusCommand = "${i3status-rs} ${barConfigPath}";
               trayOutput = "primary";
               position = "top";
 
@@ -127,10 +129,8 @@ in
             { class = "^Blueman-.*$"; }
             { title = "^htop$"; }
             { class = "^Thunderbird$"; instance = "Mailnews"; window_role = "filterlist"; }
-            { class = "^pavucontrol.*$"; }
+            { class = "^Pavucontrol.*$"; }
             { class = "^Arandr$"; }
-            { class = "^\\.blueman-manager-wrapped$"; }
-            { class = "^\\.arandr-wrapped$"; }
           ];
         };
 
@@ -175,10 +175,6 @@ in
             "${modifier}+Control+space" = "floating toggle";
             # Change focus between tiling/floating
             "${modifier}+space" = "focus mode_toggle";
-            # Center floating window
-            "${modifier}+c" = "move absolute position center";
-            # Center floating window
-            "${modifier}+Shift+s" = "sticky toggle";
           }
           {
             # Focus parent container
@@ -191,14 +187,13 @@ in
             "${modifier}+d" = "exec rofi -show drun -disable-history";
             "${modifier}+Shift+d" = "exec rofi -show run -disable-history";
             "${modifier}+p" = "exec --no-startup-id flameshot gui";
-            "${modifier}+Ctrl+p" = "exec ${lib.getExe pkgs.rofi-rbw}";
             "${modifier}+Shift+p" = "exec rofi -show emoji";
             "${modifier}+b" =
               let
                 inherit (config.my.home.bluetooth) enable;
-                prog = lib.getExe pkgs.rofi-bluetooth;
+                prog = "${pkgs.ambroisie.rofi-bluetooth}/bin/rofi-bluetooth";
               in
-              lib.mkIf enable "exec ${prog} -i";
+              lib.mkIf enable "exec ${prog}";
           })
           (
             # Changing container focus
@@ -372,18 +367,9 @@ in
           };
 
         startup = [
-          # NOTE: rely on systemd user services instead...
+          # FIXME
+          # { commdand; always; notification; }
         ];
-
-        window = {
-          commands = [
-            # Make htop window bigger
-            {
-              criteria = { title = "^htop$"; };
-              command = "resize set 80 ppt 80 ppt, move position center";
-            }
-          ];
-        };
       };
     };
   };

home/wm/i3bar/default.nix

@@ -0,0 +1,87 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.wm.i3bar;
+in
+{
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      alsaUtils # Used by `sound` block
+      lm_sensors # Used by `temperature` block
+      font-awesome # Icon font
+    ];
+
+    programs.i3status-rust = {
+      enable = true;
+
+      bars = {
+        top = {
+          icons = "awesome5";
+
+          blocks = builtins.filter (attr: attr != { }) [
+            {
+              block = "music";
+              buttons = [ "prev" "play" "next" ];
+              max_width = 50;
+              dynamic_width = true;
+              hide_when_empty = true;
+            }
+            (lib.optionalAttrs config.my.home.bluetooth.enable {
+              block = "bluetooth";
+              mac = "4C:87:5D:06:40:D9";
+              hide_disconnected = true;
+              format = "Boson {percentage}";
+            })
+            (lib.optionalAttrs config.my.home.bluetooth.enable {
+              block = "bluetooth";
+              mac = "94:DB:56:00:EE:93";
+              hide_disconnected = true;
+              format = "Protons {percentage}";
+            })
+            (lib.optionalAttrs config.my.home.bluetooth.enable {
+              block = "bluetooth";
+              mac = "F7:78:BA:76:52:F7";
+              hide_disconnected = true;
+              format = "MX Ergo {percentage}";
+            })
+            {
+              block = "cpu";
+            }
+            {
+              block = "disk_space";
+            }
+            {
+              block = "net";
+              format = "{ssid} {ip} {signal_strength}";
+            }
+            {
+              block = "backlight";
+              invert_icons = true;
+            }
+            {
+              block = "battery";
+              format = "{percentage} ({time})";
+              full_format = "{percentage}";
+            }
+            {
+              block = "temperature";
+              collapsed = false;
+            }
+            {
+              block = "sound";
+              device_kind = "source"; # Microphone status
+              format = ""; # Only show icon
+            }
+            {
+              block = "sound";
+              show_volume_when_muted = true;
+            }
+            {
+              block = "time";
+              format = "%F %T";
+            }
+          ];
+        };
+      };
+    };
+  };
+}

home/wm/screen-lock/default.nix

@@ -2,10 +2,10 @@
 let
   cfg = config.my.home.wm.screen-lock;
 
-  notificationCmd =
+  notficationCmd =
     let
       duration = toString (cfg.notify.delay * 1000);
-      notifyCmd = "${lib.getExe pkgs.libnotify} -u critical -t ${duration}";
+      notifyCmd = "${pkgs.libnotify}/bin/notify-send -u critical -t ${duration}";
     in
     # Needs to be surrounded by quotes for systemd to launch it correctly
     ''"${notifyCmd} -- 'Locking in ${toString cfg.notify.delay} seconds'"'';
@@ -48,7 +48,7 @@ in
           "-notify"
           "${toString cfg.notify.delay}"
           "-notifier"
-          notificationCmd
+          notficationCmd
         ];
       };
     };