Compare commits
34 Commits
unified
...
1e0bc5d2b8
| Author | SHA1 | Date | |
|---|---|---|---|
|
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
|
||||
- [ ] Review if any macOS-specific tools need Linux alternatives
|
||||
- [ ] Consider adding dircolors configuration
|
||||
|
||||
### Documentation
|
||||
|
||||
- [ ] Add screenshots of tmux setup
|
||||
- [ ] Document custom Neovim configuration (lua files)
|
||||
- [ ] Create troubleshooting guide for common issues
|
||||
|
||||
@@ -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:
|
||||
|
||||
- [ ] Desktop environment / Window manager
|
||||
- [ ] Display manager (GDM, SDDM, LightDM)
|
||||
- [ ] Sound configuration (PipeWire/PulseAudio)
|
||||
- [ ] Printing support
|
||||
- [ ] Bluetooth support
|
||||
- [ ] Docker / Podman
|
||||
- [ ] Virtualization (QEMU/KVM)
|
||||
|
||||
## Known Issues
|
||||
|
||||
### Nvim Configuration Files
|
||||
|
||||
The nvim configuration references lua files from the parent directory:
|
||||
```nix
|
||||
initLua = builtins.concatStringsSep "\n" [
|
||||
(lib.strings.fileContents ../../../nvim/base.lua)
|
||||
(lib.strings.fileContents ../../../nvim/keymaps.lua)
|
||||
(lib.strings.fileContents ../../../nvim/plugins.lua)
|
||||
(lib.strings.fileContents ../../../nvim/filetype.lua)
|
||||
];
|
||||
```
|
||||
|
||||
**Status**: Should work if nvim/ directory exists at `/home/pan/dev/config/dot/nvim/`
|
||||
|
||||
**Action**: Verify these files exist or adjust paths
|
||||
|
||||
### Profile Loading
|
||||
|
||||
The shell configuration is now configurable via `dot.sh.sourceProfile`:
|
||||
```nix
|
||||
profileExtra = lib.mkIf cfg.sourceProfile ''
|
||||
source $HOME/.profile
|
||||
'';
|
||||
```
|
||||
|
||||
**Status**: Disabled by default. Only enabled for work host.
|
||||
|
||||
**Action**: Verify `~/.profile` exists on hosts where `dot.sh.sourceProfile = true` is set.
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
Before considering this configuration complete:
|
||||
|
||||
- [ ] System boots successfully
|
||||
- [ ] User can login as `pan`
|
||||
- [ ] Zsh loads with Prezto
|
||||
- [ ] Tmux starts without errors
|
||||
- [ ] Neovim opens and plugins load
|
||||
- [ ] LSP servers work in Neovim
|
||||
- [ ] Git commands work with correct identity
|
||||
- [ ] Lazygit opens and works
|
||||
- [ ] Jujutsu commands work
|
||||
- [ ] Taskwarrior shows tasks
|
||||
- [ ] Direnv loads `.envrc` files
|
||||
- [ ] fzf keybindings work (Ctrl+R)
|
||||
- [ ] zoxide navigation works
|
||||
- [ ] All shell aliases work
|
||||
|
||||
## Future Enhancements
|
||||
|
||||
- [ ] Add backup/restore scripts
|
||||
- [ ] Create CI/CD for testing configuration
|
||||
- [ ] Add secrets management (agenix or sops-nix)
|
||||
- [ ] Consider using flake-parts for better organization
|
||||
- [ ] Add system monitoring tools
|
||||
- [ ] Configure automatic updates
|
||||
|
||||
165
flake.lock
generated
165
flake.lock
generated
@@ -16,6 +16,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
@@ -34,24 +52,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -59,11 +59,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770260404,
|
||||
"narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
|
||||
"lastModified": 1779506708,
|
||||
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
|
||||
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -80,16 +80,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763992789,
|
||||
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
|
||||
"lastModified": 1779506708,
|
||||
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
|
||||
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -101,11 +101,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770184146,
|
||||
"narHash": "sha256-DsqnN6LvXmohTRaal7tVZO/AKBuZ02kPBiZKSU4qa/k=",
|
||||
"lastModified": 1781761792,
|
||||
"narHash": "sha256-rCPytmKNjctLloB6UgK5CRrHSwV4b0ygxtJLPPp8R14=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "0d7874ef7e3ba02d58bebb871e6e29da36fa1b37",
|
||||
"rev": "a1fa429e945becaf60468600daf649be4ba0350c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -143,26 +143,27 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770657009,
|
||||
"narHash": "sha256-v/LA5ZSJ+JQYzMSKB4sySM0wKfsAqddNzzxLLnbsV/E=",
|
||||
"lastModified": 1780448639,
|
||||
"narHash": "sha256-1s29/xP6iXwaEkTBxwbIQDnQzrLShlBcbnbTu0qJA0c=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "5b50ea1aaa14945d4794c80fcc99c4aa1db84d2d",
|
||||
"repo": "nixos-wsl",
|
||||
"rev": "364422fc0bad4fd3be804c00cadcbd6fa3f305d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"ref": "release-25.11",
|
||||
"repo": "nixos-wsl",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1770562336,
|
||||
"narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
|
||||
"lastModified": 1781577229,
|
||||
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
|
||||
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -172,13 +173,44 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1770617025,
|
||||
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=",
|
||||
"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-opencode": {
|
||||
"locked": {
|
||||
"lastModified": 1777270315,
|
||||
"narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482",
|
||||
"rev": "6368eda62c9775c38ef7f714b2555a741c20c72d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6368eda62c9775c38ef7f714b2555a741c20c72d",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1781509190,
|
||||
"narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -190,33 +222,34 @@
|
||||
},
|
||||
"nixpkgs-wsl-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"lastModified": 1781509190,
|
||||
"narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1770197578,
|
||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1771369470,
|
||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
||||
"rev": "0182a361324364ae3f436a63005877674cf45efb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
@@ -227,6 +260,7 @@
|
||||
"nixos-vscode-server": "nixos-vscode-server",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-opencode": "nixpkgs-opencode",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-wsl-stable": "nixpkgs-wsl-stable",
|
||||
"sops-nix": "sops-nix",
|
||||
@@ -240,11 +274,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770683991,
|
||||
"narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
|
||||
"lastModified": 1780547341,
|
||||
"narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
|
||||
"rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -268,32 +302,17 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tasksquire": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770735271,
|
||||
"narHash": "sha256-Vt1di5EUPq6ijBX0h8aaRVnSkCDpI5Myd2tXjQlK3Tw=",
|
||||
"lastModified": 1771878653,
|
||||
"narHash": "sha256-+OkJmYH+h5dgAbUtbGq8fZ90g5/rwiew5WPmbexD9kI=",
|
||||
"ref": "dev",
|
||||
"rev": "6e606985267d438f6d30a117863812347960694b",
|
||||
"revCount": 48,
|
||||
"rev": "6b1418fc71be513ba5ebb718da29e3190c3fda58",
|
||||
"revCount": 52,
|
||||
"type": "git",
|
||||
"url": "ssh://git@git.pander.me/martin/tasksquire.git"
|
||||
},
|
||||
|
||||
16
flake.nix
16
flake.nix
@@ -7,10 +7,13 @@
|
||||
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
|
||||
nixpkgs-wsl-stable.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nixpkgs-wsl-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
|
||||
# Pinned nixpkgs for opencode 1.14.25 (latest unstable segfaults)
|
||||
nixpkgs-opencode.url = "github:nixos/nixpkgs/6368eda62c9775c38ef7f714b2555a741c20c72d";
|
||||
|
||||
nixos-wsl = {
|
||||
url = "github:nix-community/NixOS-WSL";
|
||||
url = "github:nix-community/nixos-wsl/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
|
||||
};
|
||||
|
||||
@@ -20,7 +23,7 @@
|
||||
};
|
||||
|
||||
home-manager-wsl = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
|
||||
};
|
||||
|
||||
@@ -45,7 +48,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
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, nixpkgs-opencode, nixos-wsl, home-manager, home-manager-wsl, nix-darwin, ... }@inputs:
|
||||
let
|
||||
linuxSystem = "x86_64-linux";
|
||||
linuxAarchSystem = "aarch64-linux";
|
||||
@@ -70,7 +73,10 @@
|
||||
{
|
||||
nixpkgs.hostPlatform = linuxSystem;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
|
||||
nixpkgs.overlays = [
|
||||
(import ./modules/overlays/unstable.nix nixpkgs)
|
||||
(import ./modules/overlays/opencode.nix nixpkgs-opencode)
|
||||
];
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = {
|
||||
|
||||
@@ -18,5 +18,7 @@
|
||||
dot.llm = {
|
||||
enable = true;
|
||||
gemini-cli.enable = true;
|
||||
opencode.enable = true;
|
||||
opencode.enableConfig = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,8 +17,9 @@
|
||||
|
||||
dot.llm = {
|
||||
enable = true;
|
||||
claude-code.enable = true;
|
||||
opencode.enable = true;
|
||||
opencode.enableConfig = true;
|
||||
opencode.workMode = true;
|
||||
};
|
||||
|
||||
dot.tmux.workMode = true;
|
||||
|
||||
@@ -5,11 +5,15 @@
|
||||
../../../modules/nixos/common.nix
|
||||
];
|
||||
|
||||
# For sshfs
|
||||
programs.fuse.userAllowOther = true;
|
||||
|
||||
wsl.enable = true;
|
||||
wsl.defaultUser = "pan";
|
||||
wsl.interop.register = true;
|
||||
|
||||
networking.hostName = "nix";
|
||||
networking.firewall.enable = false;
|
||||
|
||||
users.users.pan = {
|
||||
isNormalUser = true;
|
||||
@@ -18,5 +22,11 @@
|
||||
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";
|
||||
}
|
||||
|
||||
@@ -11,7 +11,4 @@
|
||||
|
||||
# Home Manager release version
|
||||
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
|
||||
./nvim.nix
|
||||
./task.nix
|
||||
./opencode.nix
|
||||
];
|
||||
|
||||
config = {
|
||||
|
||||
@@ -38,15 +38,17 @@ in
|
||||
|
||||
home.packages = with pkgs; [
|
||||
visidata
|
||||
codespelunker
|
||||
jq
|
||||
];
|
||||
}
|
||||
|
||||
(lib.mkIf cfg.enable {
|
||||
home.packages =
|
||||
(lib.optional cfg.claude-code.enable pkgs.unstable.claude-code) ++
|
||||
(lib.optional cfg.opencode.enable pkgs.unstable.opencode) ++
|
||||
(lib.optional cfg.opencode.enable (pkgs.opencode-pinned or pkgs.unstable.opencode)) ++
|
||||
(lib.optional cfg.gemini-cli.enable pkgs.unstable.gemini-cli) ++
|
||||
(lib.optional (cfg.bubblewrap.enable && pkgs.stdenv.isLinux) pkgs.unstable.bubblewrap);
|
||||
})
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,6 +83,22 @@
|
||||
settings = {
|
||||
aliases = {
|
||||
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;
|
||||
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
vscode-nvim
|
||||
vim-repeat
|
||||
vim-surround
|
||||
ts-comments-nvim
|
||||
@@ -56,13 +57,11 @@ in
|
||||
cmp-git
|
||||
nvim-lspconfig
|
||||
lspkind-nvim
|
||||
copilot-lua
|
||||
copilot-cmp
|
||||
CopilotChat-nvim
|
||||
# opencode-nvim
|
||||
bullets-vim
|
||||
nvim-dap
|
||||
nvim-nio
|
||||
nvim-dap-ui
|
||||
nvim-dap-view
|
||||
nvim-dap-virtual-text
|
||||
nvim-dap-go
|
||||
nvim-dap-python
|
||||
@@ -81,7 +80,8 @@ in
|
||||
|
||||
extraLuaConfig = ''
|
||||
_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('keymaps')
|
||||
@@ -93,6 +93,10 @@ in
|
||||
# Allow for editing the lua modules without a nix rebuild
|
||||
xdg.configFile."nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "${config.dot.dotfilesPath}/modules/nvim/lua";
|
||||
|
||||
home.sessionVariables = {
|
||||
VISUAL = "nvim";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
nodejs-slim
|
||||
];
|
||||
|
||||
90
modules/home/opencode.nix
Normal file
90
modules/home/opencode.nix
Normal file
@@ -0,0 +1,90 @@
|
||||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.dot.llm.opencode;
|
||||
in
|
||||
{
|
||||
options.dot.llm.opencode = {
|
||||
enableConfig = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable managed OpenCode configuration";
|
||||
};
|
||||
|
||||
workMode = lib.mkEnableOption "work-specific opencode configuration";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enableConfig {
|
||||
# Declare the sops secret
|
||||
sops.secrets.langdock_api_key = {
|
||||
# Uses defaultSopsFile from secrets.nix
|
||||
};
|
||||
|
||||
# Create the OpenCode config.json template with secret substitution
|
||||
sops.templates."opencode/opencode.json" = {
|
||||
content = builtins.toJSON (let
|
||||
baseConfig = {
|
||||
"$schema" = "https://opencode.ai/config.json";
|
||||
default_agent = "plan";
|
||||
};
|
||||
|
||||
workConfig = {
|
||||
enabled_providers = [ "anthropic" "langdock-openai" "ollama" ];
|
||||
model = "anthropic/claude-opus-4-6-default";
|
||||
small_model = "anthropic/claude-haiku-4-5-20251001";
|
||||
provider = {
|
||||
langdock-openai = {
|
||||
npm = "@ai-sdk/openai-compatible";
|
||||
name = "Langdock OpenAI";
|
||||
options = {
|
||||
baseURL = "https://api.langdock.com/openai/eu/v1";
|
||||
apiKey = config.sops.placeholder.langdock_api_key;
|
||||
};
|
||||
models = {
|
||||
"gpt-5.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-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-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'
|
||||
HISTIGNORE='&:[ ]*:exit:ls:bg:fg:history:clear'
|
||||
unsetopt beep
|
||||
'';
|
||||
|
||||
profileExtra = lib.mkIf cfg.sourceProfile ''
|
||||
source $HOME/.profile
|
||||
prg() {
|
||||
# ''${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 = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
@@ -96,6 +112,9 @@ in
|
||||
ripgrep-all
|
||||
viddy
|
||||
duf
|
||||
lsof
|
||||
rclone
|
||||
sshfs
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
|
||||
@@ -2,6 +2,104 @@
|
||||
|
||||
let
|
||||
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)
|
||||
|
||||
if [[ -z "$sessions" ]]; then
|
||||
echo "No active tmux sessions found."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# 2. Open fzf (Multi-select: Tab to mark multiple, Enter to confirm)
|
||||
selected=$(echo "$sessions" | ${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 ${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
|
||||
{
|
||||
options.dot.tmux = {
|
||||
@@ -14,20 +112,24 @@ in
|
||||
shortcut = "a";
|
||||
mouse = true;
|
||||
keyMode = "vi";
|
||||
escapeTime = 0;
|
||||
escapeTime = 10;
|
||||
terminal = "screen-256color";
|
||||
tmuxp.enable = true;
|
||||
extraConfig = ''
|
||||
set -g display-time 1500
|
||||
set -s set-clipboard on
|
||||
|
||||
unbind S
|
||||
bind S command-prompt "switch -t %1"
|
||||
bind-key , command-prompt -p "rename-window:" "rename-window '%%'"
|
||||
|
||||
bind-key -n M-K switch-client -p
|
||||
bind-key -n M-J switch-client -n
|
||||
# Check if we are in vim
|
||||
is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
|
||||
|
||||
bind-key -n M-L next-window
|
||||
bind-key -n M-H previous-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 C-M-j if-shell "$is_vim" { send-keys C-M-j } { if -F "#{pane_at_bottom}" "switch-client -n" "select-pane -D" }
|
||||
bind-key -n C-M-k if-shell "$is_vim" { send-keys C-M-k } { if -F "#{pane_at_top}" "switch-client -p" "select-pane -U" }
|
||||
bind-key -n C-M-l if-shell "$is_vim" { send-keys C-M-l } { if -F "#{pane_at_right}" "next-window" "select-pane -R" }
|
||||
|
||||
bind '"' split-window -c "#{pane_current_path}"
|
||||
bind % split-window -h -c "#{pane_current_path}"
|
||||
@@ -36,10 +138,12 @@ in
|
||||
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-r display-popup -E "tmuxKiller"
|
||||
|
||||
${lib.optionalString cfg.workMode ''
|
||||
bind C-s display-popup -E "zsh ~/bin/tmuxp_selector.sh"
|
||||
bind C-n display-popup -E -xC -yC -w 95% -h 95% -d "~/Documents/notes/Work/" "vim quick_notes.md"
|
||||
bind C-p display-popup -E -xC -yC -w 95% -h 95% -d "~/Documents/notes/Work/development/" "vim mbpr.md"
|
||||
bind C-s display-popup -E "projectSelector"
|
||||
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 "/mnt/c/Users/marti/Documents/notes/Work/development/" "vim mbpr.md"
|
||||
''}
|
||||
|
||||
#######################################
|
||||
@@ -75,6 +179,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 = {
|
||||
"o" = "tmuxp";
|
||||
"ol" = "tmuxp load";
|
||||
|
||||
@@ -26,8 +26,6 @@ vim.opt.smartcase = true
|
||||
vim.opt.hidden = true
|
||||
vim.opt.splitright = true
|
||||
vim.opt.splitbelow = true
|
||||
vim.opt.swapfile = true
|
||||
vim.opt.directory= '~/.cache/nvim/swap//,$TEMP//,/tmp//'
|
||||
vim.opt.wildmode = 'longest,list'
|
||||
vim.opt.wildignore = vim.opt.wildignore + 'main,*.o,*.d,*.aux,*.bbl,*.lof,*.loa,*.blg,*.fdb_latexmk,*.fls,*.tdo,*.pdf,*.pyc'
|
||||
vim.opt.spell = false
|
||||
@@ -36,7 +34,6 @@ vim.opt.foldopen = vim.opt.foldopen - 'block'
|
||||
vim.opt.foldlevel = 99
|
||||
vim.opt.lazyredraw = true
|
||||
vim.opt.listchars = 'eol:¬,tab:▸ ,trail:·'
|
||||
vim.opt.fillchars = 'vert:|,fold: '
|
||||
vim.opt.list = true
|
||||
vim.opt.laststatus = 3
|
||||
vim.opt.scrolloff = 8
|
||||
@@ -52,15 +49,53 @@ vim.opt.encoding = 'utf-8'
|
||||
vim.opt.completeopt = 'menu,menuone,noselect'
|
||||
vim.opt.termguicolors = true
|
||||
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 ---------
|
||||
----------------------------
|
||||
-- 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
|
||||
vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
|
||||
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
|
||||
|
||||
vim.opt.clipboard = 'unnamedplus'
|
||||
|
||||
|
||||
----------------------------
|
||||
-------- COMMANDS ----------
|
||||
@@ -68,9 +103,6 @@ end
|
||||
|
||||
vim.cmd('filetype plugin indent on')
|
||||
|
||||
-- vim.cmd('colorscheme lucius')
|
||||
-- vim.cmd('LuciusWhite')
|
||||
|
||||
|
||||
----------------------------
|
||||
-------- AUTOGROUPS --------
|
||||
@@ -154,24 +186,18 @@ vim.diagnostic.config({
|
||||
prefix = '● ',
|
||||
current_line = false,
|
||||
severity = {
|
||||
-- min = vim.diagnostic.severity.INFO,
|
||||
max = vim.diagnostic.severity.INFO,
|
||||
},
|
||||
},
|
||||
virtual_lines = {
|
||||
current_line = false,
|
||||
severity = {
|
||||
min = vim.diagnostic.severity.WARN,
|
||||
-- max = vim.diagnostic.severity.WARN,
|
||||
min = vim.diagnostic.severity.HINT,
|
||||
},
|
||||
},
|
||||
virtual_lines = false,
|
||||
-- float = false,
|
||||
float = {
|
||||
prefix = '',
|
||||
focusable = false,
|
||||
style = "minimal",
|
||||
border = "rounded",
|
||||
source = "always",
|
||||
header = "",
|
||||
scope = 'line',
|
||||
style = 'minimal',
|
||||
border = 'rounded',
|
||||
source = 'always',
|
||||
header = '',
|
||||
},
|
||||
})
|
||||
|
||||
@@ -180,3 +206,11 @@ vim.cmd([[highlight DiagnosticUnderlineWarn gui=undercurl guifg=Yellow]])
|
||||
vim.cmd([[highlight DiagnosticUnderlineInfo gui=undercurl guifg=Blue]])
|
||||
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,166 @@
|
||||
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,
|
||||
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_autocmd('FileType', {
|
||||
group = 'FileTypeConfigs',
|
||||
group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||
pattern = 'python',
|
||||
callback = function()
|
||||
require('dap-python').setup()
|
||||
-- lspconfig.pyright.setup({ capabilities = capabilities })
|
||||
-- require("conform").setup({
|
||||
-- python = {"black"},
|
||||
-- })
|
||||
local status, dappython = pcall(require, "dap-python")
|
||||
if status then
|
||||
dappython.setup()
|
||||
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,
|
||||
})
|
||||
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- group = 'FileTypeConfigs',
|
||||
-- pattern = 'go',
|
||||
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||
-- pattern = 'proto',
|
||||
-- once = true,
|
||||
-- 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',
|
||||
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||
-- pattern = 'markdown',
|
||||
-- once = true,
|
||||
-- callback = function()
|
||||
-- lspconfig.marksman.setup({ capabilities = capabilities })
|
||||
-- end,
|
||||
-- })
|
||||
--
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- group = 'FileTypeConfigs',
|
||||
-- pattern = 'dockerfile',
|
||||
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||
-- pattern = 'sql',
|
||||
-- once = true,
|
||||
-- callback = function()
|
||||
-- lspconfig.dockerls.setup({ capabilities = capabilities })
|
||||
-- lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
|
||||
-- end,
|
||||
-- })
|
||||
--
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- group = 'FileTypeConfigs',
|
||||
-- pattern = 'cs',
|
||||
-- callback = function()
|
||||
-- lspconfig.omnisharp.setup({ capabilities = capabilities })
|
||||
-- end,
|
||||
-- })
|
||||
--
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- group = 'FileTypeConfigs',
|
||||
-- pattern = 'yaml',
|
||||
-- callback = function()
|
||||
-- lspconfig.yamlls.setup({ capabilities = capabilities })
|
||||
-- lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
|
||||
-- end,
|
||||
-- })
|
||||
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- group = 'FileTypeConfigs',
|
||||
-- pattern = {'c', 'cpp', 'objc', 'objcpp'},
|
||||
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||
-- pattern = { 'dockerfile', 'yaml.docker-compose' },
|
||||
-- once = true,
|
||||
-- callback = function()
|
||||
-- lspconfig.clangd.setup({ capabilities = capabilities })
|
||||
-- end,
|
||||
-- })
|
||||
--
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- group = 'FileTypeConfigs',
|
||||
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||
-- pattern = 'rust',
|
||||
-- once = true,
|
||||
-- callback = function()
|
||||
-- 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()
|
||||
-- lspconfig.sqls.setup({ capabilities = capabilities })
|
||||
-- end,
|
||||
-- })
|
||||
--
|
||||
-- vim.api.nvim_create_autocmd('FileType', {
|
||||
-- group = 'FileTypeConfigs',
|
||||
-- pattern = 'zig',
|
||||
-- group = vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true }),
|
||||
-- pattern = { 'cs' },
|
||||
-- pattern = 'sql',
|
||||
-- once = true,
|
||||
-- callback = function()
|
||||
-- lspconfig.zls.setup({ capabilities = capabilities })
|
||||
-- end,
|
||||
-- })
|
||||
--
|
||||
|
||||
local get_datetime = function()
|
||||
return os.date("%Y-%m-%d %H:%M")
|
||||
end
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
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
|
||||
vim.keymap.set({'n', 'v'}, 'j', 'gj', {})
|
||||
vim.keymap.set({'n', 'v'}, 'k', 'gk', {})
|
||||
|
||||
vim.keymap.set('n', '<C-M-h>', '<C-w>h', {})
|
||||
vim.keymap.set('n', '<C-M-j>', '<C-w>j', {})
|
||||
vim.keymap.set('n', '<C-M-k>', '<C-w>k', {})
|
||||
vim.keymap.set('n', '<C-M-l>', '<C-w>l', {})
|
||||
vim.keymap.set('t', '<C-M-h>', '<C-\\><C-n><C-w>h', {})
|
||||
vim.keymap.set('t', '<C-M-j>', '<C-\\><C-n><C-w>j', {})
|
||||
vim.keymap.set('t', '<C-M-k>', '<C-\\><C-n><C-w>k', {})
|
||||
vim.keymap.set('t', '<C-M-l>', '<C-\\><C-n><C-w>l', {})
|
||||
vim.keymap.set('n', '<leader>zm', '<C-W>_<C-W>|', { noremap = true, silent = true })
|
||||
vim.keymap.set('n', '<C-M-Y>', '<C-w>5<', {})
|
||||
vim.keymap.set('n', '<C-M-U>', '<C-w>5+', {})
|
||||
@@ -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>', {})
|
||||
|
||||
-- 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$', {})
|
||||
-- tmux navigation
|
||||
vim.g.tmux_navigator_no_mappings = 1
|
||||
|
||||
local function tmux_navigate(direction)
|
||||
local old_win = vim.api.nvim_get_current_win()
|
||||
vim.cmd('wincmd ' .. direction)
|
||||
local new_win = vim.api.nvim_get_current_win()
|
||||
|
||||
if old_win == new_win then
|
||||
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
|
||||
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>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>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.declaration, { desc = 'LSP Declaration' })
|
||||
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', '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>cdh', vim.diagnostic.open_float, { desc = 'Toggle Diagnostics float' })
|
||||
vim.keymap.set('n', '<leader>cf',
|
||||
function()
|
||||
local word = vim.fn.expand("<cword>")
|
||||
@@ -70,29 +103,6 @@ vim.keymap.set('v', '<leader>cf',
|
||||
end
|
||||
)
|
||||
|
||||
-- Copilot
|
||||
local cop = require('copilot.panel')
|
||||
local cos = require('copilot.suggestion')
|
||||
|
||||
vim.keymap.set('n', '<leader>ap', cop.toggle)
|
||||
vim.keymap.set('n', '<leader>apn', cop.jump_next)
|
||||
vim.keymap.set('n', '<leader>app', cop.jump_prev)
|
||||
vim.keymap.set('n', '<leader>apr', cop.refresh)
|
||||
|
||||
-- vim.keymap.set('n', '<leader>as', cos.accept)
|
||||
-- vim.keymap.set('n', '<leader>ast', cos.toggle_auto_trigger)
|
||||
-- vim.keymap.set('n', '<leader>asl', cos.accept_word)
|
||||
-- vim.keymap.set('n', '<leader>asw', cos.accept_line)
|
||||
-- vim.keymap.set('n', '<leader>asn', cos.next)
|
||||
-- vim.keymap.set('n', '<leader>asp', cos.prev)
|
||||
-- vim.keymap.set('n', '<leader>asd', cos.dismiss)
|
||||
|
||||
vim.keymap.set('n', '<leader>ac', '<cmd>CopilotChatToggle<cr>')
|
||||
vim.keymap.set('n', '<leader>acs', '<cmd>CopilotChatStop<cr>')
|
||||
vim.keymap.set('n', '<leader>acr', '<cmd>CopilotChatReset<cr>')
|
||||
vim.keymap.set('n', '<leader>acm', '<cmd>CopilotChatModels<cr>')
|
||||
vim.keymap.set('n', '<leader>acp', '<cmd>CopilotChatPrompts<cr>')
|
||||
|
||||
-- Yanky
|
||||
vim.keymap.set({"n","x"}, "p", "<Plug>(YankyPutAfter)")
|
||||
vim.keymap.set({"n","x"}, "P", "<Plug>(YankyPutBefore)")
|
||||
@@ -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>dt", function() require("dap").terminate() end)
|
||||
vim.keymap.set('n', "<leader>dw", function() require("dap.ui.widgets").hover() end)
|
||||
vim.keymap.set('n', "<leader>dv", function() require("dap-view").toggle() end)
|
||||
|
||||
vim.keymap.set('n', "<F5>", function() require("dap").continue() end)
|
||||
vim.keymap.set('n', "<F11>", function() require("dap").step_into() end)
|
||||
vim.keymap.set('n', "<F10>", function() require("dap").step_over() end)
|
||||
vim.keymap.set('n', "<F12>", function() require("dap").step_out() end)
|
||||
vim.keymap.set('n', "<F1>", function() require("dap").step_over() end)
|
||||
vim.keymap.set('n', "<F2>", function() require("dap").step_into() 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.splitjoin').setup()
|
||||
require('mini.move').setup()
|
||||
require('mini.move').setup()
|
||||
require('flash').setup()
|
||||
require('ts-comments').setup()
|
||||
|
||||
@@ -16,6 +15,40 @@ vim.g.tagbar_autofocus=1
|
||||
|
||||
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 lspkind = require('lspkind')
|
||||
local ls = require('luasnip')
|
||||
@@ -80,7 +113,6 @@ cmp.setup({
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp', priority = 1000 },
|
||||
{ name = 'buffer', priority = 800, keyword_length = 2 },
|
||||
{ name = 'copilot', priority = 700 },
|
||||
{ name = 'path', priority = 600 },
|
||||
{ name = 'cmp_yanky', priority = 500 },
|
||||
{ name = 'git', priority = 400 },
|
||||
@@ -90,7 +122,6 @@ cmp.setup({
|
||||
|
||||
formatting = {
|
||||
format = lspkind.cmp_format({
|
||||
-- mode = "symbol_text",
|
||||
mode = "symbol",
|
||||
menu = ({
|
||||
buffer = "[buf]",
|
||||
@@ -100,22 +131,11 @@ cmp.setup({
|
||||
latex_symbols = "[tex]",
|
||||
path = "[path]",
|
||||
cmp_yanky = "[yank]",
|
||||
copilot = "[copilot]",
|
||||
}),
|
||||
symbol_map = { Copilot = "" }
|
||||
}),
|
||||
},
|
||||
})
|
||||
|
||||
-- -- Set configuration for specific filetype.
|
||||
-- cmp.setup.filetype('gitcommit', {
|
||||
-- sources = cmp.config.sources({
|
||||
-- { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git).
|
||||
-- }, {
|
||||
-- { name = 'buffer' },
|
||||
-- })
|
||||
-- })
|
||||
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
@@ -149,6 +169,7 @@ for _, ls in ipairs(language_servers) do
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
require('ufo').setup()
|
||||
|
||||
require("yanky").setup({
|
||||
@@ -177,27 +198,6 @@ require("telescope").setup {
|
||||
require("telescope").load_extension("ui-select")
|
||||
require("telescope").load_extension("yank_history")
|
||||
|
||||
-- require'nvim-treesitter.configs'.setup {
|
||||
-- -- ensure_installed = { "lua", "vim", "help" },
|
||||
-- ensure_installed = {},
|
||||
-- sync_install = false,
|
||||
-- auto_install = false,
|
||||
--
|
||||
--
|
||||
-- highlight = {
|
||||
-- enable = true,
|
||||
--
|
||||
-- disable = function(lang, buf)
|
||||
-- local max_filesize = 100 * 1024 -- 100 KB
|
||||
-- local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||
-- if ok and stats and stats.size > max_filesize then
|
||||
-- return true
|
||||
-- end
|
||||
-- end,
|
||||
--
|
||||
-- additional_vim_regex_highlighting = false,
|
||||
-- },
|
||||
-- }
|
||||
|
||||
require('lualine').setup({
|
||||
options = {
|
||||
@@ -240,16 +240,6 @@ require('lualine').setup({
|
||||
extensions = {}
|
||||
})
|
||||
|
||||
|
||||
require("copilot").setup({
|
||||
suggestion = { enabled = false },
|
||||
panel = { enabled = false },
|
||||
})
|
||||
require("copilot_cmp").setup()
|
||||
require("CopilotChat").setup {
|
||||
model = 'claude-3.7-sonnet',
|
||||
}
|
||||
|
||||
vim.g.bullets_enabled_file_types = {
|
||||
'markdown',
|
||||
'text',
|
||||
@@ -273,6 +263,7 @@ require("nvim-tree").setup({
|
||||
-- },
|
||||
})
|
||||
|
||||
|
||||
require('gitsigns').setup {
|
||||
signs = {
|
||||
add = { text = '┃' },
|
||||
@@ -329,30 +320,46 @@ require("conform").setup({
|
||||
rust = {"rustfmt", lsp_format = "fallback"},
|
||||
go = {"gofmt", "goimports", lsp_format = "fallback"},
|
||||
lua = { "stylua", lsp_format = "fallback"},
|
||||
sh = {"shfmt"},
|
||||
bash = {"shfmt"},
|
||||
zsh = {"shfmt"},
|
||||
},
|
||||
format_on_save = {
|
||||
timeout_ms = 500,
|
||||
lsp_fallback = true,
|
||||
},
|
||||
})
|
||||
|
||||
require('lint').linters_by_ft = {
|
||||
markdown = {'vale'},
|
||||
}
|
||||
require("trouble").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()
|
||||
|
||||
local dap, dapui = require("dap"), require("dapui")
|
||||
dap.listeners.before.attach.dapui_config = function()
|
||||
dapui.open()
|
||||
end
|
||||
dap.listeners.before.launch.dapui_config = function()
|
||||
dapui.open()
|
||||
end
|
||||
dap.listeners.before.event_terminated.dapui_config = function()
|
||||
dapui.close()
|
||||
end
|
||||
dap.listeners.before.event_exited.dapui_config = function()
|
||||
dapui.close()
|
||||
end
|
||||
local dap, dapui = require("dap"), require("dap-view")
|
||||
-- dap.listeners.before.attach.dapui_config = function()
|
||||
-- dapui.open()
|
||||
-- end
|
||||
-- dap.listeners.before.launch.dapui_config = function()
|
||||
-- dapui.open()
|
||||
-- end
|
||||
-- dap.listeners.before.event_terminated.dapui_config = function()
|
||||
-- dapui.close()
|
||||
-- end
|
||||
-- dap.listeners.before.event_exited.dapui_config = function()
|
||||
-- dapui.close()
|
||||
-- end
|
||||
|
||||
dap.adapters.codelldb = {
|
||||
type = 'server',
|
||||
@@ -363,21 +370,49 @@ dap.adapters.codelldb = {
|
||||
}
|
||||
}
|
||||
|
||||
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,
|
||||
},
|
||||
dap.adapters.cppdbg = {
|
||||
type = "executable",
|
||||
command = "gdb",
|
||||
args = { "--interpreter=dap", -- Tells GDB to speak the DAP protocol
|
||||
"--eval-command", "set print pretty on" }
|
||||
}
|
||||
|
||||
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 = {
|
||||
{
|
||||
name = "privat",
|
||||
@@ -410,6 +445,16 @@ if _G.is_work then
|
||||
daily_notes = {}
|
||||
end
|
||||
|
||||
if _G.is_private_nixos then
|
||||
workspaces = {
|
||||
{
|
||||
name = "tech",
|
||||
path = "~/notes",
|
||||
},
|
||||
}
|
||||
daily_notes = {}
|
||||
end
|
||||
|
||||
require("obsidian").setup({
|
||||
workspaces = workspaces,
|
||||
templates = {
|
||||
|
||||
@@ -62,10 +62,6 @@ vim.opt.clipboard:append('unnamedplus')
|
||||
|
||||
vim.cmd('filetype plugin indent on')
|
||||
|
||||
-- vim.cmd('colorscheme lucius')
|
||||
-- vim.cmd('LuciusWhite')
|
||||
|
||||
|
||||
------------------------------
|
||||
---------- AUTOGROUPS --------
|
||||
------------------------------
|
||||
|
||||
13
modules/overlays/opencode.nix
Normal file
13
modules/overlays/opencode.nix
Normal file
@@ -0,0 +1,13 @@
|
||||
# Overlay to provide a pinned version of opencode
|
||||
# This pins opencode to a specific nixpkgs commit to avoid issues
|
||||
# with the latest unstable version (segfaults).
|
||||
#
|
||||
# Usage: Pass nixpkgs-opencode input when applying overlay:
|
||||
# overlays = [ (import ./modules/overlays/opencode.nix nixpkgs-opencode) ];
|
||||
|
||||
nixpkgs-opencode: final: prev: {
|
||||
opencode-pinned = (import nixpkgs-opencode {
|
||||
inherit (prev) system;
|
||||
config.allowUnfree = true;
|
||||
}).opencode;
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
keys:
|
||||
- &macbook age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
|
||||
- &macnix age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
|
||||
- &worknix age1wufdcd234uw69lcw6gtv9r5zfz7h5tvu0fzcg5d8tn67yx6pv47sary4q2
|
||||
|
||||
creation_rules:
|
||||
- path_regex: secrets\.yaml$
|
||||
@@ -8,3 +9,4 @@ creation_rules:
|
||||
- age:
|
||||
- *macbook
|
||||
- *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:
|
||||
age:
|
||||
- recipient: age1hmgy68ukugduef75ev72jnpu77ff3lajadpf7u0zv3ex4nt7f5qs5nxx2l
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxUEZwYkFDYVd4ek53QU13
|
||||
YStKbEVOeTJaalVIWXh1SUlrSnUzanM0anpBCktBMytXQUNyOTZaZGc4NG1Ta1lX
|
||||
Mi91UWxXZWZjRDZqNDJWQU1YODgzUkkKLS0tIFY4TjUyczQ0SGZMOUM0NkQvUC94
|
||||
WDBpdDJMaWVvUGZUcXZLZE9oYjdKLzgK4B25MbF/3bUFJ5+zxUfpSNM79HT13nux
|
||||
dvlcwkwYKIkS9YZpnyiYXZGupFhUcq1ipIvsbq/B3WR9IFn4xromPw==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJcTBpZ3BwNnVxVkFQQWgy
|
||||
VWFsMFF0WGIzbTBFZ0htQ251dGlVdW5PckdNCmtldkZZL0Z3SER2OHZuUGdvNVpI
|
||||
Vk1KS1ZYVzZXZGtUbTNtZnhPeStSTlUKLS0tICtXYTgxMHc0alBYUDAzcXVXcm9J
|
||||
YjQrUGZaWmpaV2tGOXJmbGR5K3l1VFEK+bsmeV/PjYcSlsJz0ZQZ8U9EYSu8bTJM
|
||||
BJ0T910cPudb/dkMrU9QSWUlBbOKk78ivKvDbwqPBfguSqU5GevLGg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1yez9q5q94kt99d9q8eqgqrkz7djmk3kwsqdjp7ww7e0fquzjevpsjkk5x4
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvK0lsajZ1b3dlMVA4Z2hm
|
||||
ek9lZENNYnVnQXp2U0hGM2pDd0FSL2JVbVhVClZUTWhNcmJadSttU2UrRVhTWU1y
|
||||
RVV6NlpndEsyYk9zSmRqLytOWUtCNWMKLS0tIGN1TDJPY2orMGJobFExUEhWYzdx
|
||||
dDB3YWVlbUY4V25pa0IvTW1xNG1XcmMK+LLoW8f+M0eBIyxwI3tD637Fw/FuXmYx
|
||||
RV/hAOaznmfq3filh9KAEA+A/9mDI2lUeF/ye/g27tEEVtNRF9H+Dg==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3WXdEM2RORG56N3hVRGx5
|
||||
NVZnWHY4TG5sRmdyQnJqVm4waUpoNGc4eFQ0CkNoanF3ZFRNQzQ5dHBST1BkSko0
|
||||
cDAwYlBKVUZ3amJrcDJHcTloaXIwcWsKLS0tIDlMa0dqNmJvMjZZSVBPWjJncGlK
|
||||
Q3F3cHFoWC9Ga0Q4S3VqQ1psRjZZUmsK7+d9wMgC27xaOu1CLX8YbG8BbJdYhLLg
|
||||
dc8RHujixqkvheiv9syzCNF0z6Oc2qT5Vw2v7gCZ1SPgomOf3oHNHQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2026-02-07T15:11:34Z"
|
||||
mac: ENC[AES256_GCM,data:Pgi9tYWnrMrlM9NjqDy0+BrH51/0T4c7M6dornLCumnRtR2Y3MZYGyA2E97kbwuqoPJCOWkzhJt7smwCRI+H0rXveO+ps+v5iUxzP+7MQmepn5wjS32HoL5c2Oer4CR7PkKY7YvL7z5IT6QcIgRXMODhsVbWgB8CjPrn/GYqb5Y=,iv:A2AyCNHfQEdx/wvUJQGc9ndL2/OYGGxBMidYOTHXO7Q=,tag:9uzJcu3bogQgVj0bDOPCwg==,type:str]
|
||||
- recipient: age1wufdcd234uw69lcw6gtv9r5zfz7h5tvu0fzcg5d8tn67yx6pv47sary4q2
|
||||
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
|
||||
version: 3.11.0
|
||||
version: 3.12.1
|
||||
|
||||
Reference in New Issue
Block a user