Compare commits
65 Commits
664ec5613f
...
unified
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38083b9af4 | ||
|
|
9b0b1f76f9 | ||
|
|
4460f57073 | ||
|
|
2fbabfb771 | ||
|
|
6250ccbf11 | ||
|
|
65cc61773f | ||
|
|
eb1c83806d | ||
|
|
0f534320a7 | ||
|
|
05c7d3443a | ||
|
|
95dd2b7e5f | ||
|
|
cc6b13faf5 | ||
|
|
3d45b378ca | ||
|
|
cda09842fd | ||
|
|
976ff60cc6 | ||
|
|
980d2f8c73 | ||
|
|
b7b64049a3 | ||
|
|
bd3e120fb0 | ||
|
|
3bdd7e1c50 | ||
|
|
61bb1578e0 | ||
|
|
a9c5e2398d | ||
|
|
f4d15c3d1b | ||
|
|
28f2042ad0 | ||
|
|
84ad11d543 | ||
|
|
a81bae3a85 | ||
|
|
0f2baf4651 | ||
|
|
744cb9eb0d | ||
|
|
8ca8d55826 | ||
|
|
f54655f3ae | ||
|
|
0e00b8811a | ||
|
|
802c215d71 | ||
|
|
6eda68d8a4 | ||
|
|
adb2595344 | ||
|
|
cc19b77b63 | ||
|
|
e00d798cfe | ||
|
|
d6311e5c1a | ||
|
|
285d23cd18 | ||
|
|
b313e4516f | ||
|
|
bd20986f0d | ||
|
|
4cd09b24e1 | ||
|
|
1ef09c5115 | ||
|
|
a95ce2e095 | ||
|
|
46b2c33e7b | ||
|
|
0406542220 | ||
|
|
70c37da9ef | ||
|
|
6a651c6a3d | ||
|
|
606e5bed8e | ||
|
|
2d93535296 | ||
|
|
d33e403915 | ||
|
|
e0e6cb760e | ||
|
|
f4488f2469 | ||
|
|
c5f98b9238 | ||
|
|
c736ac9c64 | ||
|
|
9f75201e84 | ||
|
|
27643e0837 | ||
|
|
90b2f80c83 | ||
|
|
a4d57120bf | ||
|
|
7de0c50a3a | ||
|
|
05d3d997dc | ||
|
|
b606d2a33d | ||
|
|
0e3e5077f3 | ||
|
|
f9ebfc652f | ||
|
|
f23c3d413b | ||
|
|
85c6ae78fb | ||
|
|
6d106b954d | ||
|
|
d2763cfa8b |
130
README.md
Normal file
130
README.md
Normal file
@@ -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'
|
||||
```
|
||||
149
TODO.md
Normal file
149
TODO.md
Normal file
@@ -0,0 +1,149 @@
|
||||
# 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
|
||||
- [ ] Consider adding dircolors configuration
|
||||
|
||||
### Documentation
|
||||
|
||||
- [ ] Add screenshots of tmux setup
|
||||
- [ ] 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:
|
||||
|
||||
- [ ] Desktop environment / Window manager
|
||||
- [ ] Display manager (GDM, SDDM, LightDM)
|
||||
- [ ] Sound configuration (PipeWire/PulseAudio)
|
||||
- [ ] Printing support
|
||||
- [ ] Bluetooth support
|
||||
- [ ] Docker / Podman
|
||||
- [ ] Virtualization (QEMU/KVM)
|
||||
|
||||
## Known Issues
|
||||
|
||||
### Nvim Configuration Files
|
||||
|
||||
The nvim configuration references lua files from the parent directory:
|
||||
```nix
|
||||
initLua = builtins.concatStringsSep "\n" [
|
||||
(lib.strings.fileContents ../../../nvim/base.lua)
|
||||
(lib.strings.fileContents ../../../nvim/keymaps.lua)
|
||||
(lib.strings.fileContents ../../../nvim/plugins.lua)
|
||||
(lib.strings.fileContents ../../../nvim/filetype.lua)
|
||||
];
|
||||
```
|
||||
|
||||
**Status**: Should work if nvim/ directory exists at `/home/pan/dev/config/dot/nvim/`
|
||||
|
||||
**Action**: Verify these files exist or adjust paths
|
||||
|
||||
### Profile Loading
|
||||
|
||||
The shell configuration is now configurable via `dot.sh.sourceProfile`:
|
||||
```nix
|
||||
profileExtra = lib.mkIf cfg.sourceProfile ''
|
||||
source $HOME/.profile
|
||||
'';
|
||||
```
|
||||
|
||||
**Status**: Disabled by default. Only enabled for work host.
|
||||
|
||||
**Action**: Verify `~/.profile` exists on hosts where `dot.sh.sourceProfile = true` is set.
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
Before considering this configuration complete:
|
||||
|
||||
- [ ] System boots successfully
|
||||
- [ ] User can login as `pan`
|
||||
- [ ] Zsh loads with Prezto
|
||||
- [ ] Tmux starts without errors
|
||||
- [ ] Neovim opens and plugins load
|
||||
- [ ] LSP servers work in Neovim
|
||||
- [ ] Git commands work with correct identity
|
||||
- [ ] Lazygit opens and works
|
||||
- [ ] Jujutsu commands work
|
||||
- [ ] Taskwarrior shows tasks
|
||||
- [ ] Direnv loads `.envrc` files
|
||||
- [ ] fzf keybindings work (Ctrl+R)
|
||||
- [ ] zoxide navigation works
|
||||
- [ ] All shell aliases work
|
||||
|
||||
## Future Enhancements
|
||||
|
||||
- [ ] Add backup/restore scripts
|
||||
- [ ] Create CI/CD for testing configuration
|
||||
- [ ] Add secrets management (agenix or sops-nix)
|
||||
- [ ] 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)?
|
||||
309
flake.lock
generated
Normal file
309
flake.lock
generated
Normal file
@@ -0,0 +1,309 @@
|
||||
{
|
||||
"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-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"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-stable"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770260404,
|
||||
"narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
|
||||
"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": 1763992789,
|
||||
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770184146,
|
||||
"narHash": "sha256-DsqnN6LvXmohTRaal7tVZO/AKBuZ02kPBiZKSU4qa/k=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "0d7874ef7e3ba02d58bebb871e6e29da36fa1b37",
|
||||
"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": 1770657009,
|
||||
"narHash": "sha256-v/LA5ZSJ+JQYzMSKB4sySM0wKfsAqddNzzxLLnbsV/E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "5b50ea1aaa14945d4794c80fcc99c4aa1db84d2d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1770562336,
|
||||
"narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1770617025,
|
||||
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-wsl-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1770197578,
|
||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"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": 1770683991,
|
||||
"narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"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-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770735271,
|
||||
"narHash": "sha256-Vt1di5EUPq6ijBX0h8aaRVnSkCDpI5Myd2tXjQlK3Tw=",
|
||||
"ref": "dev",
|
||||
"rev": "6e606985267d438f6d30a117863812347960694b",
|
||||
"revCount": 48,
|
||||
"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
|
||||
}
|
||||
149
flake.nix
Normal file
149
flake.nix
Normal file
@@ -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.05";
|
||||
|
||||
nixos-wsl = {
|
||||
url = "github:nix-community/NixOS-WSL";
|
||||
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.05";
|
||||
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) ];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
22
hosts/home/common.nix
Normal file
22
hosts/home/common.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{ 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;
|
||||
};
|
||||
}
|
||||
19
hosts/home/darwin/configuration.nix
Normal file
19
hosts/home/darwin/configuration.nix
Normal file
@@ -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";
|
||||
}
|
||||
12
hosts/home/nix/home.nix
Normal file
12
hosts/home/nix/home.nix
Normal file
@@ -0,0 +1,12 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../common.nix
|
||||
];
|
||||
|
||||
home.username = "martin";
|
||||
home.homeDirectory = "/Users/martin";
|
||||
|
||||
home.stateVersion = "24.05";
|
||||
}
|
||||
32
hosts/home/nixos/configuration.nix
Normal file
32
hosts/home/nixos/configuration.nix
Normal file
@@ -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";
|
||||
}
|
||||
13
hosts/home/nixos/home.nix
Normal file
13
hosts/home/nixos/home.nix
Normal file
@@ -0,0 +1,13 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../common.nix
|
||||
];
|
||||
|
||||
# User details
|
||||
home.username = "martin";
|
||||
home.homeDirectory = "/home/martin";
|
||||
|
||||
home.stateVersion = "25.11";
|
||||
}
|
||||
26
hosts/work/common.nix
Normal file
26
hosts/work/common.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{ 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;
|
||||
};
|
||||
|
||||
dot.tmux.workMode = true;
|
||||
dot.nvim.workMode = true;
|
||||
}
|
||||
19
hosts/work/nix/home.nix
Normal file
19
hosts/work/nix/home.nix
Normal file
@@ -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;
|
||||
|
||||
}
|
||||
22
hosts/work/nixos/configuration.nix
Normal file
22
hosts/work/nixos/configuration.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{ 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;
|
||||
};
|
||||
|
||||
system.stateVersion = "25.05";
|
||||
}
|
||||
17
hosts/work/nixos/home.nix
Normal file
17
hosts/work/nixos/home.nix
Normal file
@@ -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;
|
||||
}
|
||||
59
modules/home/common.nix
Normal file
59
modules/home/common.nix
Normal file
@@ -0,0 +1,59 @@
|
||||
{ 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
|
||||
];
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
||||
52
modules/home/dev.nix
Normal file
52
modules/home/dev.nix
Normal file
@@ -0,0 +1,52 @@
|
||||
{ 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
|
||||
];
|
||||
}
|
||||
|
||||
(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);
|
||||
})
|
||||
];
|
||||
}
|
||||
89
modules/home/git.nix
Normal file
89
modules/home/git.nix
Normal file
@@ -0,0 +1,89 @@
|
||||
{ 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" "@-"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
100
modules/home/nvim.nix
Normal file
100
modules/home/nvim.nix
Normal file
@@ -0,0 +1,100 @@
|
||||
{ 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
|
||||
bullets-vim
|
||||
nvim-dap
|
||||
nvim-nio
|
||||
nvim-dap-ui
|
||||
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_home = ${if pkgs.stdenv.isDarwin 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
|
||||
];
|
||||
};
|
||||
}
|
||||
20
modules/home/secrets.nix
Normal file
20
modules/home/secrets.nix
Normal file
@@ -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;
|
||||
};
|
||||
}
|
||||
109
modules/home/sh.nix
Normal file
109
modules/home/sh.nix
Normal file
@@ -0,0 +1,109 @@
|
||||
{ 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
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
BAT_THEME = "Coldark-Cold";
|
||||
};
|
||||
|
||||
home.shellAliases = {
|
||||
lst = "lsd --tree";
|
||||
};
|
||||
};
|
||||
}
|
||||
76
modules/home/task.nix
Normal file
76
modules/home/task.nix
Normal file
@@ -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";
|
||||
}
|
||||
];
|
||||
}
|
||||
83
modules/home/tmux.nix
Normal file
83
modules/home/tmux.nix
Normal file
@@ -0,0 +1,83 @@
|
||||
{ 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 = 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}"
|
||||
|
||||
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";
|
||||
};
|
||||
};
|
||||
}
|
||||
46
modules/nixos/common.nix
Normal file
46
modules/nixos/common.nix
Normal file
@@ -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
|
||||
];
|
||||
}
|
||||
18
modules/nixos/secrets.nix
Normal file
18
modules/nixos/secrets.nix
Normal file
@@ -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;
|
||||
};
|
||||
};
|
||||
}
|
||||
182
modules/nvim/lua/base.lua
Normal file
182
modules/nvim/lua/base.lua
Normal file
@@ -0,0 +1,182 @@
|
||||
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.fillchars = 'vert:|,fold: '
|
||||
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]])
|
||||
|
||||
163
modules/nvim/lua/filetype.lua
Normal file
163
modules/nvim/lua/filetype.lua
Normal file
@@ -0,0 +1,163 @@
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true })
|
||||
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
group = 'FileTypeConfigs',
|
||||
pattern = 'python',
|
||||
callback = function()
|
||||
require('dap-python').setup()
|
||||
-- lspconfig.pyright.setup({ capabilities = capabilities })
|
||||
-- require("conform").setup({
|
||||
-- python = {"black"},
|
||||
-- })
|
||||
end,
|
||||
})
|
||||
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- group = 'FileTypeConfigs',
|
||||
-- pattern = 'go',
|
||||
-- callback = function()
|
||||
-- require('dap-python').setup()
|
||||
-- require('dap-go').setup()
|
||||
|
||||
vim.lsp.enable('ruff')
|
||||
vim.lsp.enable('gopls')
|
||||
vim.lsp.enable('marksman')
|
||||
vim.lsp.enable('rust_analyzer')
|
||||
vim.lsp.enable('dockerls')
|
||||
vim.lsp.enable('docker_compose_language_service')
|
||||
vim.lsp.enable('clangd')
|
||||
vim.lsp.enable('sqls')
|
||||
vim.lsp.enable('zls')
|
||||
vim.lsp.enable('omnisharp')
|
||||
vim.lsp.enable('yamlls')
|
||||
|
||||
-- lspconfig.gopls.setup({ capabilities = capabilities })
|
||||
-- lspconfig.marksman.setup({ capabilities = capabilities })
|
||||
-- lspconfig.rust_analyzer.setup({
|
||||
-- capabilities = capabilities,
|
||||
-- settings = {
|
||||
-- ["rust-analyzer"] = {
|
||||
-- checkOnSave = {
|
||||
-- command = "clippy",
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- })
|
||||
-- lspconfig.dockerls.setup({ capabilities = capabilities })
|
||||
-- lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
|
||||
-- lspconfig.clangd.setup({ capabilities = capabilities })
|
||||
-- lspconfig.sqls.setup({ capabilities = capabilities })
|
||||
-- lspconfig.zls.setup({ capabilities = capabilities })
|
||||
-- lspconfig.omnisharp.setup({ capabilities = capabilities })
|
||||
-- lspconfig.yamlls.setup({ capabilities = capabilities })
|
||||
|
||||
require("conform").setup({
|
||||
go = {"gofmt"},
|
||||
python = {"black"},
|
||||
rust = {"rustfmt"},
|
||||
})
|
||||
-- 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",
|
||||
}),
|
||||
})
|
||||
131
modules/nvim/lua/keymaps.lua
Normal file
131
modules/nvim/lua/keymaps.lua
Normal file
@@ -0,0 +1,131 @@
|
||||
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', "<F5>", function() require("dap").continue() end)
|
||||
vim.keymap.set('n', "<F11>", function() require("dap").step_into() end)
|
||||
vim.keymap.set('n', "<F10>", function() require("dap").step_over() end)
|
||||
vim.keymap.set('n', "<F12>", function() require("dap").step_out() end)
|
||||
|
||||
476
modules/nvim/lua/plugins.lua
Normal file
476
modules/nvim/lua/plugins.lua
Normal file
@@ -0,0 +1,476 @@
|
||||
-- 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("dapui").setup()
|
||||
require("nvim-dap-virtual-text").setup()
|
||||
|
||||
local dap, dapui = require("dap"), require("dapui")
|
||||
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_home 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
|
||||
|
||||
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 },
|
||||
},
|
||||
},
|
||||
})
|
||||
13
modules/overlays/unstable.nix
Normal file
13
modules/overlays/unstable.nix
Normal file
@@ -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;
|
||||
};
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
69
nix/flake.lock
generated
69
nix/flake.lock
generated
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
|
||||
programs.ripgrep.enable = true;
|
||||
}
|
||||
@@ -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"
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -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
|
||||
];
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
}
|
||||
@@ -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";
|
||||
}
|
||||
];
|
||||
}
|
||||
@@ -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";
|
||||
}
|
||||
];
|
||||
}
|
||||
@@ -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";
|
||||
}
|
||||
];
|
||||
}
|
||||
@@ -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";
|
||||
}
|
||||
];
|
||||
}
|
||||
@@ -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, {})
|
||||
@@ -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>
|
||||
190
nvim/plugins.lua
190
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()
|
||||
10
secrets/.sops.yaml
Normal file
10
secrets/.sops.yaml
Normal file
@@ -0,0 +1,10 @@
|
||||
keys:
|
||||
- &macbook age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
|
||||
- &macnix age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
|
||||
|
||||
creation_rules:
|
||||
- path_regex: secrets\.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *macbook
|
||||
- *macnix
|
||||
25
secrets/secrets.yaml
Normal file
25
secrets/secrets.yaml
Normal file
@@ -0,0 +1,25 @@
|
||||
gemini_api_key: ENC[AES256_GCM,data:nN7Hng==,iv:uOL0UyHpiRpAXfkX8qyVAnJZFm4ljkgYiZycrdSoW9U=,tag:7A/rHJcEykcoyJLeTV/gaw==,type:str]
|
||||
sops:
|
||||
age:
|
||||
- recipient: age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxUEZwYkFDYVd4ek53QU13
|
||||
YStKbEVOeTJaalVIWXh1SUlrSnUzanM0anpBCktBMytXQUNyOTZaZGc4NG1Ta1lX
|
||||
Mi91UWxXZWZjRDZqNDJWQU1YODgzUkkKLS0tIFY4TjUyczQ0SGZMOUM0NkQvUC94
|
||||
WDBpdDJMaWVvUGZUcXZLZE9oYjdKLzgK4B25MbF/3bUFJ5+zxUfpSNM79HT13nux
|
||||
dvlcwkwYKIkS9YZpnyiYXZGupFhUcq1ipIvsbq/B3WR9IFn4xromPw==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvK0lsajZ1b3dlMVA4Z2hm
|
||||
ek9lZENNYnVnQXp2U0hGM2pDd0FSL2JVbVhVClZUTWhNcmJadSttU2UrRVhTWU1y
|
||||
RVV6NlpndEsyYk9zSmRqLytOWUtCNWMKLS0tIGN1TDJPY2orMGJobFExUEhWYzdx
|
||||
dDB3YWVlbUY4V25pa0IvTW1xNG1XcmMK+LLoW8f+M0eBIyxwI3tD637Fw/FuXmYx
|
||||
RV/hAOaznmfq3filh9KAEA+A/9mDI2lUeF/ye/g27tEEVtNRF9H+Dg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2026-02-07T15:11:34Z"
|
||||
mac: ENC[AES256_GCM,data:Pgi9tYWnrMrlM9NjqDy0+BrH51/0T4c7M6dornLCumnRtR2Y3MZYGyA2E97kbwuqoPJCOWkzhJt7smwCRI+H0rXveO+ps+v5iUxzP+7MQmepn5wjS32HoL5c2Oer4CR7PkKY7YvL7z5IT6QcIgRXMODhsVbWgB8CjPrn/GYqb5Y=,iv:A2AyCNHfQEdx/wvUJQGc9ndL2/OYGGxBMidYOTHXO7Q=,tag:9uzJcu3bogQgVj0bDOPCwg==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.11.0
|
||||
Reference in New Issue
Block a user