nvim stuff

flake.lock

@@ -198,11 +198,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1754394942,
+        "lastModified": 1754412068,
-        "narHash": "sha256-ib1lYDLsu+e2xhnRmeTQrfnHwxvrOb3qMfR3MJcjkJo=",
+        "narHash": "sha256-oCevHZdlmwe+0j2I3TVrr0ioQFqLMRE+HpB+oFd0MkI=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "9eb97f6ab87b3f49cfcd81f2ff0622e1f95dba45",
+        "rev": "e52ff1a5283b6f673b7344a74b12880b84151d5d",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1754394738,
+        "lastModified": 1754411121,
-        "narHash": "sha256-vNxvJ1E2l5PxrgFvci+Hah0FqmbIQL10C3Le9OYqVyg=",
+        "narHash": "sha256-wVHJH09VJXm/FTJmXNYivpPcT6nt2/+tAL6tp0WPLr4=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "04d935868909c9433d594352d854fab823c64e2e",
+        "rev": "3d0146a83f0a5f2f46b955794254c580725336bd",
         "type": "github"
       },
       "original": {
@@ -323,11 +323,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1754340878,
+        "lastModified": 1754278406,
-        "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
+        "narHash": "sha256-jvIQTMN5EzoOP5RaGztpVese8a3wqy0M/h6tNzycW28=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
+        "rev": "6a489c9482ca676ce23c0bcd7f2e1795383325fa",
         "type": "github"
       },
       "original": {
@@ -345,11 +345,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1754379602,
+        "lastModified": 1754397955,
-        "narHash": "sha256-Fvc2xy326XkjDCY/uuj05z8DJs+AKmugEITTCNAp2rs=",
+        "narHash": "sha256-4hQT8mDSRNgPKiPdpYwr2QVJdA4FaUhOjT2lKkW8QHQ=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "cd4fac45a450706c466af3bd5715b617b9efa1c6",
+        "rev": "8d47a07563120b36af149edf2273034563339a91",
         "type": "github"
       },
       "original": {
@@ -368,11 +368,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753771532,
+        "lastModified": 1754301638,
-        "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=",
+        "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "2a65adaf2c0c428efb0f4a2bc406aab466e96a06",
+        "rev": "a60091045273484c040a91f5c229ba298f8ecc27",
         "type": "github"
       },
       "original": {

flake.nix

@@ -35,8 +35,7 @@
       flake = false;
     };
   };
-  outputs =
+  outputs = {
-    {
     agenix,
     darwin,
     disko,
@@ -49,10 +48,10 @@
     nixvim,
     secrets,
     self,
-    }@inputs:
+  } @ inputs: let
-    let
     systemLib = import ./lib/systems.nix inputs;
-      inherit (systemLib)
+    inherit
+      (systemLib)
       systemConfigs
       mkDarwinSystem
       mkNixosSystem
@@ -65,14 +64,10 @@
       "aarch64-darwin"
     ];
     forAllSystems = f: nixpkgs.lib.genAttrs allSystems f;
-      devShell =
+    devShell = system: let
-        system:
-        let
       pkgs = nixpkgs.legacyPackages.${system};
-        in
+    in {
-        {
+      default = with pkgs;
-          default =
-            with pkgs;
         mkShell {
           nativeBuildInputs = with pkgs; [
             bashInteractive
@@ -85,8 +80,7 @@
           '';
         };
     };
-    in
+  in {
-    {
     devShells = forAllSystems devShell;
     apps = forAllSystems mkApps;
     darwinConfigurations = nixpkgs.lib.genAttrs darwinHosts mkDarwinSystem;

hosts/darwin/chidi/default.nix

@@ -2,9 +2,7 @@
   pkgs,
   user,
   ...
-}:
+}: {
-
-{
   imports = [
     ../shared.nix
   ];

hosts/darwin/jason/default.nix

@@ -3,9 +3,7 @@
   pkgs,
   user,
   ...
-}:
+}: {
-
-{
   imports = [
     ../shared.nix
   ];

hosts/darwin/shared.nix

@@ -4,9 +4,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   imports = [
     ../../profiles/base
     ../../profiles/darwin

hosts/nixos/default.nix

@@ -6,12 +6,9 @@
   hostname,
   user,
   ...
-}:
+}: let
-
+  keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8iAnIaa1deoc7jw8YACPNVka1ZFJxhnU4G74TmS+p"];
-let
+in {
-  keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8iAnIaa1deoc7jw8YACPNVka1ZFJxhnU4G74TmS+p" ];
-in
-{
   imports = [
     ../../profiles/base
     ../../profiles/nixos
@@ -45,7 +42,7 @@ in
     interfaces."%INTERFACE%".useDHCP = true;
   };
 
-  nix.nixPath = [ "nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos" ];
+  nix.nixPath = ["nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos"];
 
   programs = {
     gnupg.agent.enable = true;
@@ -72,11 +69,10 @@ in
       overrideDevices = true;
 
       settings = {
-        devices = { };
+        devices = {};
         options.globalAnnounceEnabled = false; # Only sync on LAN
       };
     };
-
   };
 
   # Enable CUPS to print documents
@@ -112,10 +108,10 @@ in
         commands = [
           {
             command = "${pkgs.systemd}/bin/reboot";
-            options = [ "NOPASSWD" ];
+            options = ["NOPASSWD"];
           }
         ];
-        groups = [ "wheel" ];
+        groups = ["wheel"];
       }
     ];
   };

lib/systems.nix

@@ -10,9 +10,7 @@
   nixvim,
   self,
   ...
-}@inputs:
+} @ inputs: let
-
-let
   user = "cschmatzler";
 
   mkApp = scriptName: system: {
@@ -26,13 +24,13 @@ let
       '')
     }/bin/${scriptName}";
   };
