Compare commits
43 Commits
unified
...
533ca8390f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
533ca8390f | ||
|
|
cbe19bad55 | ||
|
|
5e0ebe4406 | ||
|
|
653ec4e4af | ||
|
|
bebb12d20d | ||
|
|
591ffb72bd | ||
|
|
a3bb2e838a | ||
|
|
3edee1b0f6 | ||
|
|
3c42fdedf8 | ||
|
|
1e0bc5d2b8 | ||
|
|
4343c4b7ee | ||
|
|
186752a734 | ||
|
|
a50db2350a | ||
|
|
850fc48981 | ||
|
|
15c019b4df | ||
|
|
c092fdeb48 | ||
|
|
affbd5ccca | ||
|
|
360789b171 | ||
|
|
50b95c9721 | ||
|
|
a26bbb3b5b | ||
|
|
93549cc312 | ||
|
|
433536db6a | ||
|
|
98169a672b | ||
|
|
ad7c88a221 | ||
|
|
2253f44399 | ||
|
|
e45151a774 | ||
|
|
f87d3eb2e4 | ||
|
|
c8e7799db2 | ||
|
|
36bb532cc9 | ||
|
|
2fbab2f267 | ||
|
|
a6b3250434 | ||
|
|
4049d3981b | ||
|
|
0012b07304 | ||
|
|
f7d8e728ff | ||
|
|
228fb04814 | ||
|
|
80fb31ffe1 | ||
|
|
240c838a7b | ||
|
|
1e7c110903 | ||
|
|
87dbdd522b | ||
|
|
74a01d576e | ||
|
|
cb8f841e43 | ||
|
|
1ce6ddf090 | ||
|
|
5c878e1458 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +0,0 @@
|
|||||||
plugins/
|
|
||||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,3 +0,0 @@
|
|||||||
[submodule "vim/bundle/Vundle.vim"]
|
|
||||||
path = vim/bundle/Vundle.vim
|
|
||||||
url = https://github.com/gmarik/Vundle.vim.git
|
|
||||||
51
TODO.md
51
TODO.md
@@ -33,11 +33,9 @@ This file tracks remaining tasks and known issues for the NixOS configuration.
|
|||||||
|
|
||||||
- [ ] Consider adding additional shell aliases
|
- [ ] Consider adding additional shell aliases
|
||||||
- [ ] Review if any macOS-specific tools need Linux alternatives
|
- [ ] Review if any macOS-specific tools need Linux alternatives
|
||||||
- [ ] Consider adding dircolors configuration
|
|
||||||
|
|
||||||
### Documentation
|
### Documentation
|
||||||
|
|
||||||
- [ ] Add screenshots of tmux setup
|
|
||||||
- [ ] Document custom Neovim configuration (lua files)
|
- [ ] Document custom Neovim configuration (lua files)
|
||||||
- [ ] Create troubleshooting guide for common issues
|
- [ ] Create troubleshooting guide for common issues
|
||||||
|
|
||||||
@@ -51,69 +49,20 @@ This file tracks remaining tasks and known issues for the NixOS configuration.
|
|||||||
|
|
||||||
These were not in the original Home Manager config but might be useful on NixOS:
|
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
|
- [ ] Docker / Podman
|
||||||
- [ ] Virtualization (QEMU/KVM)
|
|
||||||
|
|
||||||
## Known Issues
|
## 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
|
## Testing Checklist
|
||||||
|
|
||||||
Before considering this configuration complete:
|
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
|
- [ ] 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
|
## Future Enhancements
|
||||||
|
|
||||||
- [ ] Add backup/restore scripts
|
- [ ] Add backup/restore scripts
|
||||||
- [ ] Create CI/CD for testing configuration
|
- [ ] Create CI/CD for testing configuration
|
||||||
- [ ] Add secrets management (agenix or sops-nix)
|
|
||||||
- [ ] Consider using flake-parts for better organization
|
- [ ] Consider using flake-parts for better organization
|
||||||
- [ ] Add system monitoring tools
|
- [ ] Add system monitoring tools
|
||||||
- [ ] Configure automatic updates
|
- [ ] Configure automatic updates
|
||||||
|
|||||||
459
flake.lock
generated
459
flake.lock
generated
@@ -1,5 +1,63 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"bun2nix": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-parts": "flake-parts",
|
||||||
|
"import-tree": "import-tree",
|
||||||
|
"nixpkgs": [
|
||||||
|
"hunk",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": "systems",
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1770895533,
|
||||||
|
"narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "bun2nix",
|
||||||
|
"rev": "c843f477b15f51151f8c6bcc886954699440a6e1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "bun2nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"bun2nix_2": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-parts": [
|
||||||
|
"llm-agents",
|
||||||
|
"flake-parts"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"llm-agents",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"llm-agents",
|
||||||
|
"systems"
|
||||||
|
],
|
||||||
|
"treefmt-nix": [
|
||||||
|
"llm-agents",
|
||||||
|
"treefmt-nix"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1782772816,
|
||||||
|
"narHash": "sha256-s9BuFv0mRuZx9C1MF8qPHRdcAK14ONi0A5m6E2wqOoM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "bun2nix",
|
||||||
|
"rev": "5a39d717029e94163ac223aee8d5c9946cafed1c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "bun2nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -16,9 +74,66 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-parts": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1769996383,
|
||||||
|
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-parts_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": [
|
||||||
|
"llm-agents",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1782949081,
|
||||||
|
"narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-parts_3": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1769996383,
|
||||||
|
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681202837,
|
"lastModified": 1681202837,
|
||||||
@@ -34,24 +149,6 @@
|
|||||||
"type": "github"
|
"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": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -59,16 +156,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770260404,
|
"lastModified": 1783740085,
|
||||||
"narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
|
"narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
|
"rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.11",
|
"ref": "release-26.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -80,32 +177,86 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763992789,
|
"lastModified": 1783740085,
|
||||||
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
|
"narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
|
"rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.05",
|
"ref": "release-26.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"hunk": {
|
||||||
|
"inputs": {
|
||||||
|
"bun2nix": "bun2nix",
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1783931038,
|
||||||
|
"narHash": "sha256-gKf9U1sjnmR2Ok7lGAO5qqYsJ7ZWcP41jGqhcMzFQLk=",
|
||||||
|
"owner": "modem-dev",
|
||||||
|
"repo": "hunk",
|
||||||
|
"rev": "4fdf4bc1e26f6fdceeced81bf7bae8f9bcb8588a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "modem-dev",
|
||||||
|
"repo": "hunk",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"import-tree": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1763762820,
|
||||||
|
"narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=",
|
||||||
|
"owner": "vic",
|
||||||
|
"repo": "import-tree",
|
||||||
|
"rev": "3c23749d8013ec6daa1d7255057590e9ca726646",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "vic",
|
||||||
|
"repo": "import-tree",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"llm-agents": {
|
||||||
|
"inputs": {
|
||||||
|
"bun2nix": "bun2nix_2",
|
||||||
|
"flake-parts": "flake-parts_2",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"systems": "systems_2",
|
||||||
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1784011337,
|
||||||
|
"narHash": "sha256-5+VL25vjGT8wxdKz8ebFr7eL3Ot4Bmy+QW/Y1ayFjHQ=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "llm-agents.nix",
|
||||||
|
"rev": "8e68da4b08d1f5d0365dc1dcb066d998f0c69b31",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "llm-agents.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix-darwin": {
|
"nix-darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_3"
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770184146,
|
"lastModified": 1783395956,
|
||||||
"narHash": "sha256-DsqnN6LvXmohTRaal7tVZO/AKBuZ02kPBiZKSU4qa/k=",
|
"narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "0d7874ef7e3ba02d58bebb871e6e29da36fa1b37",
|
"rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -117,9 +268,7 @@
|
|||||||
"nixos-vscode-server": {
|
"nixos-vscode-server": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_4"
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770124655,
|
"lastModified": 1770124655,
|
||||||
@@ -143,90 +292,202 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770657009,
|
"lastModified": 1783897462,
|
||||||
"narHash": "sha256-v/LA5ZSJ+JQYzMSKB4sySM0wKfsAqddNzzxLLnbsV/E=",
|
"narHash": "sha256-SggqDrhk0+7YtsUgDArP42vnolNITo602XY9mn5amF0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "nixos-wsl",
|
||||||
"rev": "5b50ea1aaa14945d4794c80fcc99c4aa1db84d2d",
|
"rev": "ff26608a372676b74799da5a9a4d06ce1a4fca2a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"ref": "release-26.05",
|
||||||
|
"repo": "nixos-wsl",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770562336,
|
"lastModified": 1777954456,
|
||||||
"narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
|
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
|
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-lib": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1769909678,
|
||||||
|
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"rev": "72716169fe93074c333e8d0173151350670b824c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-lib_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1769909678,
|
||||||
|
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"rev": "72716169fe93074c333e8d0173151350670b824c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixpkgs.lib",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770617025,
|
"lastModified": 1783856661,
|
||||||
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=",
|
"narHash": "sha256-ZGP04e+Q6WyQJGA9ZvI5CL6+heGQldbAG9U1T9NGvmU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482",
|
"rev": "569d578509928497eddc3fdbf94a799027050be4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-wsl-stable": {
|
"nixpkgs-wsl-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767313136,
|
"lastModified": 1783856661,
|
||||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
"narHash": "sha256-ZGP04e+Q6WyQJGA9ZvI5CL6+heGQldbAG9U1T9NGvmU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
"rev": "569d578509928497eddc3fdbf94a799027050be4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770197578,
|
"lastModified": 1783816212,
|
||||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
"narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
"rev": "3b32825de172d0bc85664f495edb096b10862524",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1783279667,
|
||||||
|
"narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1682134069,
|
||||||
|
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_5": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1783776592,
|
||||||
|
"narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_6": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1782175435,
|
||||||
|
"narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_7": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1771369470,
|
||||||
|
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "0182a361324364ae3f436a63005877674cf45efb",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"home-manager-wsl": "home-manager-wsl",
|
"home-manager-wsl": "home-manager-wsl",
|
||||||
|
"hunk": "hunk",
|
||||||
|
"llm-agents": "llm-agents",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nixos-vscode-server": "nixos-vscode-server",
|
"nixos-vscode-server": "nixos-vscode-server",
|
||||||
"nixos-wsl": "nixos-wsl",
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nixpkgs-wsl-stable": "nixpkgs-wsl-stable",
|
"nixpkgs-wsl-stable": "nixpkgs-wsl-stable",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
@@ -235,16 +496,14 @@
|
|||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_6"
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770683991,
|
"lastModified": 1783174389,
|
||||||
"narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
|
"narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
|
"rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -283,17 +542,32 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"tasksquire": {
|
"tasksquire": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-parts": "flake-parts_3",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770735271,
|
"lastModified": 1771878653,
|
||||||
"narHash": "sha256-Vt1di5EUPq6ijBX0h8aaRVnSkCDpI5Myd2tXjQlK3Tw=",
|
"narHash": "sha256-+OkJmYH+h5dgAbUtbGq8fZ90g5/rwiew5WPmbexD9kI=",
|
||||||
"ref": "dev",
|
"ref": "dev",
|
||||||
"rev": "6e606985267d438f6d30a117863812347960694b",
|
"rev": "6b1418fc71be513ba5ebb718da29e3190c3fda58",
|
||||||
"revCount": 48,
|
"revCount": 52,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@git.pander.me/martin/tasksquire.git"
|
"url": "ssh://git@git.pander.me/martin/tasksquire.git"
|
||||||
},
|
},
|
||||||
@@ -302,6 +576,49 @@
|
|||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@git.pander.me/martin/tasksquire.git"
|
"url": "ssh://git@git.pander.me/martin/tasksquire.git"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"hunk",
|
||||||
|
"bun2nix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1770228511,
|
||||||
|
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"llm-agents",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1780220602,
|
||||||
|
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "db947814a175b7ca6ded66e21383d938df01c227",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
23
flake.nix
23
flake.nix
@@ -5,44 +5,47 @@
|
|||||||
# Unstable for standalone configurations and overlays
|
# Unstable for standalone configurations and overlays
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||||
|
|
||||||
nixpkgs-wsl-stable.url = "github:nixos/nixpkgs/nixos-25.05";
|
nixpkgs-wsl-stable.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||||
|
|
||||||
nixos-wsl = {
|
nixos-wsl = {
|
||||||
url = "github:nix-community/NixOS-WSL";
|
url = "github:nix-community/nixos-wsl/release-26.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
|
inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.11";
|
url = "github:nix-community/home-manager/release-26.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager-wsl = {
|
home-manager-wsl = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-26.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
|
inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-darwin = {
|
nix-darwin = {
|
||||||
url = "github:LnL7/nix-darwin";
|
url = "github:LnL7/nix-darwin";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# individual packages
|
# individual packages
|
||||||
sops-nix = {
|
sops-nix = {
|
||||||
url = "github:Mic92/sops-nix";
|
url = "github:Mic92/sops-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixos-vscode-server = {
|
nixos-vscode-server = {
|
||||||
url = "github:nix-community/nixos-vscode-server";
|
url = "github:nix-community/nixos-vscode-server";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
tasksquire = {
|
tasksquire = {
|
||||||
url = "git+ssh://git@git.pander.me/martin/tasksquire.git?ref=dev";
|
url = "git+ssh://git@git.pander.me/martin/tasksquire.git?ref=dev";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hunk = {
|
||||||
|
url = "github:modem-dev/hunk";
|
||||||
|
};
|
||||||
|
|
||||||
|
llm-agents.url = "github:numtide/llm-agents.nix";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-wsl-stable, nixos-wsl, home-manager, home-manager-wsl, nix-darwin, ... }@inputs:
|
outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-wsl-stable, nixos-wsl, home-manager, home-manager-wsl, nix-darwin, ... }@inputs:
|
||||||
@@ -70,7 +73,9 @@
|
|||||||
{
|
{
|
||||||
nixpkgs.hostPlatform = linuxSystem;
|
nixpkgs.hostPlatform = linuxSystem;
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
|
nixpkgs.overlays = [
|
||||||
|
(import ./modules/overlays/unstable.nix nixpkgs)
|
||||||
|
];
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.extraSpecialArgs = {
|
home-manager.extraSpecialArgs = {
|
||||||
|
|||||||
@@ -18,5 +18,8 @@
|
|||||||
dot.llm = {
|
dot.llm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
gemini-cli.enable = true;
|
gemini-cli.enable = true;
|
||||||
|
opencode.enable = true;
|
||||||
|
opencode.enableConfig = true;
|
||||||
|
# pi.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,8 +17,10 @@
|
|||||||
|
|
||||||
dot.llm = {
|
dot.llm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
claude-code.enable = true;
|
|
||||||
opencode.enable = true;
|
opencode.enable = true;
|
||||||
|
opencode.enableConfig = true;
|
||||||
|
opencode.workMode = true;
|
||||||
|
pi.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
dot.tmux.workMode = true;
|
dot.tmux.workMode = true;
|
||||||
|
|||||||
@@ -5,11 +5,15 @@
|
|||||||
../../../modules/nixos/common.nix
|
../../../modules/nixos/common.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# For sshfs
|
||||||
|
programs.fuse.userAllowOther = true;
|
||||||
|
|
||||||
wsl.enable = true;
|
wsl.enable = true;
|
||||||
wsl.defaultUser = "pan";
|
wsl.defaultUser = "pan";
|
||||||
wsl.interop.register = true;
|
wsl.interop.register = true;
|
||||||
|
|
||||||
networking.hostName = "nix";
|
networking.hostName = "nix";
|
||||||
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
users.users.pan = {
|
users.users.pan = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
@@ -18,5 +22,11 @@
|
|||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/home/pan/pro" = {
|
||||||
|
device = "/dev/disk/by-uuid/9a37862c-85db-4434-b06a-ec8c2713ecc9";
|
||||||
|
fsType = "ext4";
|
||||||
|
options = [ "defaults" "nofail" "x-systemd.automount" ];
|
||||||
|
};
|
||||||
|
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,4 @@
|
|||||||
|
|
||||||
# Home Manager release version
|
# Home Manager release version
|
||||||
home.stateVersion = "25.05";
|
home.stateVersion = "25.05";
|
||||||
|
}
|
||||||
# Disable version mismatch warning (intentionally using HM 25.11 with nixpkgs 25.05)
|
|
||||||
home.enableNixpkgsReleaseCheck = false;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
./dev.nix
|
./dev.nix
|
||||||
./nvim.nix
|
./nvim.nix
|
||||||
./task.nix
|
./task.nix
|
||||||
|
./opencode.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
@@ -38,7 +39,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableDefaultConfig = false;
|
enableDefaultConfig = false;
|
||||||
includes = [ "config.local" ];
|
includes = [ "config.local" ];
|
||||||
matchBlocks = {
|
settings = {
|
||||||
"*" = {
|
"*" = {
|
||||||
addKeysToAgent = "yes";
|
addKeysToAgent = "yes";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, inputs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.dot.llm;
|
cfg = config.dot.llm;
|
||||||
@@ -21,6 +21,11 @@ in
|
|||||||
default = false;
|
default = false;
|
||||||
description = "Enable gemini-cli";
|
description = "Enable gemini-cli";
|
||||||
};
|
};
|
||||||
|
pi.enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable pi";
|
||||||
|
};
|
||||||
bubblewrap.enable = lib.mkOption {
|
bubblewrap.enable = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
default = pkgs.stdenv.isLinux;
|
default = pkgs.stdenv.isLinux;
|
||||||
@@ -34,10 +39,23 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
nix-direnv.enable = true;
|
nix-direnv.enable = true;
|
||||||
|
stdlib = ''
|
||||||
|
: ''${XDG_CACHE_HOME:=$HOME/.cache}
|
||||||
|
declare -A direnv_layout_dirs
|
||||||
|
direnv_layout_dir() {
|
||||||
|
echo "''${direnv_layout_dirs[$PWD]:=$(
|
||||||
|
echo -n "$XDG_CACHE_HOME"/direnv/layouts/
|
||||||
|
echo -n "$PWD" | sha1sum | cut -d ' ' -f 1
|
||||||
|
)}"
|
||||||
|
}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
visidata
|
visidata
|
||||||
|
codespelunker
|
||||||
|
jq
|
||||||
|
inputs.hunk.packages.${pkgs.stdenv.hostPlatform.system}.hunk
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,7 +64,8 @@ in
|
|||||||
(lib.optional cfg.claude-code.enable pkgs.unstable.claude-code) ++
|
(lib.optional cfg.claude-code.enable pkgs.unstable.claude-code) ++
|
||||||
(lib.optional cfg.opencode.enable pkgs.unstable.opencode) ++
|
(lib.optional cfg.opencode.enable pkgs.unstable.opencode) ++
|
||||||
(lib.optional cfg.gemini-cli.enable pkgs.unstable.gemini-cli) ++
|
(lib.optional cfg.gemini-cli.enable pkgs.unstable.gemini-cli) ++
|
||||||
|
(lib.optional cfg.pi.enable inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.pi) ++
|
||||||
(lib.optional (cfg.bubblewrap.enable && pkgs.stdenv.isLinux) pkgs.unstable.bubblewrap);
|
(lib.optional (cfg.bubblewrap.enable && pkgs.stdenv.isLinux) pkgs.unstable.bubblewrap);
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,6 +83,22 @@
|
|||||||
settings = {
|
settings = {
|
||||||
aliases = {
|
aliases = {
|
||||||
tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
|
tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
|
||||||
|
lg = ["log"];
|
||||||
|
des = ["describe"];
|
||||||
|
sq = ["squash"];
|
||||||
|
gp = ["git" "push"];
|
||||||
|
nc = [
|
||||||
|
"util" "exec" "--" "bash" "-c"
|
||||||
|
''jj new --no-edit -B "''${2:-@}" -m "$1"''
|
||||||
|
""
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
ui = {
|
||||||
|
default-command = "log";
|
||||||
|
pager = "less -FRX";
|
||||||
|
diff-formatter = ":git";
|
||||||
|
merge-editor = "vimdiff";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ in
|
|||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
|
|
||||||
plugins = with pkgs.vimPlugins; [
|
plugins = with pkgs.vimPlugins; [
|
||||||
|
vscode-nvim
|
||||||
vim-repeat
|
vim-repeat
|
||||||
vim-surround
|
vim-surround
|
||||||
ts-comments-nvim
|
ts-comments-nvim
|
||||||
@@ -56,13 +57,11 @@ in
|
|||||||
cmp-git
|
cmp-git
|
||||||
nvim-lspconfig
|
nvim-lspconfig
|
||||||
lspkind-nvim
|
lspkind-nvim
|
||||||
copilot-lua
|
# opencode-nvim
|
||||||
copilot-cmp
|
|
||||||
CopilotChat-nvim
|
|
||||||
bullets-vim
|
bullets-vim
|
||||||
nvim-dap
|
nvim-dap
|
||||||
nvim-nio
|
nvim-nio
|
||||||
nvim-dap-ui
|
nvim-dap-view
|
||||||
nvim-dap-virtual-text
|
nvim-dap-virtual-text
|
||||||
nvim-dap-go
|
nvim-dap-go
|
||||||
nvim-dap-python
|
nvim-dap-python
|
||||||
@@ -76,23 +75,33 @@ in
|
|||||||
image-nvim
|
image-nvim
|
||||||
img-clip-nvim
|
img-clip-nvim
|
||||||
vim-nix
|
vim-nix
|
||||||
|
indent-blankline-nvim
|
||||||
(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 ]))
|
(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 ]))
|
||||||
|
nvim-treesitter-context
|
||||||
];
|
];
|
||||||
|
|
||||||
extraLuaConfig = ''
|
initLua = ''
|
||||||
_G.is_work = ${if cfg.workMode then "true" else "false"}
|
_G.is_work = ${if cfg.workMode then "true" else "false"}
|
||||||
_G.is_home = ${if pkgs.stdenv.isDarwin then "true" else "false"}
|
_G.is_mac = ${if pkgs.stdenv.isDarwin then "true" else "false"}
|
||||||
|
_G.is_private_nixos = ${if !cfg.workMode && pkgs.stdenv.isLinux then "true" else "false"}
|
||||||
|
|
||||||
require('base')
|
require('base')
|
||||||
require('keymaps')
|
require('keymaps')
|
||||||
require('plugins')
|
require('plugins')
|
||||||
require('filetype')
|
require('filetype')
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
withRuby = false;
|
||||||
|
withPython3 = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow for editing the lua modules without a nix rebuild
|
# 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";
|
xdg.configFile."nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "${config.dot.dotfilesPath}/modules/nvim/lua";
|
||||||
|
|
||||||
|
home.sessionVariables = {
|
||||||
|
VISUAL = "nvim";
|
||||||
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
nodejs-slim
|
nodejs-slim
|
||||||
];
|
];
|
||||||
|
|||||||
92
modules/home/opencode.nix
Normal file
92
modules/home/opencode.nix
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
{ config, lib, inputs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.dot.llm.opencode;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.dot.llm.opencode = {
|
||||||
|
enableConfig = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable managed OpenCode configuration";
|
||||||
|
};
|
||||||
|
|
||||||
|
workMode = lib.mkEnableOption "work-specific opencode configuration";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enableConfig {
|
||||||
|
# Declare the sops secret
|
||||||
|
sops.secrets.langdock_api_key = {
|
||||||
|
# Uses defaultSopsFile from secrets.nix
|
||||||
|
};
|
||||||
|
|
||||||
|
# Create the OpenCode config.json template with secret substitution
|
||||||
|
sops.templates."opencode/opencode.json" = {
|
||||||
|
content = builtins.toJSON (let
|
||||||
|
baseConfig = {
|
||||||
|
"$schema" = "https://opencode.ai/config.json";
|
||||||
|
default_agent = "plan";
|
||||||
|
};
|
||||||
|
|
||||||
|
workConfig = {
|
||||||
|
enabled_providers = [ "anthropic" "langdock-openai" "ollama" ];
|
||||||
|
model = "anthropic/claude-opus-4-6-default";
|
||||||
|
small_model = "anthropic/claude-haiku-4-5-20251001";
|
||||||
|
provider = {
|
||||||
|
langdock-openai = {
|
||||||
|
npm = "@ai-sdk/openai-compatible";
|
||||||
|
name = "Langdock OpenAI";
|
||||||
|
options = {
|
||||||
|
baseURL = "https://api.langdock.com/openai/eu/v1";
|
||||||
|
apiKey = config.sops.placeholder.langdock_api_key;
|
||||||
|
};
|
||||||
|
models = {
|
||||||
|
"gpt-5.5" = { name = "GPT-5.5"; };
|
||||||
|
"gpt-5.4" = { name = "GPT-5.4"; };
|
||||||
|
"gpt-5.4-mini" = { name = "GPT-5.4 mini"; };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
anthropic = {
|
||||||
|
options = {
|
||||||
|
baseURL = "https://api.langdock.com/anthropic/eu/v1";
|
||||||
|
apiKey = config.sops.placeholder.langdock_api_key;
|
||||||
|
};
|
||||||
|
models = {
|
||||||
|
"claude-opus-4-8-default" = { name = "Opus 4.8"; };
|
||||||
|
"claude-opus-4-7-default" = { name = "Opus 4.7"; };
|
||||||
|
"claude-opus-4-6-default" = { name = "Opus 4.6"; };
|
||||||
|
"claude-sonnet-4-6-default" = { name = "Sonnet 4.6"; };
|
||||||
|
"claude-haiku-4-5-20251001" = { name = "Haiku 4.5"; };
|
||||||
|
};
|
||||||
|
whitelist = ["claude-opus-4-8-default" "claude-opus-4-7-default" "claude-opus-4-6-default" "claude-sonnet-4-6-default" "claude-haiku-4-5-20251001"];
|
||||||
|
};
|
||||||
|
# ollama = {
|
||||||
|
# npm = "@ai-sdk/openai-compatible";
|
||||||
|
# name = "Ollama (Local)";
|
||||||
|
# options = {
|
||||||
|
# baseURL = "http://192.168.11.23:11434/v1";
|
||||||
|
# };
|
||||||
|
# models = {
|
||||||
|
# "qwen3-coder:30b" = { name = "Qwen 3 Coder 30B"; };
|
||||||
|
# "codellama:34b-instruct" = { name = "CodeLlama 34B Instruct"; };
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
personalConfig = {
|
||||||
|
plugin = [ "opencode-gemini-auth@latest" ];
|
||||||
|
model = "google/gemini-3-pro-preview";
|
||||||
|
small_model = "google/gemini-3-flash-preview";
|
||||||
|
enabled_providers = [ "google" ];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
# Merge base config with the selected mode config
|
||||||
|
baseConfig // (if cfg.workMode then workConfig else personalConfig)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
# Link the generated config to the expected location
|
||||||
|
xdg.configFile."opencode/opencode.json".source = config.lib.file.mkOutOfStoreSymlink config.sops.templates."opencode/opencode.json".path;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -59,13 +59,29 @@ in
|
|||||||
HISTCONTROL='erasedups:ignoreboth'
|
HISTCONTROL='erasedups:ignoreboth'
|
||||||
HISTIGNORE='&:[ ]*:exit:ls:bg:fg:history:clear'
|
HISTIGNORE='&:[ ]*:exit:ls:bg:fg:history:clear'
|
||||||
unsetopt beep
|
unsetopt beep
|
||||||
'';
|
|
||||||
|
|
||||||
profileExtra = lib.mkIf cfg.sourceProfile ''
|
prg() {
|
||||||
source $HOME/.profile
|
# ''${1} is the search term, ''${2} is the path (defaulting to . if empty)
|
||||||
|
local query="''${1:-}"
|
||||||
|
local search_path="''${2:-.}"
|
||||||
|
|
||||||
|
local selected=$(
|
||||||
|
fzf --ansi --disabled --query "$query" \
|
||||||
|
--bind "start:reload(rg --column --line-number --no-heading --color=always --smart-case {q} \"$search_path\")" \
|
||||||
|
--bind "change:reload:sleep 0.1; rg --column --line-number --no-heading --color=always --smart-case {q} \"$search_path\" || true" \
|
||||||
|
--bind "shift-up:preview-up,shift-down:preview-down" \
|
||||||
|
--delimiter : \
|
||||||
|
--preview 'bat --color=always --style=numbers --highlight-line {2} {1}' \
|
||||||
|
--preview-window 'right,45%,border-left,+{2}+3/3,~3'
|
||||||
|
)
|
||||||
|
|
||||||
|
# Extract file and line, then open in Neovim
|
||||||
|
[ -n "$selected" ] && nvim "$(echo "$selected" | cut -d: -f1)" +"$(echo "$selected" | cut -d: -f2)"
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
programs.fzf = {
|
programs.fzf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
@@ -96,6 +112,9 @@ in
|
|||||||
ripgrep-all
|
ripgrep-all
|
||||||
viddy
|
viddy
|
||||||
duf
|
duf
|
||||||
|
lsof
|
||||||
|
rclone
|
||||||
|
sshfs
|
||||||
];
|
];
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
|
|||||||
@@ -24,26 +24,26 @@
|
|||||||
urgency.user.tag.cust.coefficient = 5.0;
|
urgency.user.tag.cust.coefficient = 5.0;
|
||||||
urgency.user.tag.fixed.coefficient = -100.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.columns="id,start.age,entry.age,depends,priority,energy,urgency,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description";
|
||||||
report.next.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
report.next.labels="ID,Active,Age,Deps,P,E,Urg,Project,Tag,Recur,S,Due,Until,Description";
|
||||||
report.next.filter="status:pending -WAITING -deferred -track";
|
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.columns="id,start.age,entry.age,depends,priority,energy,urgency,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description";
|
||||||
report.time.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
report.time.labels="ID,Active,Age,Deps,P,E,Urg,Project,Tag,Recur,S,Due,Until,Description";
|
||||||
report.time.filter="status:pending -WAITING -deferred +fixed";
|
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.columns="id,start.age,entry.age,depends,priority,energy,urgency,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description";
|
||||||
report.deferred.context="1";
|
report.deferred.context="1";
|
||||||
report.deferred.description="Deferred and waiting tasks";
|
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.labels="ID,Active,Age,Deps,P,E,Urg,Project,Tag,Recur,S,Due,Until,Description";
|
||||||
report.deferred.filter="status:pending +deferred";
|
report.deferred.filter="status:pending +deferred";
|
||||||
report.deferred.sort="urgency-";
|
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.columns="id,start.age,entry.age,depends,priority,energy,urgency,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description";
|
||||||
report.low.context="1";
|
report.low.context="1";
|
||||||
report.low.description="Low energy tasks";
|
report.low.description="Low energy tasks";
|
||||||
report.low.filter="status:pending -WAITING -deferred";
|
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.labels="ID,Active,Age,Deps,P,E,Urg,Project,Tag,Recur,S,Due,Until,Description";
|
||||||
report.low.sort="energy+,urgency-";
|
report.low.sort="energy+,urgency-";
|
||||||
|
|
||||||
context.today.read = "(prio:H or +next)";
|
context.today.read = "(prio:H or +next)";
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
taskwarrior-tui
|
taskwarrior-tui
|
||||||
unstable.timewarrior
|
unstable.timewarrior
|
||||||
inputs.tasksquire.packages.${pkgs.system}.default
|
inputs.tasksquire.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||||
];
|
];
|
||||||
|
|
||||||
home.shellAliases = lib.mkMerge [ {
|
home.shellAliases = lib.mkMerge [ {
|
||||||
|
|||||||
@@ -2,6 +2,107 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.dot.tmux;
|
cfg = config.dot.tmux;
|
||||||
|
|
||||||
|
projectSelector = pkgs.writeScriptBin "projectSelector" ''
|
||||||
|
#!${pkgs.zsh}/bin/zsh
|
||||||
|
# Configuration
|
||||||
|
PRO_BASE_DIR="$HOME/pro"
|
||||||
|
PRO_BLACKLIST=("lost+found" ".git" "node_modules")
|
||||||
|
|
||||||
|
# 1. Build the list of projects
|
||||||
|
list="misc"
|
||||||
|
if [[ -d "$PRO_BASE_DIR" ]]; then
|
||||||
|
for dir in "$PRO_BASE_DIR"/*(/N); do
|
||||||
|
name=$(basename "$dir")
|
||||||
|
# Check against blacklist
|
||||||
|
if [[ ! ''${PRO_BLACKLIST[(r)''${name}]} == ''${name} ]]; then
|
||||||
|
list+="\n$name"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 2. Open fzf (Multi-select: Tab to mark, Enter to confirm)
|
||||||
|
selected=$(echo -e "$list" | ${pkgs.fzf}/bin/fzf -m --header="Select projects" --reverse)
|
||||||
|
|
||||||
|
[[ -z "$selected" ]] && exit 0
|
||||||
|
|
||||||
|
# 3. Process selections
|
||||||
|
# Convert newline-separated string to array
|
||||||
|
selected_array=("''${(@f)selected}")
|
||||||
|
total=''${#selected_array[@]}
|
||||||
|
i=0
|
||||||
|
|
||||||
|
for arg in "''${selected_array[@]}"; do
|
||||||
|
((i++))
|
||||||
|
target=""
|
||||||
|
s_name=""
|
||||||
|
|
||||||
|
if [[ "$arg" == "misc" ]]; then
|
||||||
|
target="$HOME"
|
||||||
|
s_name="misc"
|
||||||
|
else
|
||||||
|
target="$PRO_BASE_DIR/$arg"
|
||||||
|
s_name=$(basename "$target" | tr '.' '_')
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Background load all but the last selection
|
||||||
|
if [[ $i -lt $total ]]; then
|
||||||
|
if [[ -f "$target/.tmuxp.yaml" || -f "$target/.tmuxp.yml" ]]; then
|
||||||
|
${pkgs.tmuxp}/bin/tmuxp load --yes -d "$target"
|
||||||
|
else
|
||||||
|
if ! ${pkgs.tmux}/bin/tmux has-session -t "$s_name" 2>/dev/null; then
|
||||||
|
${pkgs.tmux}/bin/tmux new-session -d -s "$s_name" -c "$target"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Last item: Foreground switch/attach
|
||||||
|
if [[ -f "$target/.tmuxp.yaml" || -f "$target/.tmuxp.yml" ]]; then
|
||||||
|
${pkgs.tmuxp}/bin/tmuxp load --yes "$target"
|
||||||
|
else
|
||||||
|
if ! ${pkgs.tmux}/bin/tmux has-session -t "$s_name" 2>/dev/null; then
|
||||||
|
${pkgs.tmux}/bin/tmux new-session -d -s "$s_name" -c "$target"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$TMUX" ]]; then
|
||||||
|
${pkgs.tmux}/bin/tmux switch-client -t "$s_name"
|
||||||
|
else
|
||||||
|
${pkgs.tmux}/bin/tmux attach-session -t "$s_name"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
tmuxKiller = pkgs.writeScriptBin "tmuxKiller" ''
|
||||||
|
#!${pkgs.zsh}/bin/zsh
|
||||||
|
|
||||||
|
# 1. Build the list of active tmux sessions
|
||||||
|
sessions=$(${pkgs.tmux}/bin/tmux list-sessions -F "#S" 2>/dev/null)
|
||||||
|
|
||||||
|
# Always add the kill-server option
|
||||||
|
sessions_list="$sessions\n--- KILL TMUX SERVER ---"
|
||||||
|
|
||||||
|
# 2. Open fzf (Multi-select: Tab to mark multiple, Enter to confirm)
|
||||||
|
selected=$(echo -e "$sessions_list" | ${pkgs.fzf}/bin/fzf -m --header="Select tmux sessions to KILL (Tab to multi-select)" --reverse)
|
||||||
|
|
||||||
|
[[ -z "$selected" ]] && exit 0
|
||||||
|
|
||||||
|
# 3. Process selections
|
||||||
|
# Convert newline-separated string to array
|
||||||
|
selected_array=("''${(@f)selected}")
|
||||||
|
|
||||||
|
for s_name in "''${selected_array[@]}"; do
|
||||||
|
if [[ "$s_name" == "--- KILL TMUX SERVER ---" ]]; then
|
||||||
|
${pkgs.tmux}/bin/tmux kill-server
|
||||||
|
echo "Killed tmux server"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
if ${pkgs.tmux}/bin/tmux has-session -t "$s_name" 2>/dev/null; then
|
||||||
|
${pkgs.tmux}/bin/tmux kill-session -t "$s_name"
|
||||||
|
echo "Killed session: $s_name"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.dot.tmux = {
|
options.dot.tmux = {
|
||||||
@@ -14,20 +115,29 @@ in
|
|||||||
shortcut = "a";
|
shortcut = "a";
|
||||||
mouse = true;
|
mouse = true;
|
||||||
keyMode = "vi";
|
keyMode = "vi";
|
||||||
escapeTime = 0;
|
escapeTime = 10;
|
||||||
terminal = "screen-256color";
|
terminal = "screen-256color";
|
||||||
tmuxp.enable = true;
|
tmuxp.enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set -g display-time 1500
|
set -g display-time 1500
|
||||||
|
set -s set-clipboard on
|
||||||
|
set -g extended-keys on
|
||||||
|
set -g extended-keys-format csi-u
|
||||||
|
set -g renumber-windows on
|
||||||
|
set -g base-index 1
|
||||||
|
set -g pane-base-index 1
|
||||||
|
|
||||||
unbind S
|
unbind S
|
||||||
bind S command-prompt "switch -t %1"
|
bind S command-prompt "switch -t %1"
|
||||||
|
bind-key , command-prompt -p "rename-window:" "rename-window '%%'"
|
||||||
|
|
||||||
bind-key -n M-K switch-client -p
|
# Check if we are in vim
|
||||||
bind-key -n M-J switch-client -n
|
is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
|
||||||
|
|
||||||
bind-key -n M-L next-window
|
bind-key -n C-M-h if-shell "$is_vim" { send-keys C-M-h } { if -F "#{pane_at_left}" "previous-window" "select-pane -L" }
|
||||||
bind-key -n M-H previous-window
|
bind-key -n C-M-j if-shell "$is_vim" { send-keys C-M-j } { if -F "#{pane_at_bottom}" "switch-client -n" "select-pane -D" }
|
||||||
|
bind-key -n C-M-k if-shell "$is_vim" { send-keys C-M-k } { if -F "#{pane_at_top}" "switch-client -p" "select-pane -U" }
|
||||||
|
bind-key -n C-M-l if-shell "$is_vim" { send-keys C-M-l } { if -F "#{pane_at_right}" "next-window" "select-pane -R" }
|
||||||
|
|
||||||
bind '"' split-window -c "#{pane_current_path}"
|
bind '"' split-window -c "#{pane_current_path}"
|
||||||
bind % split-window -h -c "#{pane_current_path}"
|
bind % split-window -h -c "#{pane_current_path}"
|
||||||
@@ -36,10 +146,19 @@ in
|
|||||||
bind C-g display-popup -E -d "#{pane_current_path}" -xC -yC -w 95% -h 95% "lazygit"
|
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"
|
bind C-t display-popup -E -xC -yC -w 95% -h 95% "tasksquire"
|
||||||
|
|
||||||
|
bind C-r display-popup -E "tmuxKiller"
|
||||||
|
|
||||||
${lib.optionalString cfg.workMode ''
|
${lib.optionalString cfg.workMode ''
|
||||||
bind C-s display-popup -E "zsh ~/bin/tmuxp_selector.sh"
|
bind C-s display-popup -E "projectSelector"
|
||||||
bind C-n display-popup -E -xC -yC -w 95% -h 95% -d "~/Documents/notes/Work/" "vim quick_notes.md"
|
bind C-n display-popup -E -xC -yC -w 95% -h 95% -d "/mnt/c/Users/marti/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"
|
bind C-q display-popup -E -xC -yC -w 95% -h 95% " \
|
||||||
|
SESSION_NAME=\$(tmux display-message -p '#S'); \
|
||||||
|
if [ \"\$SESSION_NAME\" = 'misc' ]; then \
|
||||||
|
cd '/mnt/c/Users/marti/Documents/notes/Work/' && vim -c 'nnoremap q :wqa<CR>' task_notes.md; \
|
||||||
|
else \
|
||||||
|
cd \"\$HOME/pro/\$SESSION_NAME\" && vim -c 'nnoremap q :wqa<CR>' task_notes.md; \
|
||||||
|
fi"
|
||||||
|
bind C-p display-popup -E -xC -yC -w 95% -h 95% -d "/mnt/c/Users/marti/Documents/notes/Work/development/" "vim mbpr.md"
|
||||||
''}
|
''}
|
||||||
|
|
||||||
#######################################
|
#######################################
|
||||||
@@ -52,10 +171,8 @@ in
|
|||||||
|
|
||||||
set -g status-right "#[bg=#BCBCBC] %H:%M #[bg=#808080,fg=#ffffff] %d.%m.%y "
|
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-format "#W:#I "
|
||||||
# setw -g window-status-current-format " #W#F "
|
setw -g window-status-current-format " #W:#I "
|
||||||
setw -g window-status-format " #W "
|
|
||||||
setw -g window-status-current-format " #W "
|
|
||||||
setw -g window-status-separator ""
|
setw -g window-status-separator ""
|
||||||
|
|
||||||
#######################################
|
#######################################
|
||||||
@@ -75,6 +192,97 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.zsh.initExtra = lib.optionalString cfg.workMode ''
|
||||||
|
# --- 1. Configuration ---
|
||||||
|
export PRO_BASE_DIR="$HOME/pro"
|
||||||
|
export PRO_BLACKLIST=("lost+found")
|
||||||
|
|
||||||
|
# --- 2. The 'pro' function ---
|
||||||
|
pro() {
|
||||||
|
local total_args=$#
|
||||||
|
local i=0
|
||||||
|
|
||||||
|
for arg in "$@"; do
|
||||||
|
((i++))
|
||||||
|
local target=""
|
||||||
|
local s_name=""
|
||||||
|
|
||||||
|
# Resolve the target directory and session name
|
||||||
|
if [[ "$arg" == "misc" ]]; then
|
||||||
|
target="$HOME"
|
||||||
|
s_name="misc"
|
||||||
|
elif [[ -d "$PRO_BASE_DIR/$arg" ]]; then
|
||||||
|
target="$PRO_BASE_DIR/$arg"
|
||||||
|
s_name=$(basename "$target" | tr '.' '_')
|
||||||
|
elif [[ -d "$HOME/$arg" ]]; then
|
||||||
|
target="$HOME/$arg"
|
||||||
|
s_name=$(basename "$target" | tr '.' '_')
|
||||||
|
else
|
||||||
|
echo "Error: Project '$arg' not found in $PRO_BASE_DIR or $HOME"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
target=$(realpath "$target")
|
||||||
|
|
||||||
|
# logic: If this is NOT the last argument, load it in the background.
|
||||||
|
# If it IS the last argument, load/attach to it in the foreground.
|
||||||
|
if [[ "$i" -lt "$total_args" ]]; then
|
||||||
|
# BACKGROUND LOADING
|
||||||
|
if [[ -f "$target/.tmuxp.yaml" || -f "$target/.tmuxp.yml" ]]; then
|
||||||
|
tmuxp load --yes -d "$target"
|
||||||
|
else
|
||||||
|
if ! tmux has-session -t "$s_name" 2>/dev/null; then
|
||||||
|
tmux new-session -d -s "$s_name" -c "$target"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# FOREGROUND ATTACHING (The "Winner")
|
||||||
|
if [[ -f "$target/.tmuxp.yaml" || -f "$target/.tmuxp.yml" ]]; then
|
||||||
|
# tmuxp load handles switching/attaching automatically
|
||||||
|
tmuxp load --yes "$target"
|
||||||
|
else
|
||||||
|
if ! tmux has-session -t "$s_name" 2>/dev/null; then
|
||||||
|
tmux new-session -d -s "$s_name" -c "$target"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$TMUX" ]]; then
|
||||||
|
tmux switch-client -t "$s_name"
|
||||||
|
else
|
||||||
|
tmux attach-session -t "$s_name"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
# --- 3. Tab Completion ---
|
||||||
|
_pro_completion() {
|
||||||
|
local -a projects
|
||||||
|
|
||||||
|
# Manually add the 'misc' alias to completion
|
||||||
|
projects+=("misc")
|
||||||
|
|
||||||
|
# Add directories from ~/pro/
|
||||||
|
if [[ -d "$PRO_BASE_DIR" ]]; then
|
||||||
|
for dir in "$PRO_BASE_DIR"/*(/N); do
|
||||||
|
local name=$(basename "$dir")
|
||||||
|
# Nix escape for array check: if name not in blacklist
|
||||||
|
if [[ ! ''${PRO_BLACKLIST[(r)''${name}]} == ''${name} ]]; then
|
||||||
|
projects+=("''${name}")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
_describe 'projects' projects
|
||||||
|
}
|
||||||
|
|
||||||
|
compdef _pro_completion pro
|
||||||
|
'';
|
||||||
|
|
||||||
|
home.packages = [
|
||||||
|
tmuxKiller
|
||||||
|
] ++ lib.optional cfg.workMode projectSelector;
|
||||||
|
|
||||||
home.shellAliases = {
|
home.shellAliases = {
|
||||||
"o" = "tmuxp";
|
"o" = "tmuxp";
|
||||||
"ol" = "tmuxp load";
|
"ol" = "tmuxp load";
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ vim.opt.smartcase = true
|
|||||||
vim.opt.hidden = true
|
vim.opt.hidden = true
|
||||||
vim.opt.splitright = true
|
vim.opt.splitright = true
|
||||||
vim.opt.splitbelow = true
|
vim.opt.splitbelow = true
|
||||||
vim.opt.swapfile = true
|
|
||||||
vim.opt.directory= '~/.cache/nvim/swap//,$TEMP//,/tmp//'
|
|
||||||
vim.opt.wildmode = 'longest,list'
|
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.wildignore = vim.opt.wildignore + 'main,*.o,*.d,*.aux,*.bbl,*.lof,*.loa,*.blg,*.fdb_latexmk,*.fls,*.tdo,*.pdf,*.pyc'
|
||||||
vim.opt.spell = false
|
vim.opt.spell = false
|
||||||
@@ -36,7 +34,6 @@ vim.opt.foldopen = vim.opt.foldopen - 'block'
|
|||||||
vim.opt.foldlevel = 99
|
vim.opt.foldlevel = 99
|
||||||
vim.opt.lazyredraw = true
|
vim.opt.lazyredraw = true
|
||||||
vim.opt.listchars = 'eol:¬,tab:▸ ,trail:·'
|
vim.opt.listchars = 'eol:¬,tab:▸ ,trail:·'
|
||||||
vim.opt.fillchars = 'vert:|,fold: '
|
|
||||||
vim.opt.list = true
|
vim.opt.list = true
|
||||||
vim.opt.laststatus = 3
|
vim.opt.laststatus = 3
|
||||||
vim.opt.scrolloff = 8
|
vim.opt.scrolloff = 8
|
||||||
@@ -52,15 +49,59 @@ vim.opt.encoding = 'utf-8'
|
|||||||
vim.opt.completeopt = 'menu,menuone,noselect'
|
vim.opt.completeopt = 'menu,menuone,noselect'
|
||||||
vim.opt.termguicolors = true
|
vim.opt.termguicolors = true
|
||||||
vim.opt.conceallevel = 1
|
vim.opt.conceallevel = 1
|
||||||
|
vim.opt.updatetime = 300
|
||||||
|
|
||||||
|
----------------------------
|
||||||
|
----------- SWAP -----------
|
||||||
|
----------------------------
|
||||||
|
local swapdir = vim.fn.expand("~/.cache/nvim/swap//")
|
||||||
|
if vim.fn.isdirectory(swapdir) == 0 then
|
||||||
|
vim.fn.mkdir(swapdir, "p")
|
||||||
|
end
|
||||||
|
local temp = (os.getenv("TEMP") or "/tmp") .. "//"
|
||||||
|
|
||||||
|
vim.opt.swapfile = true
|
||||||
|
vim.opt.directory = swapdir .. "," .. temp
|
||||||
|
|
||||||
----------------------------
|
----------------------------
|
||||||
-------- CLIPBOARD ---------
|
-------- CLIPBOARD ---------
|
||||||
----------------------------
|
----------------------------
|
||||||
|
-- Force Neovim to use the OSC 52 provider explicitly
|
||||||
|
vim.g.clipboard = {
|
||||||
|
name = 'OSC 52',
|
||||||
|
copy = {
|
||||||
|
['+'] = require('vim.ui.clipboard.osc52').copy('+'),
|
||||||
|
['*'] = require('vim.ui.clipboard.osc52').copy('*'),
|
||||||
|
},
|
||||||
|
paste = {
|
||||||
|
['+'] = require('vim.ui.clipboard.osc52').paste('+'),
|
||||||
|
['*'] = require('vim.ui.clipboard.osc52').paste('*'),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
if vim.fn.has("wsl") == 1 then
|
if vim.fn.has("wsl") == 1 then
|
||||||
vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
|
local function win32yank_works()
|
||||||
|
return os.execute("win32yank.exe -o >/dev/null 2>&1") == 0
|
||||||
|
end
|
||||||
|
|
||||||
|
if win32yank_works() then
|
||||||
|
vim.g.clipboard = {
|
||||||
|
name = 'WslClipboard',
|
||||||
|
copy = {
|
||||||
|
["+"] = 'win32yank.exe -i --crlf',
|
||||||
|
["*"] = 'win32yank.exe -i --crlf',
|
||||||
|
},
|
||||||
|
paste = {
|
||||||
|
["+"] = 'win32yank.exe -o --lf',
|
||||||
|
["*"] = 'win32yank.exe -o --lf',
|
||||||
|
},
|
||||||
|
cache_enabled = 0,
|
||||||
|
}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
vim.opt.clipboard = 'unnamedplus'
|
||||||
|
|
||||||
|
|
||||||
----------------------------
|
----------------------------
|
||||||
-------- COMMANDS ----------
|
-------- COMMANDS ----------
|
||||||
@@ -68,9 +109,6 @@ end
|
|||||||
|
|
||||||
vim.cmd('filetype plugin indent on')
|
vim.cmd('filetype plugin indent on')
|
||||||
|
|
||||||
-- vim.cmd('colorscheme lucius')
|
|
||||||
-- vim.cmd('LuciusWhite')
|
|
||||||
|
|
||||||
|
|
||||||
----------------------------
|
----------------------------
|
||||||
-------- AUTOGROUPS --------
|
-------- AUTOGROUPS --------
|
||||||
@@ -154,24 +192,18 @@ vim.diagnostic.config({
|
|||||||
prefix = '● ',
|
prefix = '● ',
|
||||||
current_line = false,
|
current_line = false,
|
||||||
severity = {
|
severity = {
|
||||||
-- min = vim.diagnostic.severity.INFO,
|
min = vim.diagnostic.severity.HINT,
|
||||||
max = vim.diagnostic.severity.INFO,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
virtual_lines = {
|
|
||||||
current_line = false,
|
|
||||||
severity = {
|
|
||||||
min = vim.diagnostic.severity.WARN,
|
|
||||||
-- max = vim.diagnostic.severity.WARN,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
virtual_lines = false,
|
||||||
|
-- float = false,
|
||||||
float = {
|
float = {
|
||||||
prefix = '',
|
prefix = '',
|
||||||
focusable = false,
|
scope = 'line',
|
||||||
style = "minimal",
|
style = 'minimal',
|
||||||
border = "rounded",
|
border = 'rounded',
|
||||||
source = "always",
|
source = 'always',
|
||||||
header = "",
|
header = '',
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -180,3 +212,11 @@ vim.cmd([[highlight DiagnosticUnderlineWarn gui=undercurl guifg=Yellow]])
|
|||||||
vim.cmd([[highlight DiagnosticUnderlineInfo gui=undercurl guifg=Blue]])
|
vim.cmd([[highlight DiagnosticUnderlineInfo gui=undercurl guifg=Blue]])
|
||||||
vim.cmd([[highlight DiagnosticUnderlineHint gui=undercurl guifg=Cyan]])
|
vim.cmd([[highlight DiagnosticUnderlineHint gui=undercurl guifg=Cyan]])
|
||||||
|
|
||||||
|
|
||||||
|
local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
|
||||||
|
|
||||||
|
function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
|
||||||
|
opts = opts or {}
|
||||||
|
opts.border = opts.border or "rounded"
|
||||||
|
return orig_util_open_floating_preview(contents, syntax, opts, ...)
|
||||||
|
end
|
||||||
|
|||||||
@@ -1,147 +1,220 @@
|
|||||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||||
|
|
||||||
|
vim.lsp.config('gopls', {
|
||||||
|
cmd = { 'gopls' },
|
||||||
|
filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' },
|
||||||
|
root_markers = { 'go.work', 'go.mod', '.git' },
|
||||||
|
settings = {
|
||||||
|
gopls = {
|
||||||
|
semanticTokens = true,
|
||||||
|
hints = {
|
||||||
|
assignVariableTypes = true,
|
||||||
|
compositeLiteralFields = true,
|
||||||
|
compositeLiteralTypes = true,
|
||||||
|
constantValues = true,
|
||||||
|
functionTypeParameters = true,
|
||||||
|
rangeVariableTypes = true,
|
||||||
|
parameterNames = true,
|
||||||
|
},
|
||||||
|
analyses = {
|
||||||
|
unusedparams = true,
|
||||||
|
},
|
||||||
|
staticcheck = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.lsp.config('clangd', {
|
||||||
|
cmd = { 'clangd',
|
||||||
|
'--compile-commands-dir=build',
|
||||||
|
'--background-index',
|
||||||
|
'--clang-tidy',
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.lsp.config('basedpyright', {
|
||||||
|
settings = {
|
||||||
|
basedpyright = {
|
||||||
|
analysis = {
|
||||||
|
indexing = true,
|
||||||
|
typeCheckingMode = "standard",
|
||||||
|
autoImportCompletions = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.lsp.config('buf_ls', {
|
||||||
|
cmd = { 'buf', 'lsp', 'serve' },
|
||||||
|
filetypes = { 'proto' },
|
||||||
|
root_markers = { 'buf.yaml', '.git' },
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.lsp.enable('gopls')
|
||||||
|
vim.lsp.enable('clangd')
|
||||||
|
vim.lsp.enable('basedpyright')
|
||||||
|
-- vim.lsp.enable('ty')
|
||||||
|
vim.lsp.enable('buf_ls')
|
||||||
|
vim.lsp.enable('marksman')
|
||||||
|
vim.lsp.enable('sqls')
|
||||||
|
vim.lsp.enable('dockerls')
|
||||||
|
vim.lsp.enable('docker_compose_language_service')
|
||||||
|
vim.lsp.enable('rust_analyzer')
|
||||||
|
vim.lsp.enable('zls')
|
||||||
|
vim.lsp.enable('yamlls')
|
||||||
|
vim.lsp.enable('omnisharp')
|
||||||
|
vim.lsp.enable('bashls')
|
||||||
|
|
||||||
vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true })
|
vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true })
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd('FileType', {
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
group = 'FileTypeConfigs',
|
group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
pattern = 'python',
|
pattern = 'python',
|
||||||
callback = function()
|
callback = function()
|
||||||
require('dap-python').setup()
|
local status, dappython = pcall(require, "dap-python")
|
||||||
-- lspconfig.pyright.setup({ capabilities = capabilities })
|
if status then
|
||||||
-- require("conform").setup({
|
dappython.setup()
|
||||||
-- python = {"black"},
|
end
|
||||||
-- })
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
|
pattern = { 'go', 'gomod', 'gowork', 'gotmpl' },
|
||||||
|
callback = function(args)
|
||||||
|
local status, dapgo = pcall(require, "dap-go")
|
||||||
|
if status then
|
||||||
|
dapgo.setup()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
local function cycle_todo()
|
||||||
|
local line = vim.api.nvim_get_current_line()
|
||||||
|
|
||||||
|
-- 0. STRICT CHECK: If the line doesn't start with a list marker (-), fall back to normal Enter behavior
|
||||||
|
if not line:match("^%s*%-") then
|
||||||
|
-- This simulates a normal carriage return if mapped to <CR>
|
||||||
|
local keys = vim.api.nvim_replace_termcodes("<CR>", true, false, true)
|
||||||
|
vim.api.nvim_feedkeys(keys, "n", false)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- The sequence of checkbox states we want to cycle through
|
||||||
|
local states = { " ", ">", "x", "!", "~", "c" }
|
||||||
|
|
||||||
|
-- 1. If it's a cancelled todo [c], strip the brackets but KEEP the list item (- )
|
||||||
|
if line:match("^%s*%-%s*%[c%]") then
|
||||||
|
local clean_line = line:gsub("(%s*%-%s*)%[c%]%s*", "%1")
|
||||||
|
vim.api.nvim_set_current_line(clean_line)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 2. If it's a standard list item without a checkbox, turn it into `- [ ]`
|
||||||
|
if not line:match("^%s*%-%s*%[.%]") then
|
||||||
|
-- Matches the list prefix (e.g., "- " or " - ") and appends "[ ] "
|
||||||
|
local new_line = line:gsub("^(%s*%-%s*)", "%1[ ] ")
|
||||||
|
vim.api.nvim_set_current_line(new_line)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 3. Cycle through the custom states natively
|
||||||
|
for i, state in ipairs(states) do
|
||||||
|
-- Escape special Lua magic characters like !, >, ~, c
|
||||||
|
local escaped_state = state:gsub("([^%w])", "%%%1")
|
||||||
|
local pattern = "^(%s*%-%s*%[)" .. escaped_state .. "(%])"
|
||||||
|
|
||||||
|
if line:match(pattern) then
|
||||||
|
local next_state = states[(i % #states) + 1]
|
||||||
|
local new_line = line:gsub(pattern, "%1" .. next_state .. "%2", 1)
|
||||||
|
vim.api.nvim_set_current_line(new_line)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
|
pattern = 'markdown',
|
||||||
|
once = true,
|
||||||
|
callback = function()
|
||||||
|
vim.keymap.set('n', '<CR>', cycle_todo, {
|
||||||
|
buffer = true,
|
||||||
|
desc = 'Cycle todo state'
|
||||||
|
})
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- vim.api.nvim_create_autocmd('FileType', {
|
-- vim.api.nvim_create_autocmd('FileType', {
|
||||||
-- group = 'FileTypeConfigs',
|
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
-- pattern = 'go',
|
-- pattern = 'proto',
|
||||||
|
-- once = true,
|
||||||
-- callback = function()
|
-- 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,
|
-- 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', {
|
-- vim.api.nvim_create_autocmd('FileType', {
|
||||||
-- group = 'FileTypeConfigs',
|
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
-- 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',
|
-- pattern = 'sql',
|
||||||
|
-- once = true,
|
||||||
|
-- callback = function()
|
||||||
|
-- end,
|
||||||
|
-- })
|
||||||
|
|
||||||
|
-- vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
|
-- pattern = { 'dockerfile', 'yaml.docker-compose' },
|
||||||
|
-- once = true,
|
||||||
-- callback = function()
|
-- callback = function()
|
||||||
-- lspconfig.sqls.setup({ capabilities = capabilities })
|
|
||||||
-- end,
|
-- end,
|
||||||
-- })
|
-- })
|
||||||
--
|
--
|
||||||
-- vim.api.nvim_create_autocmd('FileType', {
|
-- vim.api.nvim_create_autocmd('FileType', {
|
||||||
-- group = 'FileTypeConfigs',
|
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
-- pattern = 'zig',
|
-- pattern = 'rust',
|
||||||
|
-- once = true,
|
||||||
-- callback = function()
|
-- callback = function()
|
||||||
-- lspconfig.zls.setup({ capabilities = capabilities })
|
|
||||||
-- end,
|
-- end,
|
||||||
-- })
|
-- })
|
||||||
--
|
--
|
||||||
|
-- vim.lsp.enable('clangd')
|
||||||
|
-- vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
|
-- pattern = { 'c', 'cpp' },
|
||||||
|
-- once = true,
|
||||||
|
-- callback = function()
|
||||||
|
-- end,
|
||||||
|
-- })
|
||||||
|
--
|
||||||
|
-- vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
|
-- pattern = { 'zig' },
|
||||||
|
-- pattern = 'sql',
|
||||||
|
-- once = true,
|
||||||
|
-- callback = function()
|
||||||
|
-- end,
|
||||||
|
-- })
|
||||||
|
|
||||||
|
-- vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
|
-- pattern = { 'yaml' },
|
||||||
|
-- pattern = 'sql',
|
||||||
|
-- once = true,
|
||||||
|
-- callback = function()
|
||||||
|
-- end,
|
||||||
|
-- })
|
||||||
|
--
|
||||||
|
-- vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||||
|
-- pattern = { 'cs' },
|
||||||
|
-- pattern = 'sql',
|
||||||
|
-- once = true,
|
||||||
|
-- callback = function()
|
||||||
|
-- end,
|
||||||
|
-- })
|
||||||
|
|
||||||
local get_datetime = function()
|
local get_datetime = function()
|
||||||
return os.date("%Y-%m-%d %H:%M")
|
return os.date("%Y-%m-%d %H:%M")
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,17 +1,14 @@
|
|||||||
vim.g.mapleader = " "
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
|
-- 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$', {})
|
||||||
|
|
||||||
-- Navigation
|
-- Navigation
|
||||||
vim.keymap.set({'n', 'v'}, 'j', 'gj', {})
|
vim.keymap.set({'n', 'v'}, 'j', 'gj', {})
|
||||||
vim.keymap.set({'n', 'v'}, 'k', 'gk', {})
|
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', '<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-Y>', '<C-w>5<', {})
|
||||||
vim.keymap.set('n', '<C-M-U>', '<C-w>5+', {})
|
vim.keymap.set('n', '<C-M-U>', '<C-w>5+', {})
|
||||||
@@ -24,10 +21,44 @@ vim.keymap.set('t', '<C-M-O>', '<C-\\><C-n><C-w>5>', {})
|
|||||||
|
|
||||||
vim.keymap.set('n', '<leader>s', ':call WindowSwap#EasyWindowSwap()<CR>', {})
|
vim.keymap.set('n', '<leader>s', ':call WindowSwap#EasyWindowSwap()<CR>', {})
|
||||||
|
|
||||||
-- Convenience
|
-- tmux navigation
|
||||||
vim.keymap.set('n', '<leader>w', ':w<CR>', { silent = true })
|
vim.g.tmux_navigator_no_mappings = 1
|
||||||
vim.keymap.set('n', '<leader>F', ':NvimTreeToggle<CR>', { noremap = true, silent = true })
|
|
||||||
vim.keymap.set('n', 'Y', 'y$', {})
|
local function tmux_navigate(direction)
|
||||||
|
local old_win = vim.api.nvim_get_current_win()
|
||||||
|
vim.cmd('wincmd ' .. direction)
|
||||||
|
local new_win = vim.api.nvim_get_current_win()
|
||||||
|
|
||||||
|
if old_win == new_win then
|
||||||
|
local tmux_cmd = ""
|
||||||
|
if direction == 'h' then
|
||||||
|
tmux_cmd = 'if -F "#{pane_at_left}" "previous-window" "select-pane -L"'
|
||||||
|
elseif direction == 'j' then
|
||||||
|
tmux_cmd = 'if -F "#{pane_at_bottom}" "switch-client -n" "select-pane -D"'
|
||||||
|
elseif direction == 'k' then
|
||||||
|
tmux_cmd = 'if -F "#{pane_at_top}" "switch-client -p" "select-pane -U"'
|
||||||
|
elseif direction == 'l' then
|
||||||
|
tmux_cmd = 'if -F "#{pane_at_right}" "next-window" "select-pane -R"'
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.fn.system('tmux ' .. tmux_cmd)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- vim.api.nvim_create_autocmd("CursorHold", {
|
||||||
|
-- callback = function()
|
||||||
|
-- vim.diagnostic.open_float(nil, { focusable = false })
|
||||||
|
-- end,
|
||||||
|
-- })
|
||||||
|
|
||||||
|
vim.keymap.set('n', '<C-M-h>', function() tmux_navigate('h') end)
|
||||||
|
vim.keymap.set('n', '<C-M-j>', function() tmux_navigate('j') end)
|
||||||
|
vim.keymap.set('n', '<C-M-k>', function() tmux_navigate('k') end)
|
||||||
|
vim.keymap.set('n', '<C-M-l>', function() tmux_navigate('l') end)
|
||||||
|
vim.keymap.set('t', '<C-M-h>', function() vim.cmd('stopinsert') tmux_navigate('h') end, { remap = true })
|
||||||
|
vim.keymap.set('t', '<C-M-j>', function() vim.cmd('stopinsert') tmux_navigate('j') end, { remap = true })
|
||||||
|
vim.keymap.set('t', '<C-M-k>', function() vim.cmd('stopinsert') tmux_navigate('k') end, { remap = true })
|
||||||
|
vim.keymap.set('t', '<C-M-l>', function() vim.cmd('stopinsert') tmux_navigate('l') end, { remap = true })
|
||||||
|
|
||||||
-- Telescope
|
-- Telescope
|
||||||
local telebuiltin = require('telescope.builtin')
|
local telebuiltin = require('telescope.builtin')
|
||||||
@@ -46,6 +77,7 @@ 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>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>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>cgi', vim.lsp.buf.implementation, { desc = 'LSP Implementation' })
|
||||||
|
vim.keymap.set('n', '<leader>cgr', telebuiltin.lsp_references, { desc = 'LSP References' })
|
||||||
vim.keymap.set('n', '<leader>cgd', vim.lsp.buf.definition, { desc = 'LSP Definition' })
|
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>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>cwa', vim.lsp.buf.add_workspace_folder, { desc = 'LSP Add Workspace Folder' })
|
||||||
@@ -56,6 +88,7 @@ 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', '<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', '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>cde', ToggleDiagnostics, { desc = 'Toggle Diagnostics' })
|
||||||
|
vim.keymap.set('n', '<leader>cdh', vim.diagnostic.open_float, { desc = 'Toggle Diagnostics float' })
|
||||||
vim.keymap.set('n', '<leader>cf',
|
vim.keymap.set('n', '<leader>cf',
|
||||||
function()
|
function()
|
||||||
local word = vim.fn.expand("<cword>")
|
local word = vim.fn.expand("<cword>")
|
||||||
@@ -70,29 +103,6 @@ vim.keymap.set('v', '<leader>cf',
|
|||||||
end
|
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
|
-- Yanky
|
||||||
vim.keymap.set({"n","x"}, "p", "<Plug>(YankyPutAfter)")
|
vim.keymap.set({"n","x"}, "p", "<Plug>(YankyPutAfter)")
|
||||||
vim.keymap.set({"n","x"}, "P", "<Plug>(YankyPutBefore)")
|
vim.keymap.set({"n","x"}, "P", "<Plug>(YankyPutBefore)")
|
||||||
@@ -123,9 +133,12 @@ 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>ds", function() require("dap").session() end)
|
||||||
vim.keymap.set('n', "<leader>dt", function() require("dap").terminate() end)
|
vim.keymap.set('n', "<leader>dt", function() require("dap").terminate() end)
|
||||||
vim.keymap.set('n', "<leader>dw", function() require("dap.ui.widgets").hover() end)
|
vim.keymap.set('n', "<leader>dw", function() require("dap.ui.widgets").hover() end)
|
||||||
|
vim.keymap.set('n', "<leader>dv", function() require("dap-view").toggle() end)
|
||||||
|
|
||||||
vim.keymap.set('n', "<F5>", function() require("dap").continue() end)
|
vim.keymap.set('n', "<F5>", function() require("dap").continue() end)
|
||||||
vim.keymap.set('n', "<F11>", function() require("dap").step_into() end)
|
vim.keymap.set('n', "<F1>", function() require("dap").step_over() end)
|
||||||
vim.keymap.set('n', "<F10>", function() require("dap").step_over() end)
|
vim.keymap.set('n', "<F2>", function() require("dap").step_into() end)
|
||||||
vim.keymap.set('n', "<F12>", function() require("dap").step_out() end)
|
vim.keymap.set('n', "<F3>", function() require("dap").step_out() end)
|
||||||
|
vim.keymap.set('n', "<F4>", function() require("dap").run_to_cursor() end)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ require('mini.align').setup()
|
|||||||
require('mini.bracketed').setup()
|
require('mini.bracketed').setup()
|
||||||
require('mini.splitjoin').setup()
|
require('mini.splitjoin').setup()
|
||||||
require('mini.move').setup()
|
require('mini.move').setup()
|
||||||
require('mini.move').setup()
|
|
||||||
require('flash').setup()
|
require('flash').setup()
|
||||||
require('ts-comments').setup()
|
require('ts-comments').setup()
|
||||||
|
|
||||||
@@ -16,6 +15,40 @@ vim.g.tagbar_autofocus=1
|
|||||||
|
|
||||||
vim.g.windowswap_map_keys=0
|
vim.g.windowswap_map_keys=0
|
||||||
|
|
||||||
|
local c = require('vscode.colors').get_colors()
|
||||||
|
require('vscode').setup({
|
||||||
|
style = 'light',
|
||||||
|
|
||||||
|
-- Enable transparent background
|
||||||
|
transparent = true,
|
||||||
|
-- Enable italic comment
|
||||||
|
-- italic_comments = true,
|
||||||
|
-- Enable italic inlay type hints
|
||||||
|
-- italic_inlayhints = true,
|
||||||
|
-- Underline `@markup.link.*` variants
|
||||||
|
underline_links = true,
|
||||||
|
-- Disable nvim-tree background color
|
||||||
|
disable_nvimtree_bg = true,
|
||||||
|
-- Apply theme colors to terminal
|
||||||
|
terminal_colors = true,
|
||||||
|
-- Override colors (see ./lua/vscode/colors.lua)
|
||||||
|
color_overrides = {
|
||||||
|
vscLineNumber = '#AAAAAA',
|
||||||
|
},
|
||||||
|
-- Override highlight groups (see ./lua/vscode/theme.lua)
|
||||||
|
-- group_overrides = {
|
||||||
|
-- -- this supports the same val table as vim.api.nvim_set_hl
|
||||||
|
-- -- use colors from this colorscheme by requiring vscode.colors!
|
||||||
|
-- Cursor = { fg=c.vscDarkBlue, bg=c.vscLightGreen, bold=true },
|
||||||
|
-- }
|
||||||
|
group_overrides = {
|
||||||
|
NormalFloat = { fg = c.vscFront, bg = "NONE" },
|
||||||
|
FloatBorder = { fg = c.vscFront, bg = "NONE" },
|
||||||
|
HoverTarget = { bg = "NONE" },
|
||||||
|
}
|
||||||
|
})
|
||||||
|
vim.cmd.colorscheme "vscode"
|
||||||
|
|
||||||
local cmp = require('cmp')
|
local cmp = require('cmp')
|
||||||
local lspkind = require('lspkind')
|
local lspkind = require('lspkind')
|
||||||
local ls = require('luasnip')
|
local ls = require('luasnip')
|
||||||
@@ -80,7 +113,6 @@ cmp.setup({
|
|||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = 'nvim_lsp', priority = 1000 },
|
{ name = 'nvim_lsp', priority = 1000 },
|
||||||
{ name = 'buffer', priority = 800, keyword_length = 2 },
|
{ name = 'buffer', priority = 800, keyword_length = 2 },
|
||||||
{ name = 'copilot', priority = 700 },
|
|
||||||
{ name = 'path', priority = 600 },
|
{ name = 'path', priority = 600 },
|
||||||
{ name = 'cmp_yanky', priority = 500 },
|
{ name = 'cmp_yanky', priority = 500 },
|
||||||
{ name = 'git', priority = 400 },
|
{ name = 'git', priority = 400 },
|
||||||
@@ -90,7 +122,6 @@ cmp.setup({
|
|||||||
|
|
||||||
formatting = {
|
formatting = {
|
||||||
format = lspkind.cmp_format({
|
format = lspkind.cmp_format({
|
||||||
-- mode = "symbol_text",
|
|
||||||
mode = "symbol",
|
mode = "symbol",
|
||||||
menu = ({
|
menu = ({
|
||||||
buffer = "[buf]",
|
buffer = "[buf]",
|
||||||
@@ -100,22 +131,11 @@ cmp.setup({
|
|||||||
latex_symbols = "[tex]",
|
latex_symbols = "[tex]",
|
||||||
path = "[path]",
|
path = "[path]",
|
||||||
cmp_yanky = "[yank]",
|
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({ '/', '?' }, {
|
cmp.setup.cmdline({ '/', '?' }, {
|
||||||
mapping = cmp.mapping.preset.cmdline(),
|
mapping = cmp.mapping.preset.cmdline(),
|
||||||
sources = {
|
sources = {
|
||||||
@@ -149,6 +169,7 @@ for _, ls in ipairs(language_servers) do
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require('ufo').setup()
|
require('ufo').setup()
|
||||||
|
|
||||||
require("yanky").setup({
|
require("yanky").setup({
|
||||||
@@ -177,27 +198,6 @@ require("telescope").setup {
|
|||||||
require("telescope").load_extension("ui-select")
|
require("telescope").load_extension("ui-select")
|
||||||
require("telescope").load_extension("yank_history")
|
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({
|
require('lualine').setup({
|
||||||
options = {
|
options = {
|
||||||
@@ -240,16 +240,6 @@ require('lualine').setup({
|
|||||||
extensions = {}
|
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 = {
|
vim.g.bullets_enabled_file_types = {
|
||||||
'markdown',
|
'markdown',
|
||||||
'text',
|
'text',
|
||||||
@@ -273,6 +263,7 @@ require("nvim-tree").setup({
|
|||||||
-- },
|
-- },
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
require('gitsigns').setup {
|
require('gitsigns').setup {
|
||||||
signs = {
|
signs = {
|
||||||
add = { text = '┃' },
|
add = { text = '┃' },
|
||||||
@@ -329,30 +320,48 @@ require("conform").setup({
|
|||||||
rust = {"rustfmt", lsp_format = "fallback"},
|
rust = {"rustfmt", lsp_format = "fallback"},
|
||||||
go = {"gofmt", "goimports", lsp_format = "fallback"},
|
go = {"gofmt", "goimports", lsp_format = "fallback"},
|
||||||
lua = { "stylua", lsp_format = "fallback"},
|
lua = { "stylua", lsp_format = "fallback"},
|
||||||
|
sh = {"shfmt"},
|
||||||
|
bash = {"shfmt"},
|
||||||
|
zsh = {"shfmt"},
|
||||||
|
c = {"clang-format"},
|
||||||
|
cpp = {"clang-format"},
|
||||||
|
},
|
||||||
|
format_on_save = {
|
||||||
|
timeout_ms = 500,
|
||||||
|
lsp_fallback = true,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
require('lint').linters_by_ft = {
|
require('lint').linters_by_ft = {
|
||||||
markdown = {'vale'},
|
markdown = {'vale'},
|
||||||
}
|
}
|
||||||
require("trouble").setup()
|
require("trouble").setup()
|
||||||
require("todo-comments").setup()
|
require("todo-comments").setup()
|
||||||
|
|
||||||
require("dapui").setup()
|
require("dap-view").setup({
|
||||||
|
winbar = {
|
||||||
|
-- sections = { "console", "scopes", "watches", "repl", "threads", "exceptions", "breakpoints" },
|
||||||
|
-- default_section = "console",
|
||||||
|
sections = { "scopes", "watches", "repl", "threads", "exceptions", "breakpoints" },
|
||||||
|
default_section = "scopes",
|
||||||
|
},
|
||||||
|
auto_toggle = "keep_terminal",
|
||||||
|
})
|
||||||
require("nvim-dap-virtual-text").setup()
|
require("nvim-dap-virtual-text").setup()
|
||||||
|
|
||||||
local dap, dapui = require("dap"), require("dapui")
|
local dap, dapui = require("dap"), require("dap-view")
|
||||||
dap.listeners.before.attach.dapui_config = function()
|
-- dap.listeners.before.attach.dapui_config = function()
|
||||||
dapui.open()
|
-- dapui.open()
|
||||||
end
|
-- end
|
||||||
dap.listeners.before.launch.dapui_config = function()
|
-- dap.listeners.before.launch.dapui_config = function()
|
||||||
dapui.open()
|
-- dapui.open()
|
||||||
end
|
-- end
|
||||||
dap.listeners.before.event_terminated.dapui_config = function()
|
-- dap.listeners.before.event_terminated.dapui_config = function()
|
||||||
dapui.close()
|
-- dapui.close()
|
||||||
end
|
-- end
|
||||||
dap.listeners.before.event_exited.dapui_config = function()
|
-- dap.listeners.before.event_exited.dapui_config = function()
|
||||||
dapui.close()
|
-- dapui.close()
|
||||||
end
|
-- end
|
||||||
|
|
||||||
dap.adapters.codelldb = {
|
dap.adapters.codelldb = {
|
||||||
type = 'server',
|
type = 'server',
|
||||||
@@ -363,21 +372,49 @@ dap.adapters.codelldb = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dap.configurations.zig = {
|
dap.adapters.cppdbg = {
|
||||||
{
|
type = "executable",
|
||||||
name = "Launch Zig Program",
|
command = "gdb",
|
||||||
type = "codelldb",
|
args = { "--interpreter=dap", -- Tells GDB to speak the DAP protocol
|
||||||
request = "launch",
|
"--eval-command", "set print pretty on" }
|
||||||
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
|
dap.adapters.debugpy = function(cb, config)
|
||||||
|
if config.request == 'attach' then
|
||||||
|
local port = (config.connect or config).port
|
||||||
|
local host = (config.connect or config).host or '127.0.0.1'
|
||||||
|
cb({
|
||||||
|
type = 'server',
|
||||||
|
port = assert(port, '`connect.port` is required for a python `attach` configuration'),
|
||||||
|
host = host,
|
||||||
|
options = { source_filetype = 'python' },
|
||||||
|
})
|
||||||
|
else
|
||||||
|
-- local system_python = vim.fn.exepath('python3') or vim.fn.exepath('python')
|
||||||
|
cb({
|
||||||
|
type = 'executable',
|
||||||
|
command = 'python',
|
||||||
|
args = { '-m', 'debugpy.adapter' },
|
||||||
|
options = { source_filetype = 'python' },
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- dap.configurations.zig = {
|
||||||
|
-- {
|
||||||
|
-- name = "Launch Zig Program",
|
||||||
|
-- type = "codelldb",
|
||||||
|
-- request = "launch",
|
||||||
|
-- program = function()
|
||||||
|
-- -- Prompts for the executable path when you start debugging
|
||||||
|
-- return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/zig-out/bin/', 'file')
|
||||||
|
-- end,
|
||||||
|
-- cwd = "${workspaceFolder}",
|
||||||
|
-- stopOnEntry = false,
|
||||||
|
-- },
|
||||||
|
-- }
|
||||||
|
|
||||||
|
if _G.is_mac then
|
||||||
workspaces = {
|
workspaces = {
|
||||||
{
|
{
|
||||||
name = "privat",
|
name = "privat",
|
||||||
@@ -410,6 +447,16 @@ if _G.is_work then
|
|||||||
daily_notes = {}
|
daily_notes = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if _G.is_private_nixos then
|
||||||
|
workspaces = {
|
||||||
|
{
|
||||||
|
name = "tech",
|
||||||
|
path = "~/notes",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
daily_notes = {}
|
||||||
|
end
|
||||||
|
|
||||||
require("obsidian").setup({
|
require("obsidian").setup({
|
||||||
workspaces = workspaces,
|
workspaces = workspaces,
|
||||||
templates = {
|
templates = {
|
||||||
@@ -418,7 +465,7 @@ require("obsidian").setup({
|
|||||||
time_format = "%H:%M",
|
time_format = "%H:%M",
|
||||||
},
|
},
|
||||||
checkbox = {
|
checkbox = {
|
||||||
order = { " ", ">", "x", "!", "~" },
|
order = { " ", ">", "x", "!", "~", "c", "" },
|
||||||
},
|
},
|
||||||
frontmatter = {
|
frontmatter = {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
@@ -458,19 +505,28 @@ require('render-markdown').setup({
|
|||||||
bullet = false,
|
bullet = false,
|
||||||
right_pad = 1,
|
right_pad = 1,
|
||||||
unchecked = {
|
unchecked = {
|
||||||
icon = ' ',
|
icon = '',
|
||||||
highlight = 'RenderMarkdownUnchecked',
|
highlight = 'RenderMarkdownUnchecked',
|
||||||
scope_highlight = nil,
|
scope_highlight = nil,
|
||||||
},
|
},
|
||||||
checked = {
|
checked = {
|
||||||
icon = ' ',
|
icon = '',
|
||||||
highlight = 'RenderMarkdownChecked',
|
highlight = 'RenderMarkdownChecked',
|
||||||
scope_highlight = nil,
|
scope_highlight = nil,
|
||||||
},
|
},
|
||||||
custom = {
|
custom = {
|
||||||
next = { raw = '[!]', rendered = ' ', highlight = 'RenderMarkdownNext', scope_highlight = nil },
|
next = { raw = '[!]', rendered = '', highlight = 'RenderMarkdownNext', scope_highlight = nil },
|
||||||
ongoing = { raw = '[>]', rendered = '▶ ', highlight = 'RenderMarkdownOngoing', scope_highlight = nil },
|
in_progress = { raw = '[>]', rendered = '◐', highlight = 'RenderMarkdownOngoing', scope_highlight = nil },
|
||||||
waiting = { raw = '[~]', rendered = ' ', highlight = 'RenderMarkdownWaiting', scope_highlight = nil },
|
waiting = { raw = '[~]', rendered = '', highlight = 'RenderMarkdownWaiting', scope_highlight = nil },
|
||||||
|
cancelled = { raw = '[c]', rendered = 'x', highlight = 'RenderMarkdownCancelled', scope_highlight = nil },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
require('treesitter-context').setup{
|
||||||
|
multiwindow = true,
|
||||||
|
}
|
||||||
|
vim.api.nvim_set_hl(0, "TreesitterContextBottom", {
|
||||||
|
underline = true,
|
||||||
|
sp = "Grey"
|
||||||
|
})
|
||||||
|
|||||||
@@ -62,10 +62,6 @@ vim.opt.clipboard:append('unnamedplus')
|
|||||||
|
|
||||||
vim.cmd('filetype plugin indent on')
|
vim.cmd('filetype plugin indent on')
|
||||||
|
|
||||||
-- vim.cmd('colorscheme lucius')
|
|
||||||
-- vim.cmd('LuciusWhite')
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------
|
------------------------------
|
||||||
---------- AUTOGROUPS --------
|
---------- AUTOGROUPS --------
|
||||||
------------------------------
|
------------------------------
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
keys:
|
keys:
|
||||||
- &macbook age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
|
- &macbook age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
|
||||||
- &macnix age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
|
- &macnix age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
|
||||||
|
- &worknix age1wufdcd234uw69lcw6gtv9r5zfz7h5tvu0fzcg5d8tn67yx6pv47sary4q2
|
||||||
|
|
||||||
creation_rules:
|
creation_rules:
|
||||||
- path_regex: secrets\.yaml$
|
- path_regex: secrets\.yaml$
|
||||||
@@ -8,3 +9,4 @@ creation_rules:
|
|||||||
- age:
|
- age:
|
||||||
- *macbook
|
- *macbook
|
||||||
- *macnix
|
- *macnix
|
||||||
|
- *worknix
|
||||||
|
|||||||
@@ -1,25 +1,35 @@
|
|||||||
gemini_api_key: ENC[AES256_GCM,data:nN7Hng==,iv:uOL0UyHpiRpAXfkX8qyVAnJZFm4ljkgYiZycrdSoW9U=,tag:7A/rHJcEykcoyJLeTV/gaw==,type:str]
|
langdock_api_key: ENC[AES256_GCM,data:9CTt73dQowcjIdjQoPMjsmGeIgV0nyHZxePOwak/m09ePfu4Gb3gDC17wq9Hde5J9IqpEID73Kdo/DsGm9m765rPGQFxGwTo3MO5eZgXAQjFXQNNhYm+sug=,iv:TVuiMG/7HYjncK3oC8r5xYrnNGXFcrBrpq9OO+7plNY=,tag:EZqUOGYwTHcukDop8p/JBw==,type:str]
|
||||||
|
openrouter_api_key: ENC[AES256_GCM,data:TqzRCeWH6Ibn/0dAf3YVnXUnBS766S+fZOHG5S49wYtoLcfhmHXFMHeDBZAWFdkU2E7X4Hhyv5l+hDlH+bJH0NQNL3rHvqVlbA==,iv:VF8RfLls3vYcOPqKPPax60kh7ILM/Y5mABf/UAzTBgo=,tag:lRY8skfDT3F9u5a+I0JJ6Q==,type:str]
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
|
- recipient: age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxUEZwYkFDYVd4ek53QU13
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJcTBpZ3BwNnVxVkFQQWgy
|
||||||
YStKbEVOeTJaalVIWXh1SUlrSnUzanM0anpBCktBMytXQUNyOTZaZGc4NG1Ta1lX
|
VWFsMFF0WGIzbTBFZ0htQ251dGlVdW5PckdNCmtldkZZL0Z3SER2OHZuUGdvNVpI
|
||||||
Mi91UWxXZWZjRDZqNDJWQU1YODgzUkkKLS0tIFY4TjUyczQ0SGZMOUM0NkQvUC94
|
Vk1KS1ZYVzZXZGtUbTNtZnhPeStSTlUKLS0tICtXYTgxMHc0alBYUDAzcXVXcm9J
|
||||||
WDBpdDJMaWVvUGZUcXZLZE9oYjdKLzgK4B25MbF/3bUFJ5+zxUfpSNM79HT13nux
|
YjQrUGZaWmpaV2tGOXJmbGR5K3l1VFEK+bsmeV/PjYcSlsJz0ZQZ8U9EYSu8bTJM
|
||||||
dvlcwkwYKIkS9YZpnyiYXZGupFhUcq1ipIvsbq/B3WR9IFn4xromPw==
|
BJ0T910cPudb/dkMrU9QSWUlBbOKk78ivKvDbwqPBfguSqU5GevLGg==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
- recipient: age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
|
- recipient: age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
|
||||||
enc: |
|
enc: |
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvK0lsajZ1b3dlMVA4Z2hm
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3WXdEM2RORG56N3hVRGx5
|
||||||
ek9lZENNYnVnQXp2U0hGM2pDd0FSL2JVbVhVClZUTWhNcmJadSttU2UrRVhTWU1y
|
NVZnWHY4TG5sRmdyQnJqVm4waUpoNGc4eFQ0CkNoanF3ZFRNQzQ5dHBST1BkSko0
|
||||||
RVV6NlpndEsyYk9zSmRqLytOWUtCNWMKLS0tIGN1TDJPY2orMGJobFExUEhWYzdx
|
cDAwYlBKVUZ3amJrcDJHcTloaXIwcWsKLS0tIDlMa0dqNmJvMjZZSVBPWjJncGlK
|
||||||
dDB3YWVlbUY4V25pa0IvTW1xNG1XcmMK+LLoW8f+M0eBIyxwI3tD637Fw/FuXmYx
|
Q3F3cHFoWC9Ga0Q4S3VqQ1psRjZZUmsK7+d9wMgC27xaOu1CLX8YbG8BbJdYhLLg
|
||||||
RV/hAOaznmfq3filh9KAEA+A/9mDI2lUeF/ye/g27tEEVtNRF9H+Dg==
|
dc8RHujixqkvheiv9syzCNF0z6Oc2qT5Vw2v7gCZ1SPgomOf3oHNHQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2026-02-07T15:11:34Z"
|
- recipient: age1wufdcd234uw69lcw6gtv9r5zfz7h5tvu0fzcg5d8tn67yx6pv47sary4q2
|
||||||
mac: ENC[AES256_GCM,data:Pgi9tYWnrMrlM9NjqDy0+BrH51/0T4c7M6dornLCumnRtR2Y3MZYGyA2E97kbwuqoPJCOWkzhJt7smwCRI+H0rXveO+ps+v5iUxzP+7MQmepn5wjS32HoL5c2Oer4CR7PkKY7YvL7z5IT6QcIgRXMODhsVbWgB8CjPrn/GYqb5Y=,iv:A2AyCNHfQEdx/wvUJQGc9ndL2/OYGGxBMidYOTHXO7Q=,tag:9uzJcu3bogQgVj0bDOPCwg==,type:str]
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpWjdzMWpCemJJR2FvUjJ2
|
||||||
|
b0hraEVBWDdJeG9JRFpLYm5XV1FDUDFMeFdnCktwRElvTmoyZmpPQ3VjbldXVHo4
|
||||||
|
SmpjQlRPK2o3YnNLMklyMnVwWERtb28KLS0tIDNjcGJhMkR1bCtBWUV1WU5TZjVR
|
||||||
|
YjBrekY4Y2JSczBEQ3BObjhKZkhYc3MKMrGlO/w7Hvp23rpL71/XDsJDcbc3t73C
|
||||||
|
iXdD2Oc9V5g5Jz3H7mkaAlNRg8u+LwGXYdwZiG7NWSyQnARPgeMBwQ==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
lastmodified: "2026-06-09T14:03:10Z"
|
||||||
|
mac: ENC[AES256_GCM,data:H87P4qqRKayz/x9MKK0a8IqL48UFFMVJHQ1tiuGAcUjDDQVmU3BJof6jM38Sixbe+wiCrNuIdYwFoSIvJKwUZ+Yk6vQqwmxPqfTwEiPArmXdAkbggRlncuyJF0aQ/Jkr0ntrH+Bbc+QSwRYdRmGVZP62gZae1DaOi3chvMLSrCg=,iv:kw67WeIAhsBlJaJhPc77xgX9yadMzu9022olqe4JtNA=,tag:1C523XJecI1DkywQlZHFgg==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.11.0
|
version: 3.12.1
|
||||||
|
|||||||
Reference in New Issue
Block a user