Upgrade to NixOS-WSL 25.11

Move lsp setup into filetype autocommands
Update
2026-03-11 09:45:47 +01:00 · 2026-03-11 09:31:56 +01:00 · 2026-03-02 19:56:20 +01:00 · 2026-03-02 19:40:10 +01:00 · 2026-02-27 15:29:53 +01:00 · 2026-02-24 19:26:38 +01:00
48 changed files with 2759 additions and 963 deletions
--- a/README.md
+++ b/README.md
@@ -0,0 +1,130 @@
+# Unified Nix Configuration
+
+This repository contains a modular, flake-based Nix configuration for multiple platforms and hosts. It provides a declarative and reproducible environment using NixOS, nix-darwin, and Home Manager.
+
+## Quick Start Guide
+
+### Daily Usage
+
+```bash
+# Apply changes (NixOS WSL)
+nixos-rebuild switch --sudo --flake .#work --impure
+
+# Apply changes (macOS)
+darwin-rebuild switch --flake .#Martins-MacBook-Pro
+
+# Update packages (weekly/monthly)
+nix flake update
+# ... then run the switch command for your host
+```
+
+## Structure
+
+The configuration is organized into `hosts` and `modules`:
+
+```
+.
+├── flake.nix               # Entry point with all system configurations
+├── flake.lock              # Locked dependency versions
+├── hosts/                  # Machine-specific configurations
+│   ├── home/               
+│   │   ├── darwin/         # Martins-MacBook-Pro
+│   │   ├── nix/            # Standalone Home Manager for Home
+│   │   └── nixos/          # Home NixOS Server
+│   └── work/
+│       ├── nix/            # Standalone Home Manager for Work
+│       └── nixos/          # Work NixOS (WSL)
+└── modules/                # Shared reusable modules
+    ├── home/               # Home Manager modules (sh, nvim, tmux, etc.)
+    └── nixos/              # NixOS-specific modules
+```
+
+## Available Configurations
+
+### NixOS
+- **work**: WSL-based NixOS environment for work (User: `pan`).
+- **home**: Server-based NixOS environment for home (User: `martin`).
+
+### Darwin (macOS)
+- **Martins-MacBook-Pro**: nix-darwin configuration for macOS.
+
+### Standalone Home Manager
+- **pan@work**: Home Manager for non-NixOS Linux at work.
+- **martin@mac**: Home Manager for macOS (without nix-darwin).
+
+## Installation & Usage
+
+### 1. Apply Configuration
+
+Navigate to the repository and run the appropriate command for your system:
+
+**NixOS (Work/WSL):**
+```bash
+sudo nixos-rebuild switch --flake .#work --impure
+```
+
+**Darwin (macOS):**
+```bash
+darwin-rebuild switch --flake .#Martins-MacBook-Pro
+```
+
+**Standalone Home Manager:**
+```bash
+home-manager switch --flake .#pan@work
+```
+
+*Note: The `--impure` flag may be required for certain configurations (like NIX_LD).*
+
+### 2. Updating System Packages
+
+To update all packages to the latest versions from nixpkgs-unstable:
+
+```bash
+# Update flake inputs
+nix flake update
+
+# Apply the updates
+sudo nixos-rebuild switch --flake .#work --impure
+```
+
+## Maintenance
+
+### Rollback
+If something breaks after an update, you can rollback to the previous generation:
+- **NixOS**: `sudo nixos-rebuild switch --rollback`
+- **Darwin**: `darwin-rebuild --rollback`
+
+### Cleanup
+Remove old generations to free up disk space:
+```bash
+# Delete generations older than 30 days
+sudo nix-collect-garbage --delete-older-than 30d
+
+# Or delete all old generations
+sudo nix-collect-garbage -d
+```
+
+## Modules Detail
+
+### Home Manager Modules (`modules/home/`)
+- **sh.nix**: Zsh configuration with completions and aliases.
+- **nvim.nix**: Personalized Neovim setup.
+- **tmux.nix**: Terminal multiplexer configuration.
+- **git.nix**: Git, Lazygit, and Jujutsu settings.
+- **dev.nix**: Development tools, language runtimes, and LLM tool configurations.
+- **task.nix**: Taskwarrior and productivity tools.
+
+### NixOS Modules (`modules/nixos/`)
+- **common.nix**: Shared system settings for all NixOS hosts.
+
+## Create Convenience Alias
+
+Add these to your shell configuration for faster updates:
+
+```bash
+# Quick rebuild (adjust to your host)
+alias nr='sudo nixos-rebuild switch --flake .#work --impure'
+
+# Update and rebuild
+alias nu='nix flake update && sudo nixos-rebuild switch --flake .#work --impure'
+```
--- a/TODO.md
+++ b/TODO.md
@@ -0,0 +1,98 @@
+# TODO - NixOS Configuration
+
+This file tracks remaining tasks and known issues for the NixOS configuration.
+
+## High Priority
+
+### Hardware Configuration
+- [ ] Replace `hardware-configuration.nix` with actual generated configuration
+  - Run `sudo nixos-generate-config --show-hardware-config > hardware-configuration.nix`
+  - Verify file systems are correctly configured
+  - Verify boot partition is correct
+  - Adjust CPU microcode (Intel vs AMD)
+
+### System Settings
+- [ ] Choose boot loader (systemd-boot vs GRUB)
+
+## Medium Priority
+
+### Tmux Configuration
+
+- [ ] Update note popup keybindings (C-n, C-p) with correct NixOS paths
+  - Current: Commented out (had WSL hard-coded paths)
+  - Action: Decide on note location and update paths
+  - Example: `~/Documents/notes/Work/quick_notes.md`
+
+- [ ] Verify `~/bin/tmuxp_selector.sh` script exists
+  - Used by `C-s` keybinding
+  - May need to be created or path adjusted
+
+## Low Priority
+
+### Shell Configuration
+
+- [ ] Consider adding additional shell aliases
+- [ ] Review if any macOS-specific tools need Linux alternatives
+
+### Documentation
+
+- [ ] Document custom Neovim configuration (lua files)
+- [ ] Create troubleshooting guide for common issues
+
+### Optimizations
+
+- [ ] Consider using `programs.zsh.shellInit` vs `initContent`
+- [ ] Review if `nix-ld` is actually needed (check use cases)
+- [ ] Consider splitting large modules into smaller files
+
+## Features Not Yet Ported
+
+These were not in the original Home Manager config but might be useful on NixOS:
+
+- [ ] Docker / Podman
+
+## Known Issues
+
+## Testing Checklist
+
+Before considering this configuration complete:
+
+- [ ] LSP servers work in Neovim
+
+## Future Enhancements
+
+- [ ] Add backup/restore scripts
+- [ ] Create CI/CD for testing configuration
+- [ ] Consider using flake-parts for better organization
+- [ ] Add system monitoring tools
+- [ ] Configure automatic updates
+- [ ] Add custom shell functions
+- [ ] Integrate with cloud sync for dotfiles
+
+## Notes
+
+### Unified Structure Benefits
+
+1. **Multi-platform support**: Added support for Darwin (macOS) and NixOS (WSL and native).
+2. **Modular Home Manager**: Reusable modules shared across all platforms.
+3. **Machine-specific configurations**: Separated into `hosts/` for better organization.
+4. **Flexible deployment**: Support for both NixOS modules and standalone Home Manager.
+
+### Migration Path
+
+This configuration is designed to be the central point for all machines:
+
+1. Clone to `~/dev/dot/newnix` (or preferred path).
+2. Identify your host type (NixOS WSL, Darwin, etc.).
+3. Apply the corresponding flake output as described in `README.md`.
+4. Test and verify workflows.
+
+## Questions to Resolve
+
+- [ ] What are the custom packages used for?
+- [ ] Are there any private/work-specific configurations to add?
+- [ ] Should we add any of the "Features Not Yet Ported"?
+- [ ] Is GPU acceleration needed (NVIDIA, AMD)?
+- [ ] Are there any cron jobs or systemd timers to configure?
+- [ ] Should we enable fish or keep only zsh?
+- [ ] Do we need any container tools (Docker, Podman)?
--- a/flake.lock
+++ b/flake.lock
@@ -0,0 +1,311 @@
+{
+  "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-stable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772985280,
+        "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-25.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager-wsl": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-wsl-stable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772985280,
+        "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-25.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773000227,
+        "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "nixos-vscode-server": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770124655,
+        "narHash": "sha256-yHmd2B13EtBUPLJ+x0EaBwNkQr9LTne1arLVxT6hSnY=",
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "rev": "92ce71c3ba5a94f854e02d57b14af4997ab54ef0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "type": "github"
+      }
+    },
+    "nixos-wsl": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs-wsl-stable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772455238,
+        "narHash": "sha256-QE29mlgasni5gszxs9/qNLnp6wvXgicP2iSh0gybPfw=",
+        "owner": "nix-community",
+        "repo": "nixos-wsl",
+        "rev": "eabb9a917f546c0bb64654850dd5f57f7694d1a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-25.11",
+        "repo": "nixos-wsl",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1772963539,
+        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1769909678,
+        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "72716169fe93074c333e8d0173151350670b824c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1773068389,
+        "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-wsl-stable": {
+      "locked": {
+        "lastModified": 1773068389,
+        "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "home-manager-wsl": "home-manager-wsl",
+        "nix-darwin": "nix-darwin",
+        "nixos-vscode-server": "nixos-vscode-server",
+        "nixos-wsl": "nixos-wsl",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-wsl-stable": "nixpkgs-wsl-stable",
+        "sops-nix": "sops-nix",
+        "tasksquire": "tasksquire"
+      }
+    },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773096132,
+        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "tasksquire": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1771878653,
+        "narHash": "sha256-+OkJmYH+h5dgAbUtbGq8fZ90g5/rwiew5WPmbexD9kI=",
+        "ref": "dev",
+        "rev": "6b1418fc71be513ba5ebb718da29e3190c3fda58",
+        "revCount": 52,
+        "type": "git",
+        "url": "ssh://git@git.pander.me/martin/tasksquire.git"
+      },
+      "original": {
+        "ref": "dev",
+        "type": "git",
+        "url": "ssh://git@git.pander.me/martin/tasksquire.git"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake.nix
+++ b/flake.nix
@@ -0,0 +1,149 @@
+{
+  description = "Unified Nix Configuration";
+
+  inputs = {
+    # Unstable for standalone configurations and overlays
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
+
+    nixpkgs-wsl-stable.url = "github:nixos/nixpkgs/nixos-25.11";
+
+    nixos-wsl = {
+      url = "github:nix-community/nixos-wsl/release-25.11";
+      inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
+    };
+
+    home-manager = {
+      url = "github:nix-community/home-manager/release-25.11";
+      inputs.nixpkgs.follows = "nixpkgs-stable";
+    };
+
+    home-manager-wsl = {
+      url = "github:nix-community/home-manager/release-25.11";
+      inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
+    };
+
+    nix-darwin = {
+      url = "github:LnL7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # individual packages
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nixos-vscode-server = {
+      url = "github:nix-community/nixos-vscode-server";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    tasksquire = {
+      url = "git+ssh://git@git.pander.me/martin/tasksquire.git?ref=dev";
+    };
+  };
+
+  outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-wsl-stable, nixos-wsl, home-manager, home-manager-wsl, nix-darwin, ... }@inputs:
+    let
+      linuxSystem = "x86_64-linux";
+      linuxAarchSystem = "aarch64-linux";
+      darwinSystem = "aarch64-darwin";
+
+      pkgsLinux = nixpkgs.legacyPackages.${linuxSystem};
+      pkgsLinuxAarch = nixpkgs.legacyPackages.${linuxAarchSystem};
+      pkgsDarwin = nixpkgs.legacyPackages.${darwinSystem};
+    in
+    {
+
+      # --- NixOS Systems ---
+      nixosConfigurations = {
+
+        # Work WSL
+        "nixos@work" = nixpkgs-wsl-stable.lib.nixosSystem {
+          specialArgs = { inherit self inputs; };
+          modules = [
+            nixos-wsl.nixosModules.wsl
+            ./hosts/work/nixos/configuration.nix
+            home-manager.nixosModules.home-manager
+            {
+              nixpkgs.hostPlatform = linuxSystem;
+              nixpkgs.config.allowUnfree = true;
+              nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = {
+                inherit self inputs;
+              };
+              home-manager.users.pan = import ./hosts/work/nixos/home.nix;
+            }
+            inputs.nixos-vscode-server.nixosModules.default
+            ({ pkgs,  ... }: {
+                services.vscode-server.enable = true;
+            })
+          ];
+        };
+
+        # Home
+        "nixos@home" = nixpkgs-stable.lib.nixosSystem {
+          specialArgs = {
+            inherit self inputs;
+          };
+          modules = [
+            ./hosts/home/nixos/configuration.nix
+            home-manager.nixosModules.home-manager
+            {
+              nixpkgs.hostPlatform = linuxAarchSystem;
+              nixpkgs.config.allowUnfree = true;
+              nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = {
+                inherit self inputs;
+              };
+              home-manager.users.martin = import ./hosts/home/nixos/home.nix;
+            }
+          ];
+        };
+      };
+
+      # --- Darwin Systems (Mac) ---
+      darwinConfigurations."Martins-MacBook-Pro" = nix-darwin.lib.darwinSystem {
+        specialArgs = { inherit self inputs; };
+        modules = [
+          ./hosts/home/darwin/configuration.nix
+          {
+            nixpkgs.hostPlatform = darwinSystem;
+          }
+        ];
+      };
+
+      # --- Standalone Home Manager ---
+      homeConfigurations = {
+        "nix@work" = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs-stable.legacyPackages.${linuxSystem};
+          extraSpecialArgs = { inherit self inputs; };
+          modules = [
+            ./hosts/work/nix/home.nix
+            {
+              nixpkgs.config.allowUnfree = true;
+              nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
+            }
+          ];
+        };
+
+        "nix@home" = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs-stable.legacyPackages.${darwinSystem};
+          extraSpecialArgs = { inherit self inputs; };
+          modules = [
+            ./hosts/home/nix/home.nix
+            {
+              nixpkgs.config.allowUnfree = true;
+              nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
+            }
+          ];
+        };
+      };
+    };
+}
--- a/hosts/home/common.nix
+++ b/hosts/home/common.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ../../modules/home/common.nix
+  ];
+
+  programs.git.settings.user = {
+    name = "Martin Pander";
+    email = "git@pander-on.de";
+  };
+
+  programs.jujutsu.settings.user = {
+    name = "Martin Pander";
+    email = "git@pander-on.de";
+  };
+
+  dot.llm = {
+    enable = true;
+    gemini-cli.enable = true;
+    opencode.enable = true;
+    opencode.enableConfig = true;
+  };
+}
--- a/hosts/home/darwin/configuration.nix
+++ b/hosts/home/darwin/configuration.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, self, ... }:
+
+{
+  # Minimal system configuration
+  environment.systemPackages = [ pkgs.vim ];
+  
+  services.nix-daemon.enable = true;
+  
+  nix.settings.experimental-features = "nix-command flakes";
+  
+  programs.zsh.enable = true;
+  
+  # Set Git commit hash for darwin-version.
+  system.configurationRevision = self.rev or self.dirtyRev or null;
+  
+  system.stateVersion = 4;
+  
+  nixpkgs.hostPlatform = "aarch64-darwin";
+}
--- a/hosts/home/nix/home.nix
+++ b/hosts/home/nix/home.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ../common.nix
+  ];
+
+  home.username = "martin";
+  home.homeDirectory = "/Users/martin";
+
+  home.stateVersion = "24.05";
+}
--- a/hosts/home/nixos/configuration.nix
+++ b/hosts/home/nixos/configuration.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../modules/nixos/common.nix
+  ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+
+  networking.hostName = "macnix";
+
+  users.users.martin = {
+    isNormalUser = true;
+    extraGroups = [ "networkmanager" "wheel" ];
+    uid = 1000;
+    shell = pkgs.zsh;
+  };
+
+  services.openssh.enable = true;
+
+  environment.systemPackages = [
+    pkgs.ghostty.terminfo 
+  ];
+
+  system.stateVersion = "25.11";
+}
--- a/hosts/home/nixos/home.nix
+++ b/hosts/home/nixos/home.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ../common.nix
+  ];
+
+  # User details
+  home.username = "martin";
+  home.homeDirectory = "/home/martin";
+
+  home.stateVersion = "25.11";
+}
--- a/hosts/work/common.nix
+++ b/hosts/work/common.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ../../modules/home/common.nix
+  ];
+
+  programs.git.settings.user = {
+    name = "Martin Pander";
+    email = "martin.pander@knowtion.de";
+  };
+
+  programs.jujutsu.settings.user = {
+    name = "Martin Pander";
+    email = "martin.pander@knowtion.de";
+  };
+
+  dot.llm = {
+    enable = true;
+    claude-code.enable = true;
+    opencode.enable = true;
+    opencode.enableConfig = true;
+    opencode.workMode = true;
+  };
+
+  dot.tmux.workMode = true;
+  dot.nvim.workMode = true;
+}
--- a/hosts/work/nix/home.nix
+++ b/hosts/work/nix/home.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ../common.nix
+  ];
+
+  home.username = "pan";
+  home.homeDirectory = "/home/pan";
+
+  home.packages = with pkgs; [
+    nix-ld
+  ];
+
+  home.stateVersion = "23.11";
+
+  dot.sh.sourceProfile = true;
+
+}
--- a/hosts/work/nixos/configuration.nix
+++ b/hosts/work/nixos/configuration.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../modules/nixos/common.nix
+  ];
+
+  wsl.enable = true;
+  wsl.defaultUser = "pan";
+  wsl.interop.register = true;
+
+  networking.hostName = "nix";
+
+  users.users.pan = {
+    isNormalUser = true;
+    extraGroups = [ "networkmanager" "wheel" ];
+    uid = 1000;
+    shell = pkgs.zsh;
+  };
+
+  fileSystems."/home/pan/pro" = {
+    device = "/dev/disk/by-uuid/9a37862c-85db-4434-b06a-ec8c2713ecc9";
+    fsType = "ext4"; # or xfs, etc.
+    options = [ "defaults" "nofail" "x-systemd.automount" ];
+  };
+
+  system.stateVersion = "25.05"; 
+}
--- a/hosts/work/nixos/home.nix
+++ b/hosts/work/nixos/home.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ../common.nix
+  ];
+
+  # User details
+  home.username = "pan";
+  home.homeDirectory = "/home/pan";
+
+  # Home Manager release version
+  home.stateVersion = "25.05";
+
+  # Disable version mismatch warning (intentionally using HM 25.11 with nixpkgs 25.05)
+  home.enableNixpkgsReleaseCheck = false;
+}
--- a/modules/home/common.nix
+++ b/modules/home/common.nix
@@ -0,0 +1,60 @@
+{ config, pkgs, lib, ... }:
+
+{
+  options.dot = {
+    dotfilesPath = lib.mkOption {
+      type = lib.types.str;
+      default = "${config.home.homeDirectory}/dev/dot";
+      description = "Absolute path to the dotfiles repository on the local machine.";
+    };
+  };
+
+  imports = [
+    ./secrets.nix
+    ./sh.nix
+    ./tmux.nix
+    ./git.nix
+    ./dev.nix
+    ./nvim.nix
+    ./task.nix
+    ./opencode.nix
+  ];
+
+  config = {
+    home.packages = with pkgs; [
+      nerd-fonts.fira-code
+      nil # Nix LSP
+
+      # Language servers
+      yaml-language-server
+      marksman
+      pkgs.unstable.dockerfile-language-server  # Use unstable for latest LSP features
+
+      # Secrets management
+      sops
+      age
+    ];
+
+    programs.ssh = {
+      enable = true;
+      enableDefaultConfig = false;
+      includes = [ "config.local" ];
+      matchBlocks = {
+        "*" = {
+          addKeysToAgent = "yes";
+        };
+
+        "git.pander.me" = {
+          hostname = "git.pander.me";
+          user = "git";
+          identityFile = "~/.ssh/private_git";
+          port = 2222;
+        };
+      };
+    };
+
+    news.display = "silent";
+
+    programs.home-manager.enable = true;
+  };
+}
--- a/modules/home/dev.nix
+++ b/modules/home/dev.nix
@@ -0,0 +1,53 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.dot.llm;
+in
+{
+  options.dot.llm = {
+    enable = lib.mkEnableOption "LLM tools";
+    claude-code.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable claude-code";
+    };
+    opencode.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable opencode";
+    };
+    gemini-cli.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable gemini-cli";
+    };
+    bubblewrap.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = pkgs.stdenv.isLinux;
+      description = "Enable bubblewrap (Linux only)";
+    };
+  };
+
+  config = lib.mkMerge [
+    {
+      programs.direnv = {
+        enable = true;
+        enableZshIntegration = true;
+        nix-direnv.enable = true;
+      };
+
+      home.packages = with pkgs; [
+        visidata
+        codespelunker
+      ];
+    }
+    
+    (lib.mkIf cfg.enable {
+      home.packages =
+        (lib.optional cfg.claude-code.enable pkgs.unstable.claude-code) ++
+        (lib.optional cfg.opencode.enable pkgs.unstable.opencode) ++
+        (lib.optional cfg.gemini-cli.enable pkgs.unstable.gemini-cli) ++
+        (lib.optional (cfg.bubblewrap.enable && pkgs.stdenv.isLinux) pkgs.unstable.bubblewrap);
+    })
+  ];
+}
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -0,0 +1,91 @@
+{ config, pkgs, lib, ... }:
+
+{
+  programs.git = {
+    enable = true;
+    settings = {
+      alias = {
+        st = "status";
+        ci = "commit";
+        co = "checkout";
+        br = "branch";
+        pl = "pull";
+        ps = "push";
+        sw = "switch";
+        mno =" merge --no-ff";
+        lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit";
+        cleanup = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D";
+      };
+
+      column.ui = "auto";
+      branch.sort = "-committerdate";
+      tag.sort = "version:refname";
+      diff = {
+        algorithm = "histogram";
+        colorMoved = "plain";
+        mnemonicPrefix = "true";
+        renames = "true";
+      };
+      pull.rebase = "true";
+      push = {
+        default = "simple";
+        autoSetupRemote = "true";
+        followTags = "true";
+      };
+      fetch = {
+        prune = "true";
+        pruneTags = "true";
+        all = "true";
+      };
+      help.autocorrect = "prompt";
+      commit.verbose = "true";
+      rerere = {
+        enabled = "true";
+        autoupdate = "true";
+      };
+      rebase = {
+        autoSquas = "true";
+        autoStash = "true";
+        updateRefs = "true";
+      };
+      merge.conflictstyle = "zdiff3";
+      core.editor = "nvim";
+      init.defaultBranch = "main";
+    };
+
+    ignores = [
+      ".direnv/"
+      ".envrc"
+    ];
+  };
+
+  # Difftastic - modern diff tool
+  programs.difftastic = {
+    enable = true;
+    git.enable = true;
+  };
+
+  programs.lazygit = {
+    enable = true;
+    settings = {
+      theme.lightTheme = "true";
+      git = {
+        log = {
+          format = "%C(yellow)%h%Creset %C(bold blue)<%an>%Creset %s %Cgreen(%cr)%Creset";
+          graph = "true";
+        };
+      };
+    };
+  };
+
+  programs.jujutsu = {
+    enable = true;
+    settings = {
+      aliases = {
+        tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
+        lg = ["log"];
+        des = ["describe"];
+      };
+    };
+  };
+}
--- a/modules/home/nvim.nix
+++ b/modules/home/nvim.nix
@@ -0,0 +1,103 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.dot.nvim;
+in
+{
+  options.dot.nvim = {
+    workMode = lib.mkEnableOption "work-specific neovim configuration";
+  };
+
+  config = {
+    programs.neovim = {
+      enable = true;
+
+      defaultEditor = true;
+      vimAlias = true;
+
+      plugins = with pkgs.vimPlugins; [
+        vim-repeat
+        vim-surround
+        ts-comments-nvim
+        vim-fugitive
+        gitsigns-nvim
+        nvim-tree-lua
+        targets-vim
+        mini-pairs
+        mini-align
+        mini-bracketed
+        mini-splitjoin
+        mini-move
+        mini-ai
+        mini-icons
+        flash-nvim
+        trouble-nvim
+        conform-nvim
+        nvim-lint
+        promise-async
+        nvim-ufo
+        vim-windowswap
+        plenary-nvim
+        telescope-nvim
+        telescope-fzf-native-nvim
+        telescope-ui-select-nvim
+        yanky-nvim
+        lualine-nvim
+        undotree
+        luasnip
+        nvim-cmp
+        cmp_luasnip
+        cmp-buffer
+        cmp-path
+        cmp-cmdline
+        cmp-nvim-lsp
+        cmp-nvim-lsp-signature-help
+        cmp_yanky
+        cmp-git
+        nvim-lspconfig
+        lspkind-nvim
+        copilot-lua
+        copilot-cmp
+        CopilotChat-nvim
+        # opencode-nvim
+        bullets-vim
+        nvim-dap
+        nvim-nio
+        # nvim-dap-ui
+        nvim-dap-view
+        nvim-dap-virtual-text
+        nvim-dap-go
+        nvim-dap-python
+        nvim-dap-lldb
+        todo-comments-nvim
+        vim-markdown
+        zen-mode-nvim
+        plantuml-syntax
+        obsidian-nvim
+        render-markdown-nvim
+        image-nvim
+        img-clip-nvim
+        vim-nix
+        (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ]))
+      ];
+
+      extraLuaConfig = ''
+        _G.is_work = ${if cfg.workMode then "true" else "false"}
+        _G.is_mac = ${if pkgs.stdenv.isDarwin then "true" else "false"}
+        _G.is_private_nixos = ${if !cfg.workMode && pkgs.stdenv.isLinux then "true" else "false"}
+
+        require('base')
+        require('keymaps')
+        require('plugins')
+        require('filetype')
+      '';
+    };
+
+    # Allow for editing the lua modules without a nix rebuild
+    xdg.configFile."nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "${config.dot.dotfilesPath}/modules/nvim/lua";
+
+    home.packages = with pkgs; [
+      nodejs-slim
+    ];
+  };
+}
--- a/modules/home/opencode.nix
+++ b/modules/home/opencode.nix
@@ -0,0 +1,89 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.dot.llm.opencode;
+in
+{
+  options.dot.llm.opencode = {
+    enableConfig = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable managed OpenCode configuration";
+    };
+
+    workMode = lib.mkEnableOption "work-specific opencode configuration";
+  };
+
+  config = lib.mkIf cfg.enableConfig {
+    # Declare the sops secret
+    sops.secrets.langdock_api_key = {
+      # Uses defaultSopsFile from secrets.nix
+    };
+
+    # Create the OpenCode config.json template with secret substitution
+    sops.templates."opencode/opencode.json" = {
+      content = builtins.toJSON (let
+        baseConfig = {
+          "$schema" = "https://opencode.ai/config.json";
+          default_agent = "plan";
+        };
+
+        workConfig = {
+          enabled_providers = [ "anthropic" "langdock-openai" "ollama" ];
+          model = "anthropic/claude-opus-4-6-default";
+          small_model = "anthropic/claude-haiku-4-5-20251001";
+          provider = {
+            langdock-openai = {
+              npm = "@ai-sdk/openai-compatible";
+              name = "Langdock OpenAI";
+              options = {
+                baseURL = "https://api.langdock.com/openai/eu/v1";
+                apiKey = config.sops.placeholder.langdock_api_key;
+              };
+              models = {
+                "gpt-5.2" = { name = "GPT-5.2"; };
+                "gpt-5-mini" = { name = "GPT-5 mini"; };
+              };
+            };
+            anthropic = {
+              options = {
+                baseURL = "https://api.langdock.com/anthropic/eu/v1";
+                apiKey = config.sops.placeholder.langdock_api_key;
+              };
+              models = {
+                "claude-opus-4-6-default" = { name = "Opus 4.6"; };
+                "claude-sonnet-4-6-default" = { name = "Sonnet 4.6"; };
+                "claude-haiku-4-5-20251001" = { name = "Haiku 4.5"; };
+              };
+              whitelist = [ "claude-opus-4-6-default" "claude-sonnet-4-6-default" "claude-haiku-4-5-20251001"];
+            };
+            ollama = {
+              npm = "@ai-sdk/openai-compatible";
+              name = "Ollama (Local)";
+              options = {
+                baseURL = "http://192.168.11.23:11434/v1";
+              };
+              models = {
+                "qwen3-coder:30b" = { name = "Qwen 3 Coder 30B"; };
+                "codellama:34b-instruct" = { name = "CodeLlama 34B Instruct"; };
+              };
+            };
+          };
+        };
+
+        personalConfig = {
+          plugin = [ "opencode-gemini-auth@latest" ];
+          model = "google/gemini-3-pro-preview";
+          small_model = "google/gemini-3-flash-preview";
+          enabled_providers = [ "google" ];
+        };
+      in
+        # Merge base config with the selected mode config
+        baseConfig // (if cfg.workMode then workConfig else personalConfig)
+      );
+    };
+
+    # Link the generated config to the expected location
+    xdg.configFile."opencode/opencode.json".source = config.lib.file.mkOutOfStoreSymlink config.sops.templates."opencode/opencode.json".path;
+  };
+}
--- a/modules/home/secrets.nix
+++ b/modules/home/secrets.nix
@@ -0,0 +1,20 @@
+{ inputs, config, ... }:
+
+{
+  imports = [
+    inputs.sops-nix.homeManagerModules.sops
+  ];
+
+  sops = {
+    defaultSopsFile = ../../secrets/secrets.yaml;
+    defaultSopsFormat = "yaml";
+
+    age = {
+      keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
+    };
+  };
+
+  home.sessionVariables = {
+    SOPS_AGE_KEY_FILE = config.sops.age.keyFile;
+  };
+}
--- a/modules/home/sh.nix
+++ b/modules/home/sh.nix
@@ -0,0 +1,110 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.dot.sh;
+in
+{
+  options.dot.sh = {
+    sourceProfile = lib.mkEnableOption "sourcing of $HOME/.profile in zsh profileExtra";
+  };
+
+  config = {
+    programs.zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
+
+      history.size = 500000;
+
+      prezto = {
+        enable = true;
+        caseSensitive = true;
+        color = true;
+        editor = {
+          dotExpansion = true;
+          keymap = "vi";
+        };
+        pmodules = [
+          "environment"
+          "terminal"
+          "editor"
+          "history"
+          "directory"
+          "spectrum"
+          "utility"
+          "completion"
+          "ssh"
+          "syntax-highlighting"
+          "history-substring-search"
+          "prompt"
+          "git"
+        ];
+        prompt.theme = "minimal";
+        syntaxHighlighting.highlighters = [
+          "main"
+          "brackets"
+          "pattern"
+          "line"
+          "cursor"
+          "root"
+        ];
+        tmux = {
+          autoStartLocal = true;
+          itermIntegration = true;
+        };
+      };
+
+      initContent = ''
+        HISTCONTROL='erasedups:ignoreboth'
+        HISTIGNORE='&:[ ]*:exit:ls:bg:fg:history:clear'
+        unsetopt beep
+      '';
+
+      profileExtra = lib.mkIf cfg.sourceProfile ''
+        source $HOME/.profile
+      '';
+    };
+
+    programs.fzf = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    programs.lsd = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    programs.zoxide = {
+      enable = true;
+      enableZshIntegration = true;
+      options = [
+        "--cmd cd"
+      ];
+    };
+
+    programs.bat.enable = true;
+    programs.ripgrep.enable = true;
+    programs.btop.enable = true;
+    programs.ranger.enable = true;
+
+    home.packages = with pkgs; [
+      fd
+      dust
+      glow
+      ripgrep-all
+      viddy
+      duf
+      lsof
+    ];
+
+    home.sessionVariables = {
+      BAT_THEME = "Coldark-Cold";
+    };
+
+    home.shellAliases = {
+      lst = "lsd --tree";
+    };
+  };
+}
--- a/modules/home/task.nix
+++ b/modules/home/task.nix
@@ -0,0 +1,76 @@
+{config, pkgs, lib, inputs, ...}:
+
+{
+  programs.taskwarrior = {
+    enable = true;
+    colorTheme = "light-256";
+    package = pkgs.taskwarrior3;
+    config = {
+      weekstart = "monday";
+
+      uda.tasksquire.tags.default="code,comm,cust,del,doc,mngmnt,ops,rsrch,rvw,track";
+
+      uda.parenttask.type="string";
+      uda.parenttask.label="Parent";
+
+      uda.energy.type="string";
+      uda.energy.label="Energy";
+      uda.energy.values="h,m,l";
+      uda.energy.default="m";
+
+      uda.priority.values = "H,M,,L";
+      urgency.uda.priority.L.coefficient = -0.5;
+      urgency.user.tag.deferred.coefficient = -15.0;
+      urgency.user.tag.cust.coefficient = 5.0;
+      urgency.user.tag.fixed.coefficient = -100.0;
+
+      report.next.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
+      report.next.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
+      report.next.filter="status:pending -WAITING -deferred -track";
+
+      report.time.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
+      report.time.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
+      report.time.filter="status:pending -WAITING -deferred +fixed";
+
+      report.deferred.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
+      report.deferred.context="1";
+      report.deferred.description="Deferred and waiting tasks";
+      report.deferred.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
+      report.deferred.filter="status:pending +deferred";
+      report.deferred.sort="urgency-";
+
+      report.low.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
+      report.low.context="1";
+      report.low.description="Low energy tasks";
+      report.low.filter="status:pending -WAITING -deferred";
+      report.low.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
+      report.low.sort="energy+,urgency-";
+
+      context.today.read = "(prio:H or +next)";
+      context.today.write = "prio:H +next";
+      context.deferred.read = "+deferred";
+      context.deferred.write = "+deferred";
+      context.customer.read = "+cust";
+      context.customer.write = "+cust";
+      context.low_energy.read = "+low";
+      context.low_energy.write = "+low";
+
+      uda.taskwarrior-tui.task-report.show-info = false;
+      uda.taskwarrior-tui.selection.reverse = "yes";
+    };
+  };
+
+  home.packages = with pkgs; [
+    taskwarrior-tui
+    unstable.timewarrior
+    inputs.tasksquire.packages.${pkgs.system}.default
+  ];
+
+  home.shellAliases = lib.mkMerge [ {
+      t = "task";
+      tt = "taskwarrior-tui";
+      tw = "timew";
+      tws = "timew summary :ids";
+    }
+  ];
+}
--- a/modules/home/tmux.nix
+++ b/modules/home/tmux.nix
@@ -0,0 +1,86 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.dot.tmux;
+in
+{
+  options.dot.tmux = {
+    workMode = lib.mkEnableOption "work-specific tmux configuration";
+  };
+
+  config = {
+    programs.tmux = {
+      enable = true;
+      shortcut = "a";
+      mouse = true;
+      keyMode = "vi";
+      escapeTime = 10;
+      terminal = "screen-256color";
+      tmuxp.enable = true;
+      extraConfig = ''
+        set -g display-time 1500
+
+        unbind S
+        bind S command-prompt "switch -t %1"
+        bind-key , command-prompt -p "rename-window:" "rename-window '%%'"
+
+        # Check if we are in vim
+        is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+
+        bind-key -n C-M-h if-shell "$is_vim" { send-keys C-M-h } { if -F "#{pane_at_left}" "previous-window" "select-pane -L" }
+        bind-key -n C-M-j if-shell "$is_vim" { send-keys C-M-j } { if -F "#{pane_at_bottom}" "switch-client -n" "select-pane -D" }
+        bind-key -n C-M-k if-shell "$is_vim" { send-keys C-M-k } { if -F "#{pane_at_top}" "switch-client -p" "select-pane -U" }
+        bind-key -n C-M-l if-shell "$is_vim" { send-keys C-M-l } { if -F "#{pane_at_right}" "next-window" "select-pane -R" }
+
+        bind '"' split-window -c "#{pane_current_path}"
+        bind % split-window -h -c "#{pane_current_path}"
+        bind c new-window -a -c "#{pane_current_path}"
+
+        bind C-g display-popup -E -d "#{pane_current_path}" -xC -yC -w 95% -h 95% "lazygit"
+        bind C-t display-popup -E -xC -yC -w 95% -h 95% "tasksquire"
+
+        ${lib.optionalString cfg.workMode ''
+          bind C-s display-popup -E "zsh ~/bin/tmuxp_selector.sh"
+          bind C-n display-popup -E -xC -yC -w 95% -h 95% -d "~/Documents/notes/Work/" "vim quick_notes.md"
+          bind C-p display-popup -E -xC -yC -w 95% -h 95% -d "~/Documents/notes/Work/development/" "vim mbpr.md"
+        ''}
+
+        #######################################
+        # status line
+        #######################################
+        set -g status-justify centre
+
+        set -g status-left "#[bg=#808080,fg=#ffffff,bold] #S #[default]#[bg=#BCBCBC] #{-30:pane_title} "
+        set -g status-left-length 40
+
+        set -g status-right "#[bg=#BCBCBC] %H:%M #[bg=#808080,fg=#ffffff] %d.%m.%y "
+
+        # setw -g window-status-format " #W#F "
+        # setw -g window-status-current-format " #W#F "
+        setw -g window-status-format " #W "
+        setw -g window-status-current-format " #W "
+        setw -g window-status-separator ""
+
+        #######################################
+        # colors, taken from vim-lucius
+        #######################################
+        set -g status-style "bg=#DADADA,fg=#000000"
+
+        setw -g window-status-style "bg=#BCBCBC,fg=#000000"
+        setw -g window-status-current-style "bg=#808080,fg=#ffffff"
+
+        setw -g window-status-activity-style "bg=#AFD7AF,fg=#000000"
+        setw -g window-status-bell-style "bg=#AFD7AF,fg=#000000"
+        #setw -g window-status-content-style "bg=#AFD7AF,fg=#000000"
+
+        set -g pane-active-border-style "bg=#eeeeee,fg=#006699"
+        set -g pane-border-style "bg=#eeeeee,fg=#999999"
+      '';
+    };
+
+    home.shellAliases = {
+      "o" = "tmuxp";
+      "ol" = "tmuxp load";
+    };
+  };
+}
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -0,0 +1,46 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ./secrets.nix
+  ];
+
+  time.timeZone = "Europe/Berlin";
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+
+  programs.zsh.enable = true;
+  programs.ssh.startAgent = true;
+  programs.nix-ld.enable = true;
+
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+    auto-optimise-store = true;
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
+  };
+
+  environment.systemPackages = with pkgs; [
+    git
+    wget
+    curl
+    vim
+  ];
+}
--- a/modules/nixos/secrets.nix
+++ b/modules/nixos/secrets.nix
@@ -0,0 +1,18 @@
+{ inputs, config, ... }:
+
+{
+  imports = [
+    inputs.sops-nix.nixosModules.sops
+  ];
+
+  sops = {
+    defaultSopsFile = ../../secrets/secrets.yaml;
+    defaultSopsFormat = "yaml";
+
+    age = {
+      sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+      # keyFile = "/var/lib/sops-nix/key.txt";
+      # generateKey = true;
+    };
+  };
+}
--- a/modules/nvim/lua/base.lua
+++ b/modules/nvim/lua/base.lua
@@ -0,0 +1,181 @@
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
+-------------------------
+-------- OPTIONS --------
+-------------------------
+vim.opt.mouse = 'a'
+vim.opt.history = 1000
+vim.opt.ruler = true
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.showcmd = true
+vim.opt.ttimeoutlen = 100
+vim.opt.backspace = 'indent,eol,start'
+vim.opt.tabstop = 2
+vim.opt.expandtab = true
+vim.opt.shiftwidth = 2
+vim.opt.softtabstop = 2
+vim.opt.autoindent = true
+vim.opt.showmatch = true
+vim.opt.incsearch = true
+vim.opt.hlsearch = true
+vim.opt.wrapscan = true
+vim.opt.ignorecase = true
+vim.opt.smartcase = true
+vim.opt.hidden = true
+vim.opt.splitright = true
+vim.opt.splitbelow = true
+vim.opt.swapfile = true
+vim.opt.directory= '~/.cache/nvim/swap//,$TEMP//,/tmp//'
+vim.opt.wildmode = 'longest,list'
+vim.opt.wildignore = vim.opt.wildignore + 'main,*.o,*.d,*.aux,*.bbl,*.lof,*.loa,*.blg,*.fdb_latexmk,*.fls,*.tdo,*.pdf,*.pyc'
+vim.opt.spell = false
+vim.opt.foldmethod = 'syntax'
+vim.opt.foldopen = vim.opt.foldopen - 'block'
+vim.opt.foldlevel = 99
+vim.opt.lazyredraw = true
+vim.opt.listchars = 'eol:¬,tab:▸ ,trail:·'
+vim.opt.list = true
+vim.opt.laststatus = 3
+vim.opt.scrolloff = 8
+vim.opt.background = 'light'
+vim.opt.wrap = true
+vim.opt.showbreak = '..'
+vim.opt.errorbells = false
+vim.opt.visualbell = false
+vim.opt.title = true
+vim.opt.autoread = true
+vim.opt.syntax = 'on'
+vim.opt.encoding = 'utf-8'
+vim.opt.completeopt = 'menu,menuone,noselect'
+vim.opt.termguicolors = true
+vim.opt.conceallevel = 1
+
+
+----------------------------
+-------- CLIPBOARD ---------
+----------------------------
+if vim.fn.has("wsl") == 1 then
+  vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
+end
+
+
+----------------------------
+-------- COMMANDS ----------
+----------------------------
+
+vim.cmd('filetype plugin indent on')
+
+-- vim.cmd('colorscheme lucius')
+-- vim.cmd('LuciusWhite')
+
+
+----------------------------
+-------- AUTOGROUPS --------
+----------------------------
+
+vim.api.nvim_create_augroup('VimIntern', { clear = true })
+
+vim.api.nvim_create_autocmd({'FocusGained', 'BufEnter', 'CursorMoved', 'CursorMovedI', 'CursorHold', 'CursorHoldI'}, {
+   group = 'VimIntern',
+   pattern = '*',
+   command = 'silent! checktime'
+})
+
+-- vim.api.nvim_create_autocmd('BufEnter', {
+--    group = 'VimIntern',
+--    pattern = '*',
+--    command = 'silent! lcd %:p:h'
+-- })
+
+-- Open nvim-tree when starting Neovim in a specific directory or any of its subdirectories
+vim.api.nvim_create_autocmd("VimEnter", {
+  callback = function()
+    local args = vim.fn.argv()
+    
+    if #args > 0 then
+      local current_dir = vim.fn.fnamemodify(args[1], ":p:h")
+      local dir_name = vim.fn.fnamemodify(current_dir, ":t")
+      
+      -- Check if in a "notes" directory or its subdirectory
+      local in_notes = dir_name == "notes"
+      if not in_notes then
+        -- Check if any parent directory is named "notes"
+        local path_parts = vim.split(current_dir, "/", {plain = true})
+        for i, part in ipairs(path_parts) do
+          if part == "notes" then
+            in_notes = true
+            break
+          end
+        end
+      end
+      
+      -- If in a notes directory or subdirectory, open the tree
+      if in_notes then
+        require("nvim-tree.api").tree.open()
+        vim.defer_fn(function()
+          require("nvim-tree.api").tree.expand_all()
+          -- After expanding, return focus to the main window/buffer
+          vim.cmd("wincmd p")
+        end, 100) -- Small delay to ensure tree is fully loaded before expanding
+      end
+    end
+  end
+})
+
+---------------------------
+-------- FUNCTIONS --------
+---------------------------
+
+vim.api.nvim_create_user_command('TrimWhiteSpace', function()
+   vim.cmd('%s/\\s\\+$//e')
+end, {})
+
+function ToggleDiagnostics()
+  vim.diagnostic.enable(not vim.diagnostic.is_enabled())
+  if vim.diagnostic.is_enabled() then
+    print("Diagnostics enabled")
+  else
+    print("Diagnostics disabled")
+  end
+end
+
+
+---------------------------
+------- DIAGNOSTICS -------
+---------------------------
+
+vim.diagnostic.config({
+  update_in_insert = true,
+  signs = true,
+  virtual_text = {
+    prefix = '● ',
+    current_line = false,
+    severity = {
+      -- min = vim.diagnostic.severity.INFO,
+      max = vim.diagnostic.severity.INFO,
+    },
+  },
+  virtual_lines = {
+    current_line = false,
+    severity = {
+      min = vim.diagnostic.severity.WARN,
+      -- max = vim.diagnostic.severity.WARN,
+    },
+  },
+  float = {
+    prefix = '',
+    focusable = false,
+    style = "minimal",
+    border = "rounded",
+    source = "always",
+    header = "",
+  },
+})
+
+vim.cmd([[highlight DiagnosticUnderlineError gui=undercurl guifg=Red]])
+vim.cmd([[highlight DiagnosticUnderlineWarn gui=undercurl guifg=Yellow]])
+vim.cmd([[highlight DiagnosticUnderlineInfo gui=undercurl guifg=Blue]])
+vim.cmd([[highlight DiagnosticUnderlineHint gui=undercurl guifg=Cyan]])
+
--- a/modules/nvim/lua/filetype.lua
+++ b/modules/nvim/lua/filetype.lua
@@ -0,0 +1,231 @@
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true })
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = 'python',
+  once = true,
+  callback = function()
+    require('dap-python').setup()
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = 'go',
+  once = true,
+  callback = function()
+    vim.lsp.enable('ty')
+    vim.lsp.enable('gopls')
+    require('dap-go').setup()
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = 'proto',
+  once = true,
+  callback = function()
+    vim.lsp.config('buf_ls', {
+      cmd = { 'buf', 'lsp', 'serve' },
+      filetypes = { 'proto' },
+      root_markers = { 'buf.yaml', '.git' },
+    })
+
+    vim.lsp.enable('buf_ls')
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = 'markdown',
+  once = true,
+  callback = function()
+    vim.lsp.enable('marksman')
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = 'sql',
+  once = true,
+  callback = function()
+    vim.lsp.enable('sqls')
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = { 'dockerfile', 'yaml.docker-compose' },
+  once = true,
+  callback = function()
+    vim.lsp.enable('dockerls')
+    vim.lsp.enable('docker_compose_language_service')
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = 'rust',
+  once = true,
+  callback = function()
+    vim.lsp.enable('rust_analyzer')
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = { 'c', 'cpp' },
+  once = true,
+  callback = function()
+    vim.lsp.enable('clangd')
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = { 'zig' },
+  pattern = 'sql',
+  once = true,
+  callback = function()
+    vim.lsp.enable('zls')
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = { 'yaml' },
+  pattern = 'sql',
+  once = true,
+  callback = function()
+    vim.lsp.enable('yamlls')
+  end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
+  pattern = { 'cs' },
+  pattern = 'sql',
+  once = true,
+  callback = function()
+    vim.lsp.enable('omnisharp')
+  end,
+})
+
+
+
+
+require("conform").setup({
+  go = {"gofmt"},
+  python = {"black"},
+  rust = {"rustfmt"},
+
+  format_on_save = {
+    timeout_ms = 500,
+    lsp_fallback = true,
+  },
+})
+--   end,
+-- })
+
+-- vim.api.nvim_create_autocmd('FileType', {
+--   group = 'FileTypeConfigs',
+--   pattern = 'rust',
+--   callback = function()
+--     require('dap-python').setup()
+--
+--     lspconfig.rust_analyzer.setup({
+--       capabilities = capabilities,
+--       settings = {
+--       ["rust-analyzer"] = {
+--         checkOnSave = {
+--           command = "clippy",
+--         },
+--       },
+--       },
+--     })
+--
+--     require("conform").setup({
+--       rust = {"rustfmt"},
+--     })
+--   end,
+-- })
+
+-- vim.api.nvim_create_autocmd('FileType', {
+--   group = 'FileTypeConfigs',
+--   pattern = 'markdown',
+--   callback = function()
+--     lspconfig.marksman.setup({ capabilities = capabilities })
+--   end,
+-- })
+--
+-- vim.api.nvim_create_autocmd('FileType', {
+--   group = 'FileTypeConfigs',
+--   pattern = 'dockerfile',
+--   callback = function()
+--     lspconfig.dockerls.setup({ capabilities = capabilities })
+--     lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
+--   end,
+-- })
+--
+-- vim.api.nvim_create_autocmd('FileType', {
+--   group = 'FileTypeConfigs',
+--   pattern = 'cs',
+--   callback = function()
+--     lspconfig.omnisharp.setup({ capabilities = capabilities })
+--   end,
+-- })
+--
+-- vim.api.nvim_create_autocmd('FileType', {
+--   group = 'FileTypeConfigs',
+--   pattern = 'yaml',
+--   callback = function()
+--     lspconfig.yamlls.setup({ capabilities = capabilities })
+--     lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
+--   end,
+-- })
+
+-- vim.api.nvim_create_autocmd('FileType', {
+--   group = 'FileTypeConfigs',
+--   pattern = {'c', 'cpp', 'objc', 'objcpp'},
+--   callback = function()
+--     lspconfig.clangd.setup({ capabilities = capabilities })
+--   end,
+-- })
+--
+-- vim.api.nvim_create_autocmd('FileType', {
+--   group = 'FileTypeConfigs',
+--   pattern = 'sql',
+--   callback = function()
+--     lspconfig.sqls.setup({ capabilities = capabilities })
+--   end,
+-- })
+--
+-- vim.api.nvim_create_autocmd('FileType', {
+--   group = 'FileTypeConfigs',
+--   pattern = 'zig',
+--   callback = function()
+--     lspconfig.zls.setup({ capabilities = capabilities })
+--   end,
+-- })
+--
+local get_datetime = function()
+  return os.date("%Y-%m-%d %H:%M")
+end
+
+local ls = require('luasnip')
+ls.add_snippets("markdown", {
+  ls.snippet("mindful", {
+    -- Inserts the output of the get_datetime function as static text
+    ls.function_node(get_datetime, {}),
+    ls.text_node(" -- "),
+    ls.insert_node(1, "project"),
+    ls.text_node(" -- "),
+    ls.insert_node(2, "mode"),
+    ls.text_node(" -- "),
+    ls.insert_node(3, "description"),
+  }, {
+    descr = "Mindful of distractions",
+  }),
+})
--- a/modules/nvim/lua/keymaps.lua
+++ b/modules/nvim/lua/keymaps.lua
@@ -0,0 +1,170 @@
+vim.g.mapleader = " "
+
+-- Navigation
+vim.keymap.set({'n', 'v'}, 'j', 'gj', {})
+vim.keymap.set({'n', 'v'}, 'k', 'gk', {})
+
+-- vim.keymap.set('n', '<C-M-h>', '<C-w>h', {})
+-- vim.keymap.set('n', '<C-M-j>', '<C-w>j', {})
+-- vim.keymap.set('n', '<C-M-k>', '<C-w>k', {})
+-- vim.keymap.set('n', '<C-M-l>', '<C-w>l', {})
+-- vim.keymap.set('t', '<C-M-h>', '<C-\\><C-n><C-w>h', {})
+-- vim.keymap.set('t', '<C-M-j>', '<C-\\><C-n><C-w>j', {})
+-- vim.keymap.set('t', '<C-M-k>', '<C-\\><C-n><C-w>k', {})
+-- vim.keymap.set('t', '<C-M-l>', '<C-\\><C-n><C-w>l', {})
+vim.keymap.set('n', '<leader>zm', '<C-W>_<C-W>|', { noremap = true, silent = true })
+vim.keymap.set('n', '<C-M-Y>', '<C-w>5<', {})
+vim.keymap.set('n', '<C-M-U>', '<C-w>5+', {})
+vim.keymap.set('n', '<C-M-I>', '<C-w>5-', {})
+vim.keymap.set('n', '<C-M-O>', '<C-w>5>', {})
+vim.keymap.set('t', '<C-M-Y>', '<C-\\><C-n><C-w>5<', {})
+vim.keymap.set('t', '<C-M-U>', '<C-\\><C-n><C-w>5+', {})
+vim.keymap.set('t', '<C-M-I>', '<C-\\><C-n><C-w>5-', {})
+vim.keymap.set('t', '<C-M-O>', '<C-\\><C-n><C-w>5>', {})
+
+vim.keymap.set('n', '<leader>s', ':call WindowSwap#EasyWindowSwap()<CR>', {})
+
+-- Convenience
+vim.keymap.set('n', '<leader>w', ':w<CR>', { silent = true })
+vim.keymap.set('n', '<leader>F', ':NvimTreeToggle<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', 'Y', 'y$', {})
+
+-- Telescope
+local telebuiltin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', telebuiltin.find_files, { silent = true })
+vim.keymap.set('n', '<leader>fg', telebuiltin.live_grep, { silent = true })
+vim.keymap.set('n', '<leader>fs', telebuiltin.grep_string, { silent = true })
+vim.keymap.set('n', '<leader>o', telebuiltin.buffers, { silent = true })
+vim.keymap.set('n', '<leader>fh', telebuiltin.help_tags, { silent = true })
+
+-- Code
+vim.keymap.set('n', '<leader>cs', '<cmd>Trouble symbols toggle focus=true win.position=right<cr>')
+vim.keymap.set('n', '<leader>cl', '<cmd>Trouble lsp toggle focus=true win.position=right<cr>')
+vim.keymap.set('n', '<leader>cd', '<cmd>Trouble diagnostics toggle focus=true win.position=bottom<cr>')
+vim.keymap.set('n', '<leader>cq', '<cmd>Trouble quickfix toggle focus=true win.position=bottom<cr>')
+vim.keymap.set('n', '<leader>cr', vim.lsp.buf.rename, { desc = 'LSP Rename' })
+vim.keymap.set('n', '<leader>ct', vim.lsp.buf.type_definition, { desc = 'LSP Type Definition' })
+vim.keymap.set('n', '<leader>cF', require("conform").format, { desc = 'LSP Format' })
+vim.keymap.set('n', '<leader>cgi', vim.lsp.buf.implementation, { desc = 'LSP Implementation' })
+vim.keymap.set('n', '<leader>cgd', vim.lsp.buf.definition, { desc = 'LSP Definition' })
+vim.keymap.set('n', '<leader>cgD', vim.lsp.buf.declaration, { desc = 'LSP Declaration' })
+vim.keymap.set('n', '<leader>cwa', vim.lsp.buf.add_workspace_folder, { desc = 'LSP Add Workspace Folder' })
+vim.keymap.set('n', '<leader>cwl', vim.lsp.buf.list_workspace_folders, { desc = 'LSP List Workspace Folders' })
+vim.keymap.set('n', '<leader>cwr', vim.lsp.buf.remove_workspace_folder, { desc = 'LSP Remove Workspace Folder' })
+vim.keymap.set('n', '<leader>cws', vim.lsp.buf.workspace_symbol, { desc = 'LSP Workspace Symbol' })
+vim.keymap.set('n', '<leader>ch', vim.lsp.buf.hover, { desc = 'LSP Hover' })
+vim.keymap.set('n', '<leader>cH', vim.lsp.buf.signature_help, { desc = 'LSP Signature Help' })
+vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, { desc = 'LSP Code Action' })
+vim.keymap.set('n', '<leader>cde', ToggleDiagnostics, { desc = 'Toggle Diagnostics' })
+vim.keymap.set('n', '<leader>cf', 
+  function()
+    local word = vim.fn.expand("<cword>")
+    require('telescope.builtin').live_grep({
+      default_text = word,
+    })
+  end
+)
+vim.keymap.set('v', '<leader>cf', 
+  function()
+    require('telescope.builtin').grep_string()
+  end
+)
+
+-- Copilot
+local cop = require('copilot.panel')
+local cos = require('copilot.suggestion')
+
+vim.keymap.set('n', '<leader>ap', cop.toggle)
+vim.keymap.set('n', '<leader>apn', cop.jump_next)
+vim.keymap.set('n', '<leader>app', cop.jump_prev)
+vim.keymap.set('n', '<leader>apr', cop.refresh)
+
+-- vim.keymap.set('n', '<leader>as', cos.accept)
+-- vim.keymap.set('n', '<leader>ast', cos.toggle_auto_trigger)
+-- vim.keymap.set('n', '<leader>asl', cos.accept_word)
+-- vim.keymap.set('n', '<leader>asw', cos.accept_line)
+-- vim.keymap.set('n', '<leader>asn', cos.next)
+-- vim.keymap.set('n', '<leader>asp', cos.prev)
+-- vim.keymap.set('n', '<leader>asd', cos.dismiss)
+
+vim.keymap.set('n', '<leader>ac', '<cmd>CopilotChatToggle<cr>')
+vim.keymap.set('n', '<leader>acs', '<cmd>CopilotChatStop<cr>')
+vim.keymap.set('n', '<leader>acr', '<cmd>CopilotChatReset<cr>')
+vim.keymap.set('n', '<leader>acm', '<cmd>CopilotChatModels<cr>')
+vim.keymap.set('n', '<leader>acp', '<cmd>CopilotChatPrompts<cr>')
+
+-- Yanky
+vim.keymap.set({"n","x"}, "p", "<Plug>(YankyPutAfter)")
+vim.keymap.set({"n","x"}, "P", "<Plug>(YankyPutBefore)")
+vim.keymap.set({"n","x"}, "gp", "<Plug>(YankyGPutAfter)")
+vim.keymap.set({"n","x"}, "gP", "<Plug>(YankyGPutBefore)")
+vim.keymap.set("n", "<c-n>", "<Plug>(YankyCycleForward)")
+vim.keymap.set("n", "<c-p>", "<Plug>(YankyCycleBackward)")
+vim.keymap.set({"n","x"}, "y", "<Plug>(YankyYank)")
+
+-- Undotree
+vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
+
+-- DAP
+vim.keymap.set('n', "<Leader>db", function() require("dap").toggle_breakpoint() end)
+vim.keymap.set('n', "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end)
+vim.keymap.set('n', "<leader>dc", function() require("dap").continue() end)
+vim.keymap.set('n', "<leader>da", function() require("dap").continue({ before = get_args }) end)
+vim.keymap.set('n', "<leader>dC", function() require("dap").run_to_cursor() end)
+vim.keymap.set('n', "<leader>dg", function() require("dap").goto_() end)
+vim.keymap.set('n', "<leader>di", function() require("dap").step_into() end)
+vim.keymap.set('n', "<leader>dj", function() require("dap").down() end)
+vim.keymap.set('n', "<leader>dk", function() require("dap").up() end)
+vim.keymap.set('n', "<leader>dl", function() require("dap").run_last() end)
+vim.keymap.set('n', "<leader>do", function() require("dap").step_over() end)
+vim.keymap.set('n', "<leader>dO", function() require("dap").step_out() end)
+vim.keymap.set('n', "<leader>dP", function() require("dap").pause() end)
+vim.keymap.set('n', "<leader>dr", function() require("dap").repl.toggle() end)
+vim.keymap.set('n', "<leader>ds", function() require("dap").session() end)
+vim.keymap.set('n', "<leader>dt", function() require("dap").terminate() end)
+vim.keymap.set('n', "<leader>dw", function() require("dap.ui.widgets").hover() end)
+vim.keymap.set('n', "<leader>dv", function() require("dap-view").toggle() end)
+
+vim.keymap.set('n', "<F5>", function() require("dap").continue() end)
+vim.keymap.set('n', "<F2>", function() require("dap").step_into() end)
+vim.keymap.set('n', "<F1>", function() require("dap").step_over() end)
+vim.keymap.set('n', "<F3>", function() require("dap").step_out() end)
+
+
+-- Tmux Navigator
+vim.g.tmux_navigator_no_mappings = 1
+
+local function tmux_navigate(direction)
+  local old_win = vim.api.nvim_get_current_win()
+  vim.cmd('wincmd ' .. direction)
+  local new_win = vim.api.nvim_get_current_win()
+  
+  if old_win == new_win then
+     -- We are at the edge, let tmux handle it
+     -- This requires the tmux config to be set up to handle these keys when not in vim,
+     -- BUT since we are IN vim, we need to explicitly trigger the tmux action.
+     -- However, simply sending the key to tmux might just send it back to vim if we aren't careful,
+     -- or we can just run the tmux command directly.
+     
+     local tmux_cmd = ""
+     if direction == 'h' then
+        tmux_cmd = 'if -F "#{pane_at_left}" "previous-window" "select-pane -L"'
+     elseif direction == 'j' then
+        tmux_cmd = 'if -F "#{pane_at_bottom}" "switch-client -n" "select-pane -D"'
+     elseif direction == 'k' then
+        tmux_cmd = 'if -F "#{pane_at_top}" "switch-client -p" "select-pane -U"'
+     elseif direction == 'l' then
+        tmux_cmd = 'if -F "#{pane_at_right}" "next-window" "select-pane -R"'
+     end
+     
+     -- We use vim.fn.system to execute the tmux command
+     -- We need to wrap the command in 'tmux' call
+     vim.fn.system('tmux ' .. tmux_cmd)
+  end
+end
+
+vim.keymap.set('n', '<C-M-h>', function() tmux_navigate('h') end)
+vim.keymap.set('n', '<C-M-j>', function() tmux_navigate('j') end)
+vim.keymap.set('n', '<C-M-k>', function() tmux_navigate('k') end)
+vim.keymap.set('n', '<C-M-l>', function() tmux_navigate('l') end)
+
--- a/modules/nvim/lua/plugins.lua
+++ b/modules/nvim/lua/plugins.lua
@@ -0,0 +1,486 @@
+-- vim.g.delimitMate_expand_space=1
+-- vim.g.delimitMate_expand_cr = 1
+
+require('mini.pairs').setup()
+require('mini.align').setup()
+require('mini.bracketed').setup()
+require('mini.splitjoin').setup()
+require('mini.move').setup()
+require('mini.move').setup()
+require('flash').setup()
+require('ts-comments').setup()
+
+vim.g.tagbar_left=1
+vim.g.tagbar_autoclose=1
+vim.g.tagbar_autofocus=1
+
+vim.g.windowswap_map_keys=0
+
+local cmp = require('cmp')
+local lspkind = require('lspkind')
+local ls = require('luasnip')
+
+cmp.setup({
+  snippet = {
+    expand = function(args)
+      ls.lsp_expand(args.body)
+    end,
+  },
+
+  window = {
+    completion = cmp.config.window.bordered(),
+    documentation = cmp.config.window.bordered(),
+  },
+
+  -- mapping = cmp.mapping.preset.insert({
+  --   -- ['<Tab>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+  -- }),
+  mapping = {
+    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ['<C-Space>'] = cmp.mapping.complete(),
+    ['<C-e>'] = cmp.mapping.abort(),
+    ['<CR>'] = cmp.mapping(function(fallback)
+        if cmp.visible() then
+          if cmp.get_selected_entry() then
+              if ls.expandable() then
+                  ls.expand()
+              else
+                  cmp.confirm({
+                      select = false,
+                  })
+              end
+          else
+              fallback()
+          end
+        else
+            fallback()
+        end
+    end),
+    ["<Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif ls.locally_jumpable(1) then
+        ls.jump(1)
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+    ["<S-Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      elseif ls.locally_jumpable(-1) then
+        ls.jump(-1)
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+  },
+
+  sources = cmp.config.sources({
+    { name = 'nvim_lsp', priority = 1000 },
+    { name = 'buffer', priority = 800, keyword_length = 2 },
+    { name = 'copilot', priority = 700 },
+    { name = 'path', priority = 600 },
+    { name = 'cmp_yanky', priority = 500 },
+    { name = 'git', priority = 400 },
+    { name = 'luasnip', priority = 300 },
+    { name = 'nvim_lua', priority = 200 },
+  }),
+
+  formatting = {
+    format = lspkind.cmp_format({
+      -- mode = "symbol_text",
+      mode = "symbol",
+      menu = ({
+        buffer = "[buf]",
+        nvim_lsp = "[lsp]",
+        vsnip = "[snip]",
+        nvim_lua = "[lua]",
+        latex_symbols = "[tex]",
+        path = "[path]",
+        cmp_yanky = "[yank]",
+        copilot = "[copilot]",
+      }),
+      symbol_map = { Copilot = "" }
+    }),
+  },
+})
+
+-- -- Set configuration for specific filetype.
+-- cmp.setup.filetype('gitcommit', {
+--   sources = cmp.config.sources({
+--     { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
+--   }, {
+--     { name = 'buffer' },
+--   })
+-- })
+
+cmp.setup.cmdline({ '/', '?' }, {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = 'buffer' }
+  }
+})
+
+cmp.setup.cmdline(':', {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = 'path' }
+  }, {
+    { name = 'cmdline' }
+  }),
+  matching = { disallow_symbol_nonprefix_matching = false }
+})
+
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+capabilities.textDocument.foldingRange = {
+    dynamicRegistration = false,
+    lineFoldingOnly = true
+}
+
+local language_servers = vim.lsp.get_clients() -- or list servers manually like {'gopls', 'clangd'}
+for _, ls in ipairs(language_servers) do
+  if ls ~= nil then
+    vim.lsp.config(ls).setup({
+      capabilities = capabilities
+      -- you can add other fields for setting up lsp server in this table
+    })
+  end
+end
+require('ufo').setup()
+
+require("yanky").setup({
+  ring = {
+    history_length = 100,
+    storage = "shada",
+    sync_with_numbered_registers = true,
+    cancel_event = "update",
+  },
+  system_clipboard = {
+    sync_with_ring = true,
+  },
+  preserve_cursor_position = {
+    enabled = true,
+  },
+})
+
+require("telescope").setup {
+  extensions = {
+    ["ui-select"] = {
+      require("telescope.themes").get_dropdown {
+      }
+    }
+  }
+}
+require("telescope").load_extension("ui-select")
+require("telescope").load_extension("yank_history")
+
+-- require'nvim-treesitter.configs'.setup {
+--   -- ensure_installed = { "lua", "vim", "help" },
+--   ensure_installed = {},
+--   sync_install = false,
+--   auto_install = false,
+--
+--
+--   highlight = {
+--     enable = true,
+--
+--     disable = function(lang, buf)
+--         local max_filesize = 100 * 1024 -- 100 KB
+--         local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
+--         if ok and stats and stats.size > max_filesize then
+--             return true
+--         end
+--     end,
+--
+--     additional_vim_regex_highlighting = false,
+--   },
+-- }
+
+require('lualine').setup({
+  options = {
+    icons_enabled = true,
+    theme = 'Tomorrow',
+    component_separators = { left = '', right = ''},
+    section_separators = { left = '', right = ''},
+    disabled_filetypes = {
+      statusline = {},
+      winbar = {},
+    },
+    ignore_focus = {},
+    always_divide_middle = true,
+    globalstatus = true,
+    refresh = {
+      statusline = 1000,
+      tabline = 1000,
+      winbar = 1000,
+    }
+  },
+  sections = {
+    lualine_a = {'mode'},
+    lualine_b = {'branch', 'diff', 'diagnostics'},
+    lualine_c = {'filename'},
+    lualine_x = {'encoding', 'fileformat', 'filetype'},
+    lualine_y = {'progress'},
+    lualine_z = {'location'}
+  },
+  inactive_sections = {
+    lualine_a = {},
+    lualine_b = {},
+    lualine_c = {'filename'},
+    lualine_x = {'location'},
+    lualine_y = {},
+    lualine_z = {}
+  },
+  tabline = {},
+  winbar = {},
+  inactive_winbar = {},
+  extensions = {}
+})
+
+
+require("copilot").setup({
+  suggestion = { enabled = false },
+  panel = { enabled = false },
+})
+require("copilot_cmp").setup()
+require("CopilotChat").setup {
+  model = 'claude-3.7-sonnet',
+}
+
+vim.g.bullets_enabled_file_types = {
+  'markdown',
+  'text',
+  'gitcommit',
+  'scratch'
+}
+
+
+require("nvim-tree").setup({
+  sort = {
+    sorter = "case_sensitive",
+  },
+  view = {
+    width = 30,
+  },
+  renderer = {
+    group_empty = true,
+  },
+  -- filters = {
+  --   dotfiles = true,
+  -- },
+})
+
+require('gitsigns').setup {
+  signs = {
+    add          = { text = '┃' },
+    change       = { text = '┃' },
+    delete       = { text = '_' },
+    topdelete    = { text = '‾' },
+    changedelete = { text = '~' },
+    untracked    = { text = '┆' },
+  },
+  signs_staged = {
+    add          = { text = '┃' },
+    change       = { text = '┃' },
+    delete       = { text = '_' },
+    topdelete    = { text = '‾' },
+    changedelete = { text = '~' },
+    untracked    = { text = '┆' },
+  },
+  signs_staged_enable = true,
+  signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
+  numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
+  linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
+  word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
+  watch_gitdir = {
+    follow_files = true
+  },
+  auto_attach = true,
+  attach_to_untracked = false,
+  current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+  current_line_blame_opts = {
+    virt_text = true,
+    virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
+    delay = 1000,
+    ignore_whitespace = false,
+    virt_text_priority = 100,
+    use_focus = true,
+  },
+  current_line_blame_formatter = '<author>, <author_time:%R> - <summary>',
+  sign_priority = 6,
+  update_debounce = 100,
+  status_formatter = nil, -- Use default
+  max_file_length = 40000, -- Disable if file is longer than this (in lines)
+  preview_config = {
+    -- Options passed to nvim_open_win
+    style = 'minimal',
+    relative = 'cursor',
+    row = 0,
+    col = 1
+  },
+}
+
+require("conform").setup({
+  formatters_by_ft = {
+    python = {"ruff_fix", "ruff_format", "ruff_organize_imports", lsp_format = "fallback"},
+    rust = {"rustfmt", lsp_format = "fallback"},
+    go = {"gofmt", "goimports", lsp_format = "fallback"},
+    lua = { "stylua", lsp_format = "fallback"},
+  },
+})
+require('lint').linters_by_ft = {
+  markdown = {'vale'},
+}
+require("trouble").setup()
+require("todo-comments").setup()
+
+require("dap-view").setup()
+require("nvim-dap-virtual-text").setup()
+
+local dap, dapui = require("dap"), require("dap-view")
+dap.listeners.before.attach.dapui_config = function()
+  dapui.open()
+end
+dap.listeners.before.launch.dapui_config = function()
+  dapui.open()
+end
+dap.listeners.before.event_terminated.dapui_config = function()
+  dapui.close()
+end
+dap.listeners.before.event_exited.dapui_config = function()
+  dapui.close()
+end
+
+dap.adapters.codelldb = {
+  type = 'server',
+  port = "${port}",
+  executable = {
+    command = "codelldb",
+    args = {"--port", "${port}"},
+  }
+}
+
+-- dap.configurations.zig = {
+--   {
+--     name = "Launch Zig Program",
+--     type = "codelldb",
+--     request = "launch",
+--     program = function()
+--       -- Prompts for the executable path when you start debugging
+--       return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/zig-out/bin/', 'file')
+--     end,
+--     cwd = "${workspaceFolder}",
+--     stopOnEntry = false,
+--   },
+-- }
+
+if _G.is_mac then
+  workspaces = {
+    {
+      name = "privat",
+      path = "~/Documents/notes/privat",
+    },
+    {
+      name = "joplin",
+      path = "~/Documents/notes/fromjoplin",
+    },
+  }
+  daily_notes = {
+    folder = "Journal",
+    date_format = "%Y-%m-%d",
+    default_tags = { "journal" },
+    template = "daily.md"
+  }
+end
+
+if _G.is_work then
+  workspaces = {
+    {
+      name = "work",
+      path = "/mnt/c/Users/marti/Documents/notes/Work",
+    },
+    {
+      name = "privat",
+      path = "/mnt/c/Users/marti/Documents/notes/privat",
+    },
+  }
+  daily_notes = {}
+end
+
+if _G.is_private_nixos then
+  workspaces = {
+    {
+      name = "tech",
+      path = "~/notes",
+    },
+  }
+  daily_notes = {}
+end
+
+require("obsidian").setup({
+  workspaces = workspaces,
+  templates = {
+      folder = "_templates",
+      date_format = "%Y-%m-%d %a",
+      time_format = "%H:%M",
+  },
+  checkbox = {
+    order = { " ", ">", "x", "!", "~" },
+  },
+  frontmatter = {
+    enabled = true,
+    func = function(note)
+      -- Add the title of the note as an alias.
+      if note.title then
+        note:add_alias(note.title)
+      end
+
+      local out = { id = note.id, tags = note.tags }
+
+      if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
+        for k, v in pairs(note.metadata) do
+          out[k] = v
+        end
+      end
+
+      return out
+    end,
+  },
+  note_path_func = function(spec)
+    local path = spec.dir / spec.title
+    return path:with_suffix(".md")
+  end,
+  daily_notes = daily_notes,
+  legacy_commands = false,
+})
+
+require('render-markdown').setup({
+  enabled = true,
+  file_types = { 'markdown'},
+  completions = { lsp = { enabled = true } },
+  render_modes = { 'n', 'c', 't' },
+  checkbox = {
+        enabled = true,
+        render_modes = false,
+        bullet = false,
+        right_pad = 1,
+        unchecked = {
+            icon = '󰄱 ',
+            highlight = 'RenderMarkdownUnchecked',
+            scope_highlight = nil,
+        },
+        checked = {
+            icon = '󰱒 ',
+            highlight = 'RenderMarkdownChecked',
+            scope_highlight = nil,
+        },
+        custom = {
+            next = { raw = '[!]', rendered = ' ', highlight = 'RenderMarkdownNext', scope_highlight = nil },
+            ongoing = { raw = '[>]', rendered = '▶ ', highlight = 'RenderMarkdownOngoing', scope_highlight = nil },
+            waiting = { raw = '[~]', rendered = '󰥔 ', highlight = 'RenderMarkdownWaiting', scope_highlight = nil },
+        },
+    },
+})
--- a/modules/nvim/writing-init.lua
+++ b/modules/nvim/writing-init.lua
--- a/modules/overlays/unstable.nix
+++ b/modules/overlays/unstable.nix
@@ -0,0 +1,13 @@
+# Overlay to provide unstable packages under pkgs.unstable.* namespace
+# This allows using stable packages by default while selectively using
+# unstable versions for specific packages (e.g., LLM development tools)
+#
+# Usage: Pass nixpkgs input when applying overlay:
+#   overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
+
+nixpkgs: final: prev: {
+  unstable = import nixpkgs {
+    inherit (prev) system;
+    config.allowUnfree = true;
+  };
+}
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -1,63 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./user/sh.nix
-    ./user/tmux.nix
-    ./user/git.nix
-    ./user/dev.nix
-    ./user/nvim.nix
-  ];
-
-  home.packages = with pkgs; [
-    nil
-    # neovim
-
-    # (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; })
-    pkgs.nerd-fonts.fira-code
-
-    # (pkgs.writeShellScriptBin "my-hello" ''
-    #   echo "Hello, ${config.home.username}!"
-    # '')
-  ];
-
-  home.file = {
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. If you don't want to manage your shell through Home
-  # Manager then you have to manually source 'hm-session-vars.sh' located at
-  # either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/moustachioed/etc/profile.d/hm-session-vars.sh
-  #
-  #home.sessionVariables = {
-  #  EDITOR = "nvim";
-  #};
-
-  #home.shellAliases = {
-    # "ll" = "ls -la";
-  #};
-  # home.shellAliases = {
-  #   "t" = "tmuxp";
-  #   "tl" = "tmuxp load";
-  # };
-
-  news.display = "silent";
-
-  programs.home-manager.enable = true;
-}
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -1,69 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1740579671,
-        "narHash": "sha256-Dwt/3KknOQ4bgFG5YjqDT7oWRy27rPpDjAi2P0ok1zw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "53c587d263f94aaf6a281745923c76bbec62bcf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1740452771,
-        "narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "42be12b510253d750138ec90c66decc282298b44",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1740367490,
-        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -1,83 +0,0 @@
-{
-  description = "Home Manager configuration of moustachioed";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nix-darwin.url = "github:LnL7/nix-darwin";
-    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = { self, nix-darwin, nixpkgs, home-manager, ... }:
-    let
-      system = "x86_64-darwin";
-      pkgs = nixpkgs.legacyPackages.${system};
-
-      configuration = { pkgs, ... }: {
-        environment.systemPackages =
-          [
-            pkgs.vim
-          ];
-
-        # Auto upgrade nix package and the daemon service.
-        services.nix-daemon.enable = true;
-        # nix.package = pkgs.nix;
-
-        nix.settings.experimental-features = "nix-command flakes";
-
-        programs.zsh.enable = true;  # default shell on catalina
-
-        # Set Git commit hash for darwin-version.
-        system.configurationRevision = self.rev or self.dirtyRev or null;
-
-        # Used for backwards compatibility, please read the changelog before changing.
-        # $ darwin-rebuild changelog
-        system.stateVersion = 4;
-
-        # The platform the configuration will be used on.
-        nixpkgs.hostPlatform = system;
-      };
-    in {
-      # Build darwin flake using:
-      # $ darwin-rebuild build --flake .#Martins-MacBook-Pro
-      darwinConfigurations."Martins-MacBook-Pro" = nix-darwin.lib.darwinSystem {
-        modules = [ configuration ];
-      };
-
-      # Expose the package set, including overlays, for convenience.
-      darwinPackages = self.darwinConfigurations."Martins-MacBook-Pro".pkgs;
-
-      homeConfigurations = { 
-        "moustachioed" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-
-          modules = [ 
-            ./user/profiles/moustachioedBook.nix
-            ./common.nix
-            ./user/task_home.nix
-          ];
-        };
-        "martin" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-
-          modules = [ 
-            ./user/profiles/martin.nix
-            ./common.nix
-            ./user/task_home.nix
-          ];
-        };
-        "pan" = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-
-          modules = [ 
-            ./user/profiles/work.nix
-            ./common.nix
-            ./user/task.nix
-          ];
-        };
-      };
-    };
-}
--- a/nix/user/dev.nix
+++ b/nix/user/dev.nix
@@ -1,11 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.direnv = {
-    enable = true;
-    enableZshIntegration = true;
-    nix-direnv.enable = true;
-  };
-
-  programs.ripgrep.enable = true;
-}
--- a/nix/user/git.nix
+++ b/nix/user/git.nix
@@ -1,62 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.git = {
-    enable = true;
-
-    aliases = {
-      st = "status";
-      ci = "commit";
-      co = "checkout";
-      br = "branch";
-      pl = "pull";
-      ps = "push";
-      mno =" merge --no-ff";
-      lg = "log --color --graph --pretty=format:'%cred%h%creset -%c(yellow)%d%creset %s %cgreen(%cr)%c(bold blue)<%an>%creset' --abbrev-commit";
-    };
-
-    difftastic.enable = true;
-
-    extraConfig = {
-      column.ui = "auto";
-      branch.sort = "-committerdate";
-      tag.sort = "version:refname";
-      diff = {
-        algorithm = "histogram";
-        colorMoved = "plain";
-        mnemonicPrefix = "true";
-        renames = "true";
-      };
-      pull.rebase = "true";
-      push = {
-        default = "simple";
-        autoSetupRemote = "true";
-        followTags = "true";
-      };
-      fetch = {
-        prune = "true";
-        pruneTags = "true";
-        all = "true";
-      };
-      help.autocorrect = "prompt";
-      commit.verbose = "true";
-      rerere = {
-        enabled = "true";
-        autoupdate = "true";
-      };
-      rebase = {
-        autoSquas = "true";
-        autoStash = "true";
-        updateRefs = "true";
-      };
-      merge.conflictstyle = "zdiff3";
-      core.editor = "nvim";
-      init.defaultBranch = "main";
-    };
-
-    ignores = [
-      ".direnv/"
-      ".envrc"
-    ];
-  };
-}
--- a/nix/user/nvim.nix
+++ b/nix/user/nvim.nix
@@ -1,64 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  programs.neovim = {
-    enable = true;
-
-    defaultEditor = true;
-    vimAlias = true;
-
-    plugins = with pkgs.vimPlugins; [
-      aerial-nvim
-      zen-mode-nvim
-      vim-commentary
-      vim-repeat
-      vim-surround
-      targets-vim
-      delimitMate
-      # vim-startify
-      vim-windowswap
-      vim-nix
-      plenary-nvim
-      telescope-nvim
-      telescope-fzf-native-nvim
-      yanky-nvim
-      lualine-nvim
-      undotree
-      vim-vsnip
-      nvim-cmp
-      cmp-vsnip
-      cmp-buffer
-      cmp-path
-      cmp-cmdline
-      cmp-nvim-lsp
-      cmp-nvim-lsp-signature-help
-      cmp_yanky
-      cmp-git
-      nvim-lspconfig
-      lspkind-nvim
-      copilot-lua
-      copilot-cmp
-      image-nvim
-      img-clip-nvim
-      markdown-preview-nvim
-      vim-markdown
-      (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ]))
-    ];
-
-    # extraConfig = ''
-    #   set t_vb=
-    # '';
-
-    extraLuaConfig = builtins.concatStringsSep "\n" [
-      (lib.strings.fileContents ../../nvim/base.lua)
-      (lib.strings.fileContents ../../nvim/keymaps.lua)
-      (lib.strings.fileContents ../../nvim/plugins.lua)
-    ];
-  };
-
-  home.packages = with pkgs; [
-    nodejs-slim
-    marksman
-  ];
-}
-
--- a/nix/user/profiles/martin.nix
+++ b/nix/user/profiles/martin.nix
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.username = "martin";
-  home.homeDirectory = "/Users/martin";
-
-  home.stateVersion = "24.05"; # Please read the comment before changing.
-
-  programs.git = {
-    userName = "Martin";
-    userEmail = "git@pander-on.de";
-  };
-}
--- a/nix/user/profiles/moustachioedBook.nix
+++ b/nix/user/profiles/moustachioedBook.nix
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.username = "moustachioed";
-  home.homeDirectory = "/Users/moustachioed";
-
-  home.stateVersion = "23.11"; # Please read the comment before changing.
-
-  programs.git = {
-    userName = "Martin";
-    userEmail = "git@pander-on.de";
-  };
-}
--- a/nix/user/profiles/work.nix
+++ b/nix/user/profiles/work.nix
@@ -1,24 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.username = "pan";
-  home.homeDirectory = "/home/pan";
-
-  home.stateVersion = "23.11"; # Please read the comment before changing.
-
-  programs.git = {
-    userName = "Martin Pander";
-    userEmail = "martin.pander@knowtion.de";
-  };
-
-  home.packages = with pkgs; [
-    yaml-language-server
-    marksman
-    dockerfile-language-server-nodejs
-  ];
-
-  programs.zsh.profileExtra = ''
-    source $HOME/.profile
-  '';
-
-}
--- a/nix/user/sh.nix
+++ b/nix/user/sh.nix
@@ -1,90 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-
-    history.size = 500000;
-    #history.path = "${config.xdg.dataHome}/zsh/history";
-    prezto = {
-      enable = true;
-      caseSensitive = true;
-      color = true;
-      editor = {
-        dotExpansion = true;
-        keymap = "vi";
-      };
-      pmodules = [
-        "environment"
-        "terminal"
-        "editor"
-        "history"
-        "directory"
-        "spectrum"
-        "utility"
-        "completion"
-        "syntax-highlighting"
-        "history-substring-search"
-        "prompt"
-        "git"
-      ];
-      prompt.theme = "minimal";
-      syntaxHighlighting.highlighters = [
-        "main"
-        "brackets"
-        "pattern"
-        "line"
-        "cursor"
-        "root"
-      ];
-      tmux = {
-        autoStartLocal = true;
-        itermIntegration = true;
-      };
-    };
-
-    initExtra = ''
-      HISTCONTROL='erasedups:ignoreboth'
-      HISTIGNORE='&:[ ]*:exit:ls:bg:fg:history:clear'
-      unsetopt beep
-    '';
-  };
-
-  programs.fzf = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
-  programs.lsd = {
-    enable = true;
-    enableAliases = true;
-  };
-
-  programs.zoxide = {
-    enable = true;
-    enableZshIntegration = true;
-    options = [
-      "--cmd cd"
-    ];
-  };
-
-  programs.bat.enable = true;
-  programs.ripgrep.enable = true;
-
-  home.packages = with pkgs; [
-    fd
-    du-dust
-    glow
-    ripgrep-all
-    llm
-    #nerdfonts
-  ];
-
-  home.sessionVariables = lib.mkMerge [ {
-      BAT_THEME = "Coldark-Cold";
-    }
-  ];
-}
--- a/nix/user/task.nix
+++ b/nix/user/task.nix
@@ -1,42 +0,0 @@
-{config, pkgs, lib, ...}:
-
-{
-  programs.taskwarrior = {
-    enable = true;
-    colorTheme = "light-256";
-    package = pkgs.taskwarrior3;
-    config = {
-      weekstart = "monday";
-
-      uda.priority.values = "H,M,,L";
-      urgency.uda.priority.L.coefficient = -0.5;
-      urgency.user.tag.deferred.coefficient = -15.0;
-      urgency.user.tag.cust.coefficient = 5.0;
-
-      context.today.read = "-deferred and (prio:H or +next)";
-      context.today.write = "prio:H or +next";
-      context.deferred.read = "+deferred";
-      context.deferred.write = "+deferred";
-      context.customer.read = "+cust";
-      context.customer.write = "+cust";
-      context.low_energy.read = "+low";
-      context.low_energy.write = "+low";
-
-      uda.taskwarrior-tui.task-report.show-info = false;
-      uda.taskwarrior-tui.selection.reverse = "yes";
-    };
-  };
-
-  home.packages = with pkgs; [
-    taskwarrior-tui
-    timewarrior
-  ];
-
-  home.shellAliases = lib.mkMerge [ {
-      t = "task";
-      tt = "taskwarrior-tui";
-      tw = "timew";
-      tws = "timew summary :ids";
-    }
-  ];
-}
--- a/nix/user/task_home.nix
+++ b/nix/user/task_home.nix
@@ -1,37 +0,0 @@
-{config, pkgs, lib, ...}:
-
-{
-  programs.taskwarrior = {
-    enable = true;
-    colorTheme = "light-256";
-    package = pkgs.taskwarrior3;
-    config = {
-      weekstart = "monday";
-
-      uda.priority.values = "H,M,,L";
-      urgency.uda.priority.L.coefficient = -0.5;
-      urgency.user.tag.deferred.coefficient = -15.0;
-      urgency.user.tag.cust.coefficient = 5.0;
-
-      context.today.read = "-deferred and (prio:H or +next)";
-      context.today.write = "prio:H or +next";
-      context.deferred.read = "+deferred";
-      context.deferred.write = "+deferred";
-      context.low_energy.read = "+low";
-      context.low_energy.write = "+low";
-
-      uda.taskwarrior-tui.task-report.show-info = false;
-      uda.taskwarrior-tui.selection.reverse = "yes";
-    };
-  };
-
-  home.packages = with pkgs; [
-    taskwarrior-tui
-  ];
-
-  home.shellAliases = lib.mkMerge [ {
-      t = "task";
-      tt = "taskwarrior-tui";
-    }
-  ];
-}
--- a/nix/user/tmux.nix
+++ b/nix/user/tmux.nix
@@ -1,66 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  programs.tmux = {
-    enable = true;
-    shortcut = "a";
-    mouse = true;
-    keyMode = "vi";
-    escapeTime = 0;
-    terminal = "screen-256color";
-    tmuxp.enable = true;
-    extraConfig = ''
-      set -g display-time 1500
-
-      unbind S
-      bind S command-prompt "switch -t %1"
-
-      bind-key -n M-K switch-client -p
-      bind-key -n M-J switch-client -n
-
-      bind-key -n M-L next-window
-      bind-key -n M-H previous-window
-
-      bind '"' split-window -c "#{pane_current_path}"
-      bind % split-window -h -c "#{pane_current_path}"
-      bind c new-window -a -c "#{pane_current_path}"
-
-      #######################################
-      # status line
-      #######################################
-      set -g status-justify centre
-
-      set -g status-left "#[bg=#808080,fg=#ffffff,bold] #S #[default]#[bg=#BCBCBC] #{-30:pane_title} "
-      set -g status-left-length 40
-
-      set -g status-right "#[bg=#BCBCBC] %H:%M #[bg=#808080,fg=#ffffff] %d.%m.%y "
-
-      # setw -g window-status-format " #W#F "
-      # setw -g window-status-current-format " #W#F "
-      setw -g window-status-format " #W "
-      setw -g window-status-current-format " #W "
-      setw -g window-status-separator ""
-
-      #######################################
-      # colors, taken from vim-lucius
-      #######################################
-      set -g status-style "bg=#DADADA,fg=#000000"
-
-      setw -g window-status-style "bg=#BCBCBC,fg=#000000"
-      setw -g window-status-current-style "bg=#808080,fg=#ffffff"
-
-      setw -g window-status-activity-style "bg=#AFD7AF,fg=#000000"
-      setw -g window-status-bell-style "bg=#AFD7AF,fg=#000000"
-      #setw -g window-status-content-style "bg=#AFD7AF,fg=#000000"
-
-      set -g pane-active-border-style "bg=#eeeeee,fg=#006699"
-      set -g pane-border-style "bg=#eeeeee,fg=#999999"
-    '';
-  };
-
-  home.shellAliases = lib.mkMerge [ {
-      "o" = "tmuxp";
-      "ol" = "tmuxp load";
-    }
-  ];
-}
--- a/nvim/base.lua
+++ b/nvim/base.lua
@@ -1,94 +0,0 @@
-------------------------
-------- OPTIONS --------
-------------------------
-vim.opt.mouse = 'a'
-vim.opt.history = 1000
-vim.opt.ruler = true
-vim.opt.ruler = true
-vim.opt.number = true
-vim.opt.showcmd = true
-vim.opt.ttimeoutlen = 100
-vim.opt.backspace = 'indent,eol,start'
-vim.opt.tabstop = 2
-vim.opt.expandtab = true
-vim.opt.shiftwidth = 2
-vim.opt.softtabstop = 2
-vim.opt.autoindent = true
-vim.opt.showmatch = true
-vim.opt.incsearch = true
-vim.opt.hlsearch = true
-vim.opt.wrapscan = true
-vim.opt.ignorecase = true
-vim.opt.smartcase = true
-vim.opt.hidden = true
-vim.opt.splitright = true
-vim.opt.splitbelow = true
-vim.opt.swapfile = false
-vim.opt.wildmode = 'longest,list'
-vim.opt.wildignore = vim.opt.wildignore + 'main,*.o,*.d,*.aux,*.bbl,*.lof,*.loa,*.blg,*.fdb_latexmk,*.fls,*.tdo,*.pdf,*.pyc'
-vim.opt.spell = false
-vim.opt.foldmethod = 'syntax'
-vim.opt.foldopen = vim.opt.foldopen - 'block'
-vim.opt.foldlevel = 99
-vim.opt.lazyredraw = true
-vim.opt.listchars = 'eol:¬,tab:▸ ,trail:·'
-vim.opt.fillchars = 'vert:|,fold: '
-vim.opt.list = true
-vim.opt.laststatus = 2
-vim.opt.scrolloff = 8
-vim.opt.background = 'light'
-vim.opt.wrap = true
-vim.opt.showbreak = '..'
-vim.opt.errorbells = false
-vim.opt.visualbell = false
-vim.opt.title = true
-vim.opt.autoread = true
-vim.opt.syntax = 'on'
-vim.opt.encoding = 'utf-8'
-vim.opt.completeopt = 'menu,menuone,noselect'
-
-
----------------------------
-------- CLIPBOARD ---------
----------------------------
-- if vim.fn.has("wsl") == 1 then
-vim.opt.clipboard:append('unnamedplus')
-- end
-
-
----------------------------
-------- COMMANDS ----------
----------------------------
-
-vim.cmd('filetype plugin indent on')
-
-- vim.cmd('colorscheme lucius')
-- vim.cmd('LuciusWhite')
-
-
----------------------------
-------- AUTOGROUPS --------
----------------------------
-
-vim.api.nvim_create_augroup('VimIntern', { clear = true })
-
-vim.api.nvim_create_autocmd({'FocusGained', 'BufEnter', 'CursorMoved', 'CursorMovedI', 'CursorHold', 'CursorHoldI'}, {
-   group = 'VimIntern',
-   pattern = '*',
-   command = 'silent! checktime'
-})
-
-vim.api.nvim_create_autocmd('BufEnter', {
-   group = 'VimIntern',
-   pattern = '*',
-   command = 'silent! lcd %:p:h'
-})
-
-
---------------------------
-------- FUNCTIONS --------
---------------------------
-
-vim.api.nvim_create_user_command('TrimWhiteSpace', function()
-   vim.cmd('%s/\\s\\+$//e')
-end, {})
--- a/nvim/keymaps.lua
+++ b/nvim/keymaps.lua
@@ -1,42 +0,0 @@
-vim.g.mapleader = " "
-
-- Navigation
-vim.keymap.set('n', 'j', 'gj', {})
-vim.keymap.set('n', 'k', 'gk', {})
-vim.keymap.set('v', 'j', 'gj', {})
-vim.keymap.set('v', 'k', 'gk', {})
-
-vim.keymap.set('n', '<C-h>', '<C-w>h', {})
-vim.keymap.set('n', '<C-j>', '<C-w>j', {})
-vim.keymap.set('n', '<C-k>', '<C-w>k', {})
-vim.keymap.set('n', '<C-l>', '<C-w>l', {})
-
-vim.keymap.set('n', '<leader>s', ':call WindowSwap#EasyWindowSwap()<CR>', {})
-
-- Convenience
-vim.keymap.set('n', '<leader>w', ':w<CR>', { silent = true })
-vim.keymap.set('n', '<leader>F', ':e.<CR>', {})
-vim.keymap.set('n', 'Y', 'y$', {})
-
-- Telescope
-local telebuiltin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>ff', telebuiltin.find_files, { silent = true })
-vim.keymap.set('n', '<leader>fg', telebuiltin.live_grep, { silent = true })
-vim.keymap.set('n', '<leader>fs', telebuiltin.grep_string, { silent = true })
-vim.keymap.set('n', '<leader>o', telebuiltin.buffers, { silent = true })
-vim.keymap.set('n', '<leader>fh', telebuiltin.help_tags, { silent = true })
-
-- Yanky
-vim.keymap.set({"n","x"}, "p", "<Plug>(YankyPutAfter)")
-vim.keymap.set({"n","x"}, "P", "<Plug>(YankyPutBefore)")
-vim.keymap.set({"n","x"}, "gp", "<Plug>(YankyGPutAfter)")
-vim.keymap.set({"n","x"}, "gP", "<Plug>(YankyGPutBefore)")
-vim.keymap.set("n", "<c-n>", "<Plug>(YankyCycleForward)")
-vim.keymap.set("n", "<c-p>", "<Plug>(YankyCycleBackward)")
-vim.keymap.set({"n","x"}, "y", "<Plug>(YankyYank)")
-
-- Undotree
-vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
-
-- nnoremap <silent> <leader>t :CtrlPBufTagAll<CR>
-- nnoremap <silent> <leader>T :TagbarToggle<CR>
--- a/nvim/plugins.lua
+++ b/nvim/plugins.lua
@@ -1,190 +0,0 @@
-vim.g.delimitMate_expand_space=1
-vim.g.delimitMate_expand_cr = 1
-
-vim.g.tagbar_left=1
-vim.g.tagbar_autoclose=1
-vim.g.tagbar_autofocus=1
-
-vim.g.windowswap_map_keys=0
-
-local cmp = require('cmp')
-local lspkind = require('lspkind')
-
-cmp.setup({
-  snippet = {
-    expand = function(args)
-      vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-    end,
-  },
-
-  window = {
-    completion = cmp.config.window.bordered(),
-    documentation = cmp.config.window.bordered(),
-  },
-
-  mapping = cmp.mapping.preset.insert({
-    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete(),
-    ['<C-e>'] = cmp.mapping.abort(),
-    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-  }),
-
-  sources = cmp.config.sources({
-    { name = 'nvim_lsp' },
-    { name = 'vsnip' },
-    { name = 'path' },
-    { name = 'cmp_yanky' },
-    { name = 'git' },
-    { name = 'copilot' },
-  -- }, {
-    { name = 'buffer', keyword_length = 2 },
-  }),
-
-  formatting = {
-    format = lspkind.cmp_format({
-      -- mode = "symbol_text",
-      mode = "symbol",
-      menu = ({
-        buffer = "[buf]",
-        nvim_lsp = "[lsp]",
-        vsnip = "[snip]",
-        nvim_lua = "[lua]",
-        latex_symbols = "[tex]",
-        path = "[path]",
-        cmp_yanky = "[yank]",
-        copilot = "[copilot]",
-      }),
-      symbol_map = { Copilot = "" }
-    }),
-  },
-})
-
-- -- Set configuration for specific filetype.
-- cmp.setup.filetype('gitcommit', {
--   sources = cmp.config.sources({
--     { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
--   }, {
--     { name = 'buffer' },
--   })
-- })
-
-cmp.setup.cmdline({ '/', '?' }, {
-  mapping = cmp.mapping.preset.cmdline(),
-  sources = {
-    { name = 'buffer' }
-  }
-})
-
-cmp.setup.cmdline(':', {
-  mapping = cmp.mapping.preset.cmdline(),
-  sources = cmp.config.sources({
-    { name = 'path' }
-  }, {
-    { name = 'cmdline' }
-  }),
-  matching = { disallow_symbol_nonprefix_matching = false }
-})
-
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-local lspconfig = require("lspconfig")
-lspconfig.gopls.setup({ capabilities = capabilities })
-lspconfig.svelte.setup({ capabilities = capabilities })
-lspconfig.pyright.setup({ capabilities = capabilities })
-lspconfig.omnisharp.setup({ capabilities = capabilities })
-lspconfig.clangd.setup({ capabilities = capabilities })
-lspconfig.dockerls.setup({ capabilities = capabilities })
-lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
-lspconfig.flow.setup({ capabilities = capabilities })
-lspconfig.marksman.setup({ capabilities = capabilities })
-lspconfig.als.setup({ capabilities = capabilities })
-lspconfig.sqls.setup({ capabilities = capabilities })
-lspconfig.yamlls.setup({ capabilities = capabilities })
-lspconfig.nil_ls.setup({ capabilities = capabilities })
-
-require("yanky").setup({
-  ring = {
-    history_length = 100,
-    storage = "shada",
-    sync_with_numbered_registers = true,
-    cancel_event = "update",
-  },
-  system_clipboard = {
-    sync_with_ring = true,
-  },
-  preserve_cursor_position = {
-    enabled = true,
-  },
-})
-
-require("telescope").load_extension("yank_history")
-
-require'nvim-treesitter.configs'.setup {
-  -- ensure_installed = { "lua", "vim", "help" },
-  ensure_installed = {},
-  sync_install = false,
-  auto_install = false,
-
-
-  highlight = {
-    enable = true,
-
-    disable = function(lang, buf)
-        local max_filesize = 100 * 1024 -- 100 KB
-        local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
-        if ok and stats and stats.size > max_filesize then
-            return true
-        end
-    end,
-
-    additional_vim_regex_highlighting = false,
-  },
-}
-
-require('lualine').setup({
-  options = {
-    icons_enabled = true,
-    theme = 'Tomorrow',
-    component_separators = { left = '', right = ''},
-    section_separators = { left = '', right = ''},
-    disabled_filetypes = {
-      statusline = {},
-      winbar = {},
-    },
-    ignore_focus = {},
-    always_divide_middle = true,
-    globalstatus = false,
-    refresh = {
-      statusline = 1000,
-      tabline = 1000,
-      winbar = 1000,
-    }
-  },
-  sections = {
-    lualine_a = {'mode'},
-    lualine_b = {'branch', 'diff', 'diagnostics'},
-    lualine_c = {'filename'},
-    lualine_x = {'encoding', 'fileformat', 'filetype'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
-  },
-  inactive_sections = {
-    lualine_a = {},
-    lualine_b = {},
-    lualine_c = {'filename'},
-    lualine_x = {'location'},
-    lualine_y = {},
-    lualine_z = {}
-  },
-  tabline = {},
-  winbar = {},
-  inactive_winbar = {},
-  extensions = {}
-})
-
-
-require("copilot").setup({
-  suggestion = { enabled = false },
-  panel = { enabled = false },
-})
-require("copilot_cmp").setup()
--- a/secrets/.sops.yaml
+++ b/secrets/.sops.yaml
@@ -0,0 +1,12 @@
+keys:
+  - &macbook age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
+  - &macnix age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
+  - &worknix age1wufdcd234uw69lcw6gtv9r5zfz7h5tvu0fzcg5d8tn67yx6pv47sary4q2
+
+creation_rules:
+  - path_regex: secrets\.yaml$
+    key_groups:
+      - age:
+          - *macbook
+          - *macnix
+          - *worknix
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -0,0 +1,34 @@
+langdock_api_key: ENC[AES256_GCM,data:9CTt73dQowcjIdjQoPMjsmGeIgV0nyHZxePOwak/m09ePfu4Gb3gDC17wq9Hde5J9IqpEID73Kdo/DsGm9m765rPGQFxGwTo3MO5eZgXAQjFXQNNhYm+sug=,iv:TVuiMG/7HYjncK3oC8r5xYrnNGXFcrBrpq9OO+7plNY=,tag:EZqUOGYwTHcukDop8p/JBw==,type:str]
+sops:
+    age:
+        - recipient: age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJcTBpZ3BwNnVxVkFQQWgy
+            VWFsMFF0WGIzbTBFZ0htQ251dGlVdW5PckdNCmtldkZZL0Z3SER2OHZuUGdvNVpI
+            Vk1KS1ZYVzZXZGtUbTNtZnhPeStSTlUKLS0tICtXYTgxMHc0alBYUDAzcXVXcm9J
+            YjQrUGZaWmpaV2tGOXJmbGR5K3l1VFEK+bsmeV/PjYcSlsJz0ZQZ8U9EYSu8bTJM
+            BJ0T910cPudb/dkMrU9QSWUlBbOKk78ivKvDbwqPBfguSqU5GevLGg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3WXdEM2RORG56N3hVRGx5
+            NVZnWHY4TG5sRmdyQnJqVm4waUpoNGc4eFQ0CkNoanF3ZFRNQzQ5dHBST1BkSko0
+            cDAwYlBKVUZ3amJrcDJHcTloaXIwcWsKLS0tIDlMa0dqNmJvMjZZSVBPWjJncGlK
+            Q3F3cHFoWC9Ga0Q4S3VqQ1psRjZZUmsK7+d9wMgC27xaOu1CLX8YbG8BbJdYhLLg
+            dc8RHujixqkvheiv9syzCNF0z6Oc2qT5Vw2v7gCZ1SPgomOf3oHNHQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1wufdcd234uw69lcw6gtv9r5zfz7h5tvu0fzcg5d8tn67yx6pv47sary4q2
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpWjdzMWpCemJJR2FvUjJ2
+            b0hraEVBWDdJeG9JRFpLYm5XV1FDUDFMeFdnCktwRElvTmoyZmpPQ3VjbldXVHo4
+            SmpjQlRPK2o3YnNLMklyMnVwWERtb28KLS0tIDNjcGJhMkR1bCtBWUV1WU5TZjVR
+            YjBrekY4Y2JSczBEQ3BObjhKZkhYc3MKMrGlO/w7Hvp23rpL71/XDsJDcbc3t73C
+            iXdD2Oc9V5g5Jz3H7mkaAlNRg8u+LwGXYdwZiG7NWSyQnARPgeMBwQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2026-02-10T21:55:05Z"
+    mac: ENC[AES256_GCM,data:Qmwba0kQ8uzz72UbkVx+41i+iFtjI07nRLkYI9+G3TNCDVcWSFdPXCjWxdozU1jTOYyt9EZpP5x+5DLRCbNIlsKpClMvVGwAbu8XKvqQoF5Ao4PXOFNg6hyWTPjoVDLHkEaykpgpg1fr29CHUDkyyFGniQ+Slv5LAndAx+ncTAA=,iv:ehZZi7DUlYlGcBMgV25h+cew/amgbH2tKFMr7jaNw/U=,tag:ag2vcgc29Dlx+QI8qju/LQ==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.11.0
Author	SHA1	Message	Date
Martin Pander	93549cc312	Upgrade to NixOS-WSL 25.11	2026-03-11 09:45:47 +01:00
Martin Pander	433536db6a	Move lsp setup into filetype autocommands	2026-03-11 09:31:56 +01:00
Martin Pander	98169a672b	Update	2026-03-02 19:56:20 +01:00
Martin Pander	ad7c88a221	Fix tmux config on mac	2026-03-02 19:40:10 +01:00
Martin Pander	2253f44399	Fix dap	2026-02-27 15:29:53 +01:00
Martin Pander	e45151a774	Update packages	2026-02-24 19:26:38 +01:00
Martin Pander	f87d3eb2e4	Make room for window manager shortcuts	2026-02-19 16:26:44 +01:00
Martin Pander	c8e7799db2	Update opencode	2026-02-18 11:13:26 +01:00
Martin Pander	36bb532cc9	Update tasksquire	2026-02-17 21:34:25 +01:00
Martin Pander	2fbab2f267	Remove vim-tmux-navigator	2026-02-15 20:54:11 +01:00
Martin Pander	a6b3250434	Consolidate tmux and vim navigation	2026-02-15 20:23:16 +01:00
Martin Pander	4049d3981b	Consolidate tmux window and pane switching	2026-02-15 20:18:30 +01:00
Martin Pander	0012b07304	Fix obsidian.nvim workspace	2026-02-13 21:33:50 +01:00
Martin Pander	f7d8e728ff	Add opencode.nvim	2026-02-13 21:25:03 +01:00
Martin Pander	228fb04814	Add personal opencode config	2026-02-13 17:24:58 +01:00
Martin Pander	80fb31ffe1	Add opencode models	2026-02-12 12:56:18 +01:00
Martin Pander	240c838a7b	Update opencode config	2026-02-11 22:00:44 +01:00
Martin Pander	1e7c110903	Remove test at home	2026-02-11 21:17:44 +01:00
Martin Pander	87dbdd522b	Fix opencode	2026-02-11 21:06:36 +01:00
Martin Pander	74a01d576e	Test at home	2026-02-11 21:00:05 +01:00
Martin Pander	cb8f841e43	Add langdock api key	2026-02-11 20:49:51 +01:00
Martin Pander	1ce6ddf090	Add opencode config	2026-02-11 16:07:58 +01:00
Martin Pander	5c878e1458	Add jj aliases	2026-02-11 12:55:50 +01:00
Martin Pander	38083b9af4	Move nvim config	2026-02-11 08:03:13 +01:00
Martin Pander	9b0b1f76f9	Fix things	2026-02-10 22:22:54 +01:00
Martin Pander	4460f57073	Fix things	2026-02-10 22:18:47 +01:00
Martin Pander	2fbabfb771	Fix things	2026-02-10 22:14:17 +01:00
Martin Pander	6250ccbf11	Fix things	2026-02-10 22:03:35 +01:00
Martin Pander	65cc61773f	Refactore nvim config	2026-02-10 22:00:42 +01:00
Martin Pander	eb1c83806d	Rename systems	2026-02-09 19:47:11 +01:00
Martin Pander	0f534320a7	Fix flake	2026-02-09 13:12:29 +01:00
Martin Pander	05c7d3443a	Make home manager stable	2026-02-09 13:07:01 +01:00
Martin Pander	95dd2b7e5f	Use stable nixos	2026-02-09 12:17:34 +01:00
Martin Pander	cc6b13faf5	Update docs	2026-02-08 22:17:30 +01:00
Martin Pander	3d45b378ca	Fix ssh	2026-02-07 21:27:34 +01:00
Martin Pander	cda09842fd	Fix ssh on nixos	2026-02-07 21:20:47 +01:00
Martin Pander	976ff60cc6	Fix ssh on nixos	2026-02-07 21:05:15 +01:00
Martin Pander	980d2f8c73	Add tasksquire	2026-02-07 20:49:12 +01:00
Martin Pander	b7b64049a3	Add SSH config	2026-02-07 20:09:56 +01:00
Martin Pander	bd3e120fb0	Add sops env var	2026-02-07 16:28:40 +01:00
Martin Pander	3bdd7e1c50	Add secrets	2026-02-07 16:11:52 +01:00
Martin Pander	61bb1578e0	Add secret handling	2026-02-07 15:55:01 +01:00
Martin Pander	a9c5e2398d	Revert "Add ghostty info" This reverts commit `f4d15c3d1b`.	2026-02-07 15:11:05 +01:00
Martin Pander	f4d15c3d1b	Add ghostty info	2026-02-07 15:09:30 +01:00
Martin Pander	28f2042ad0	Make sourcing profile optional	2026-02-07 15:02:08 +01:00
Martin Pander	84ad11d543	Make config more configurable	2026-02-07 14:23:51 +01:00
Martin Pander	a81bae3a85	Add unified nix configuration	2026-02-07 13:54:58 +01:00
Martin Pander	0f2baf4651	Fix things	2026-02-06 23:06:49 +01:00
Martin Pander	744cb9eb0d	Refactor nix config	2026-02-06 21:41:49 +01:00
Martin	8ca8d55826	[WIP] Refactor nix config	2026-02-06 20:51:39 +01:00
Martin Pander	f54655f3ae	Add gc	2026-02-06 16:08:01 +01:00
Martin Pander	0e00b8811a	Add nixos config	2026-02-06 15:23:14 +01:00
Martin Pander	802c215d71	Updates	2026-01-19 12:49:56 +01:00
Martin Pander	6eda68d8a4	Update flake; Fix Obsidian.nvim	2025-11-26 06:20:24 +01:00
Martin Pander	adb2595344	Things	2025-11-13 08:42:39 +01:00
Martin Pander	cc19b77b63	Update flake	2025-09-29 13:55:57 +02:00
Martin Pander	e00d798cfe	Add lldb debug config	2025-07-25 11:14:39 +02:00
Martin Pander	d6311e5c1a	Add copilot keymaps	2025-07-25 09:51:39 +02:00
Martin	285d23cd18	Add nvim copilot chat	2025-07-24 21:52:58 +02:00
Martin	b313e4516f	Add nvim render markdown	2025-07-24 19:51:26 +02:00
Martin Pander	bd20986f0d	Nvim	2025-07-24 12:15:43 +02:00
Martin	4cd09b24e1	Add relative line numbers	2025-07-22 20:33:19 +02:00
Martin Pander	1ef09c5115	Add lsp implementation	2025-07-22 08:12:43 +02:00
Martin Pander	a95ce2e095	Merge main	2025-07-22 08:09:53 +02:00
Martin	46b2c33e7b	Merge main	2025-07-16 20:16:14 +02:00
Martin	0406542220	Merge main	2025-07-16 19:08:58 +02:00
Martin Pander	70c37da9ef	nvim cmp priorities	2025-07-16 09:25:13 +02:00
Martin Pander	6a651c6a3d	Fix wsl detection	2025-07-11 07:39:57 +02:00
Martin	606e5bed8e	Sync config for all systems	2025-07-10 20:05:30 +02:00
Martin Pander	2d93535296	Add tmux displays	2025-07-10 14:05:58 +02:00
Martin Pander	d33e403915	Merge main; Move ft	2025-07-10 07:55:44 +02:00
Martin Pander	e0e6cb760e	Plugins and things	2025-07-10 07:11:10 +02:00
Martin Pander	f4488f2469	Add debugging keymaps	2025-07-01 10:29:20 +02:00
Martin	c5f98b9238	Minor things	2025-06-26 16:04:04 +02:00
Martin Pander	c736ac9c64	Minor things	2025-06-25 15:37:06 +02:00
Martin Pander	9f75201e84	Merge dap config from main	2025-06-24 07:40:43 +02:00
Martin Pander	27643e0837	Update Obsidian config	2025-06-23 13:33:03 +02:00
Martin	90b2f80c83	Merge changes from main	2025-06-22 20:04:02 +02:00
Martin Pander	a4d57120bf	Update nvim	2025-06-17 07:19:09 +02:00
Martin Pander	7de0c50a3a	Update things	2025-04-28 13:55:41 +02:00
Martin Pander	05d3d997dc	Merge branch 'nix' into nix-work	2025-02-27 12:09:55 +01:00
Martin Pander	b606d2a33d	Add open command	2025-02-27 09:03:02 +01:00
Martin Pander	0e3e5077f3	Update versions	2024-12-04 07:22:37 +01:00
Martin Pander	f9ebfc652f	Fix git lg	2024-10-22 12:06:09 +02:00
Martin Pander	f23c3d413b	Add task reports; Add git diff setup	2024-09-23 08:25:51 +02:00
Martin Pander	85c6ae78fb	Update shell and tasks	2024-05-17 14:18:57 +02:00
Martin Pander	6d106b954d	Add zoxide	2024-04-26 15:03:58 +02:00
Martin Pander	d2763cfa8b	Additions for work machine	2024-04-10 11:19:24 +02:00