-in
+in {
-{
+  mkDarwinSystem = hostname:
-  mkDarwinSystem =
-    hostname:
     darwin.lib.darwinSystem {
       system = "aarch64-darwin";
-      specialArgs = inputs // {
+      specialArgs =
+        inputs
+        // {
           inherit user;
         };
       modules = [
@@ -55,11 +53,12 @@ in
       ];
     };
 
-  mkNixosSystem =
+  mkNixosSystem = hostname: system:
-    hostname: system:
     nixpkgs.lib.nixosSystem {
       inherit system;
-      specialArgs = inputs // {
+      specialArgs =
+        inputs
+        // {
           inherit hostname user;
         };
       modules = [
@@ -69,9 +68,7 @@ in
       ];
     };
 
-  mkApps =
+  mkApps = system: let
-    system:
-    let
     appNames = [
       "apply"
       "build"
@@ -89,6 +86,6 @@ in
       "chidi"
       "jason"
     ];
-    nixosHosts = [ "tahani" ];
+    nixosHosts = ["tahani"];
   };
 }

profiles/base/default.nix

@@ -5,8 +5,7 @@
   lib,
   user,
   ...
-}:
+}: {
-{
   imports = [
     agenix.darwinModules.default
   ];
@@ -19,8 +18,7 @@
       allowUnsupportedSystem = true;
     };
 
-    overlays =
+    overlays = let
-      let
       path = ../../overlays;
     in
       with builtins;
@@ -42,7 +40,7 @@
         "https://nix-community.cachix.org"
         "https://cache.nixos.org"
       ];
-      trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+      trusted-public-keys = ["cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="];
     };
     gc = {
       automatic = true;

profiles/base/home-manager/bat.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-
-{
   programs.bat = {
     enable = true;
     config = {

profiles/base/home-manager/git.nix

@@ -1,14 +1,9 @@
-{
+{...}: let
-  ...
-}:
-
-let
   name = "Christoph Schmatzler";
-in
+in {
-{
   programs.git = {
     enable = true;
-    ignores = [ "*.swp" ];
+    ignores = ["*.swp"];
     userName = name;
     lfs = {
       enable = true;

profiles/base/home-manager/neovim/autocmd.nix

@@ -0,0 +1,35 @@
+{
+  programs.nixvim = {
+    autoGroups = {
+      Christoph = {};
+    };
+
+    autoCmd = [
+      {
+        event = "BufWritePre";
+        group = "Christoph";
+        pattern = "*";
+        command = "%s/\\s\\+$//e";
+      }
+      {
+        event = "LspAttach";
+        group = "Christoph";
+        callback.__raw = ''
+          function(e)
+            local opts = { buffer = e.buf }
+            vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
+            vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
+            vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
+            vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
+            vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
+            vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
+            vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
+            vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
+            vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
+            vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
+          end
+        '';
+      }
+    ];
+  };
+}

profiles/base/home-manager/neovim/default.nix

@@ -1,7 +1,10 @@
-{
+{pkgs, ...}: {
   imports = [
-    ./options.nix
+    ./autocmd.nix
+    ./plugins/conform.nix
+    ./plugins/mini.nix
     ./plugins/oil.nix
+    ./plugins/treesitter.nix
     ./plugins/which-key.nix
   ];
 

profiles/base/home-manager/neovim/options.nix

@@ -1 +0,0 @@
-{ }

profiles/base/home-manager/neovim/plugins/conform.nix

@@ -0,0 +1,14 @@
+{
+  programs.nixvim.plugins.conform-nvim = {
+    enable = true;
+    settings = {
+      format_on_save = {};
+      formatters_by_ft = {
+        nix = ["alejandra"];
+        javascript = ["prettier"];
+        typescript = ["prettier"];
+        elixir = ["mix"];
+      };
+    };
+  };
+}

profiles/base/home-manager/neovim/plugins/mini.nix

@@ -0,0 +1,59 @@
+{
+  programs.nixvim.plugins.mini = {
+    enable = true;
+    modules = {
+      basics = {
+        options = {
+          basic = true;
+          extra_ui = true;
+          win_ui_borders = "dot";
+        };
+        mappings = {
+          basic = true;
+          windows = true;
+          move_with_alt = true;
+        };
+        autocommands = {
+          basic = true;
+        };
+      };
+      icons = {};
+      notify = {};
+      sessions = {};
+      statusline = {};
+      extra = {};
+      ai = {
+        custom_textobjects = {
+          B.__raw = "require('mini.extra').gen_ai_spec.buffer()";
+          F.__raw = "require('mini.ai').gen_spec.treesitter({ a = '@function.outer', i = '@function.inner' })";
+        };
+      };
+      align = {};
+      bracketed = {};
+      bufremove = {};
+      comment = {};
+      completion = {
+        lsp_completion = {
+          source_func = "omnifunc";
+        };
+      };
+      pick = {};
+      surround = {};
+    };
+  };
+
+  programs.nixvim.keymaps = [
+    {
+      mode = "n";
+      key = "<leader>ff";
+      action = ":Pick files<CR>";
+      options.desc = "Search files";
+    }
+    {
+      mode = "n";
+      key = "<leader>/";
+      action = ":Pick grep_live<CR>";
+      options.desc = "Grep";
+    }
+  ];
+}

profiles/base/home-manager/neovim/plugins/oil.nix

@@ -1,7 +1,6 @@
 {
   programs.nixvim.plugins.oil = {
     enable = true;
-    autoLoad = true;
     settings = {
       columns = [
         "icon"

profiles/base/home-manager/neovim/plugins/treesitter.nix

@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  programs.nixvim.plugins.treesitter = {
+    enable = true;
+    settings = {
+      highlight.enable = true;
+      indent.enable = true;
+    };
+    grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+      bash
+      fish
+      json
+      nix
+      toml
+      yaml
+    ];
+  };
+}

profiles/base/home-manager/ssh.nix

@@ -3,9 +3,7 @@
   lib,
   user,
   ...
-}:
+}: {
-
-{
   programs.ssh = {
     enable = true;
     includes = [

profiles/base/home-manager/starship.nix

@@ -1,9 +1,4 @@
-{
+{lib, ...}: {
-  lib,
-  ...
-}:
-
-{
   programs.starship = {
     enable = true;
     enableFishIntegration = true;

profiles/base/home-manager/zellij.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.zellij = {
     enable = true;
     enableFishIntegration = true;

profiles/base/packages.nix

@@ -1,9 +1,8 @@
-{ pkgs }:
+{pkgs}:
-
+with pkgs; [
-with pkgs;
-[
   age
   age-plugin-yubikey
+  alejandra
   delta
   docker
   docker-compose
@@ -16,8 +15,10 @@ with pkgs;
   nerd-fonts.iosevka
   nixfmt
   nodejs_24
+  nurl
   opencode
   openssh
+  prettier
   ripgrep
   sqlite
   tree

profiles/darwin/default.nix

@@ -6,9 +6,7 @@
   nixvim,
   user,
   ...
-}:
+}: {
-
-{
   imports = [
     ./dock
     ./system.nix
@@ -25,15 +23,13 @@
 
   home-manager = {
     useGlobalPkgs = true;
-    users.${user} =
+    users.${user} = {
-      {
       pkgs,
       config,
       lib,
       ...
-      }:
+    }: {
-      {
+      _module.args = {inherit user;};
-        _module.args = { inherit user; };
       imports = [
         nixvim.homeModules.nixvim
         ../base/home-manager
@@ -41,7 +37,7 @@
       ];
       fonts.fontconfig.enable = true;
       home = {
-          packages = pkgs.callPackage ./packages.nix { } ++ pkgs.callPackage ../base/packages.nix { };
+        packages = pkgs.callPackage ./packages.nix {} ++ pkgs.callPackage ../base/packages.nix {};
         stateVersion = "24.05";
       };
     };
@@ -52,11 +48,11 @@
       enable = true;
       username = user;
       entries = [
-        { path = "/Applications/Safari.app/"; }
+        {path = "/Applications/Safari.app/";}
-        { path = "/${pkgs.ghostty-bin}/Applications/Ghostty.app/"; }
+        {path = "/${pkgs.ghostty-bin}/Applications/Ghostty.app/";}
-        { path = "/System/Applications/Notes.app/"; }
+        {path = "/System/Applications/Notes.app/";}
-        { path = "/System/Applications/Music.app/"; }
+        {path = "/System/Applications/Music.app/";}
-        { path = "/System/Applications/System Settings.app/"; }
+        {path = "/System/Applications/System Settings.app/";}
         {
           path = "${config.users.users.${user}.home}/Downloads";
           section = "others";

profiles/darwin/dock/default.nix

@@ -4,13 +4,10 @@
   lib,
   ...
 }:
-
+with lib; let
-with lib;
-let
   cfg = config.local.dock;
   inherit (pkgs) stdenv dockutil;
-in
+in {
-{
   options = {
     local.dock = {
       enable = mkOption {
@@ -21,11 +18,10 @@ in
 
       entries = mkOption {
         description = "Entries on the Dock";
-        type =
+        type = with types;
-          with types;
           listOf (submodule {
             options = {
-              path = lib.mkOption { type = str; };
+              path = lib.mkOption {type = str;};
               section = lib.mkOption {
                 type = str;
                 default = "apps";
@@ -48,11 +44,14 @@ in
 
   config = mkIf cfg.enable (
     let
-      normalize = path: if hasSuffix ".app" path then path + "/" else path;
+      normalize = path:
-      entryURI =
+        if hasSuffix ".app" path
-        path:
+        then path + "/"
+        else path;
+      entryURI = path:
         "file://"
-        + (builtins.replaceStrings
+        + (
+          builtins.replaceStrings
           [
             " "
             "!"
@@ -80,12 +79,12 @@ in
           (normalize path)
         );
       wantURIs = concatMapStrings (entry: "${entryURI entry.path}\n") cfg.entries;
-      createEntries = concatMapStrings (
+      createEntries =
-        entry:
+        concatMapStrings (
-        "${dockutil}/bin/dockutil --no-restart --add '${entry.path}' --section ${entry.section} ${entry.options}\n"
+          entry: "${dockutil}/bin/dockutil --no-restart --add '${entry.path}' --section ${entry.section} ${entry.options}\n"
-      ) cfg.entries;
+        )
-    in
+        cfg.entries;
-    {
+    in {
       system.activationScripts.postActivation.text = ''
           echo >&2 "Setting up the Dock for ${cfg.username}..."
           su ${cfg.username} -s /bin/sh <<'USERBLOCK'

profiles/darwin/home-manager/ghostty.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-
-{
   programs.ghostty = {
     enable = true;
     package = pkgs.ghostty-bin;

profiles/darwin/homebrew.nix

@@ -1,8 +1,6 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   homebrew = {
     enable = true;
-    masApps = { };
+    masApps = {};
   };
 }

profiles/darwin/packages.nix

@@ -1,7 +1,5 @@
-{ pkgs }:
+{pkgs}:
-
+with pkgs; [
-with pkgs;
-[
   _1password-gui
   dockutil
   raycast

profiles/darwin/secrets.nix

@@ -5,8 +5,7 @@
   secrets,
   user,
   ...
-}:
+}: {
-{
   age.identityPaths = [
     "/Users/${user}/.ssh/id_ed25519"
   ];

profiles/darwin/system.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-
-{
   system.defaults = {
     NSGlobalDomain = {
       AppleShowAllExtensions = true;

profiles/nixos/default.nix

@@ -6,13 +6,10 @@
   nixvim,
   user,
   ...
-}:
+}: let
-
+  sharedFiles = import ../base/files.nix {inherit config pkgs;};
-let
+  additionalFiles = import ./files.nix {inherit config pkgs;};
-  sharedFiles = import ../base/files.nix { inherit config pkgs; };
+in {
-  additionalFiles = import ./files.nix { inherit config pkgs; };
-in
-{
   imports = [
     ./packages.nix
     ./secrets.nix
@@ -33,21 +30,19 @@ in
 
   home-manager = {
     useGlobalPkgs = true;
-    users.${user} =
+    users.${user} = {
-      {
       pkgs,
       config,
       lib,
       ...
-      }:
+    }: {
-      {
+      _module.args = {inherit user;};
-        _module.args = { inherit user; };
       imports = [
         nixvim.homeModules.nixvim
         ../base/home-manager
       ];
       home = {
-          packages = pkgs.callPackage ./packages.nix { };
+        packages = pkgs.callPackage ./packages.nix {};
         file = lib.mkMerge [
           sharedFiles
           additionalFiles