Compare commits
26
Commits
2b4967c98c
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e2e43ea535 | ||
|
|
a278a36b6b | ||
|
|
0db179ecc4 | ||
|
|
461e5107a7 | ||
|
|
4091839450 | ||
|
|
275008da6d | ||
|
|
5039ab1498 | ||
|
|
00a556a4da | ||
|
|
38c857fe64 | ||
|
|
91ee1950de | ||
|
|
744e25eb4a | ||
|
|
9888e4a196 | ||
|
|
65a659ca91 | ||
|
|
66c2c2ca7f | ||
|
|
0c895d41ed | ||
|
|
7abae540d6 | ||
|
|
7c24103ec5 | ||
|
|
4004d9e361 | ||
|
|
5f8f8c4251 | ||
|
|
98a32ff28c | ||
|
|
e6ecc5271d | ||
|
|
34fd954950 | ||
|
|
ffcdef8e54 | ||
|
|
258f45400c | ||
|
|
c5cb5e9895 | ||
|
|
0ca1ef666d |
@@ -27,7 +27,7 @@ scrollback_pager_history_size 1024
|
|||||||
#: Mouse {{{
|
#: Mouse {{{
|
||||||
|
|
||||||
mouse_hide_wait 0.0
|
mouse_hide_wait 0.0
|
||||||
paste_actions quote-urls-at-prompt,confirm
|
paste_actions quote-urls-at-prompt
|
||||||
|
|
||||||
#: }}}
|
#: }}}
|
||||||
|
|
||||||
@@ -54,17 +54,6 @@ hide_window_decorations yes
|
|||||||
|
|
||||||
#: }}}
|
#: }}}
|
||||||
|
|
||||||
#: Tab bar {{{
|
|
||||||
|
|
||||||
tab_bar_edge bottom
|
|
||||||
tab_bar_style powerline
|
|
||||||
tab_bar_min_tabs 1
|
|
||||||
tab_powerline_style slanted
|
|
||||||
tab_activity_symbol !
|
|
||||||
tab_title_template "{index}{fmt.fg.red}{bell_symbol}{fmt.fg.tab}{activity_symbol}:{tab.last_focused_progress_percent}{title}"
|
|
||||||
|
|
||||||
#: }}}
|
|
||||||
|
|
||||||
#: Advanced {{{
|
#: Advanced {{{
|
||||||
|
|
||||||
notify_on_cmd_finish unfocused
|
notify_on_cmd_finish unfocused
|
||||||
@@ -128,14 +117,6 @@ map cmd+8
|
|||||||
map kitty_mod+9
|
map kitty_mod+9
|
||||||
map cmd+9
|
map cmd+9
|
||||||
map kitty_mod+0
|
map kitty_mod+0
|
||||||
map f1 goto_tab 1
|
|
||||||
map f2 goto_tab 2
|
|
||||||
map f3 goto_tab 3
|
|
||||||
map f4 goto_tab 4
|
|
||||||
map f5 goto_tab 5
|
|
||||||
map f6 goto_tab 6
|
|
||||||
map f7 goto_tab 7
|
|
||||||
map f8 goto_tab 8
|
|
||||||
# map kitty_mod+c new_tab # FIXME: conflict with 'copy'
|
# map kitty_mod+c new_tab # FIXME: conflict with 'copy'
|
||||||
map cmd+t
|
map cmd+t
|
||||||
map kitty_mod+q
|
map kitty_mod+q
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ allow_remote_control socket-only
|
|||||||
listen_on unix:/tmp/kitty
|
listen_on unix:/tmp/kitty
|
||||||
shell_integration enabled
|
shell_integration enabled
|
||||||
|
|
||||||
action_alias kitty_scrollback_nvim kitten ~/.local/share/nvim/site/pack/paqs/start/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py
|
action_alias kitty_scrollback_nvim kitten ~/.local/share/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py
|
||||||
map kitty_mod+h kitty_scrollback_nvim
|
map kitty_mod+h kitty_scrollback_nvim
|
||||||
map kitty_mod+g kitty_scrollback_nvim --config ksb_builtin_last_cmd_output
|
map kitty_mod+g kitty_scrollback_nvim --config ksb_builtin_last_cmd_output
|
||||||
mouse_map ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output
|
mouse_map ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
require("claude-code").setup({
|
|
||||||
-- Terminal window settings
|
|
||||||
window = {
|
|
||||||
split_ratio = 0.3, -- Percentage of screen for the terminal window (height for horizontal, width for vertical splits)
|
|
||||||
position = "vertical", -- Position of the window: "botright", "topleft", "vertical", "float", etc.
|
|
||||||
enter_insert = true, -- Whether to enter insert mode when opening Claude Code
|
|
||||||
hide_numbers = true, -- Hide line numbers in the terminal window
|
|
||||||
hide_signcolumn = true, -- Hide the sign column in the terminal window
|
|
||||||
|
|
||||||
-- Floating window configuration (only applies when position = "float")
|
|
||||||
float = {
|
|
||||||
width = "80%", -- Width: number of columns or percentage string
|
|
||||||
height = "80%", -- Height: number of rows or percentage string
|
|
||||||
row = "center", -- Row position: number, "center", or percentage string
|
|
||||||
col = "center", -- Column position: number, "center", or percentage string
|
|
||||||
relative = "editor", -- Relative to: "editor" or "cursor"
|
|
||||||
border = "rounded", -- Border style: "none", "single", "double", "rounded", "solid", "shadow"
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- File refresh settings
|
|
||||||
refresh = {
|
|
||||||
enable = true, -- Enable file change detection
|
|
||||||
updatetime = 100, -- updatetime when Claude Code is active (milliseconds)
|
|
||||||
timer_interval = 1000, -- How often to check for file changes (milliseconds)
|
|
||||||
show_notifications = true, -- Show notification when files are reloaded
|
|
||||||
},
|
|
||||||
-- Git project settings
|
|
||||||
git = {
|
|
||||||
use_git_root = true, -- Set CWD to git root when opening Claude Code (if in git project)
|
|
||||||
},
|
|
||||||
-- Shell-specific settings
|
|
||||||
shell = {
|
|
||||||
separator = "&&", -- Command separator used in shell commands
|
|
||||||
pushd_cmd = "pushd", -- Command to push directory onto stack (e.g., 'pushd' for bash/zsh, 'enter' for nushell)
|
|
||||||
popd_cmd = "popd", -- Command to pop directory from stack (e.g., 'popd' for bash/zsh, 'exit' for nushell)
|
|
||||||
},
|
|
||||||
-- Command settings
|
|
||||||
command = "claude", -- Command used to launch Claude Code
|
|
||||||
-- Command variants
|
|
||||||
command_variants = {
|
|
||||||
-- Conversation management
|
|
||||||
continue = "--continue", -- Resume the most recent conversation
|
|
||||||
resume = "--resume", -- Display an interactive conversation picker
|
|
||||||
|
|
||||||
-- Output options
|
|
||||||
verbose = "--verbose", -- Enable verbose logging with full turn-by-turn output
|
|
||||||
},
|
|
||||||
-- Keymaps
|
|
||||||
keymaps = {
|
|
||||||
toggle = {
|
|
||||||
normal = "<C-,>", -- Normal mode keymap for toggling Claude Code, false to disable
|
|
||||||
terminal = "<C-,>", -- Terminal mode keymap for toggling Claude Code, false to disable
|
|
||||||
variants = {
|
|
||||||
continue = "<leader>cC", -- Normal mode keymap for Claude Code with continue flag
|
|
||||||
verbose = "<leader>cV", -- Normal mode keymap for Claude Code with verbose flag
|
|
||||||
},
|
|
||||||
},
|
|
||||||
window_navigation = true, -- Enable window navigation keymaps (<C-h/j/k/l>)
|
|
||||||
scrolling = true, -- Enable scrolling keymaps (<C-f/b>) for page up/down
|
|
||||||
},
|
|
||||||
})
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
require("claudecode").setup({
|
||||||
|
-- terminal = {
|
||||||
|
-- provider = "snacks",
|
||||||
|
-- snacks_win_opts = {
|
||||||
|
-- position = "float",
|
||||||
|
-- width = 0.8,
|
||||||
|
-- height = 0.8,
|
||||||
|
-- border = "rounded",
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
-- diff_opts = {
|
||||||
|
-- layout = "vertical",
|
||||||
|
-- },
|
||||||
|
})
|
||||||
|
|
||||||
|
local map = vim.keymap.set
|
||||||
|
|
||||||
|
map({ "n", "t" }, "<C-_>", "<cmd>ClaudeCode<cr>", { desc = "Toggle Claude Code" })
|
||||||
|
map("n", "<leader>cf", "<cmd>ClaudeCodeFocus<cr>", { desc = "Focus Claude Code" })
|
||||||
|
map("n", "<leader>cC", "<cmd>ClaudeCode --continue<cr>", { desc = "Claude Code (continue)" })
|
||||||
|
map("n", "<leader>cr", "<cmd>ClaudeCode --resume<cr>", { desc = "Claude Code (resume)" })
|
||||||
|
map("n", "<leader>cm", "<cmd>ClaudeCodeSelectModel<cr>", { desc = "Claude Code select model" })
|
||||||
|
map("n", "<leader>cb", "<cmd>ClaudeCodeAdd %<cr>", { desc = "Add buffer to Claude Code" })
|
||||||
|
map("v", "<leader>cs", "<cmd>ClaudeCodeSend<cr>", { desc = "Send selection to Claude Code" })
|
||||||
|
map("n", "<leader>co", "<cmd>ClaudeCodeDiffAccept<cr>", { desc = "Accept Claude Code diff" })
|
||||||
|
map("n", "<leader>cd", "<cmd>ClaudeCodeDiffDeny<cr>", { desc = "Deny Claude Code diff" })
|
||||||
@@ -1 +0,0 @@
|
|||||||
require("copilot_cmp").setup()
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
require("copilot").setup({})
|
|
||||||
@@ -2,7 +2,7 @@ local gitsigns = require("gitsigns")
|
|||||||
|
|
||||||
gitsigns.setup({
|
gitsigns.setup({
|
||||||
current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
|
current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
|
||||||
linehl = true,
|
-- linehl = true,
|
||||||
current_line_blame_opts = {
|
current_line_blame_opts = {
|
||||||
delay = 0,
|
delay = 0,
|
||||||
virt_text_pos = "right_align",
|
virt_text_pos = "right_align",
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ cmp.setup({
|
|||||||
["<CR>"] = c_l,
|
["<CR>"] = c_l,
|
||||||
}),
|
}),
|
||||||
sources = {
|
sources = {
|
||||||
{ name = "copilot", group_index = 2 },
|
|
||||||
{ name = "zk" },
|
{ name = "zk" },
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
{ name = "luasnip", max_item_count = 16 },
|
{ name = "luasnip", max_item_count = 16 },
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
local function overrides()
|
||||||
|
local colors = require("vscode.colors").get_colors()
|
||||||
|
vim.api.nvim_set_hl(0, "NormalFloat", { bg = colors.vscLeftDark })
|
||||||
|
vim.api.nvim_set_hl(0, "FloatBorder", { fg = colors.vscSplitDark, bg = colors.vscLeftDark })
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("ColorScheme", {
|
||||||
|
pattern = "vscode",
|
||||||
|
callback = overrides,
|
||||||
|
})
|
||||||
|
|
||||||
|
if vim.g.colors_name == "vscode" then
|
||||||
|
overrides()
|
||||||
|
end
|
||||||
@@ -1 +0,0 @@
|
|||||||
vim.cmd("colorscheme zenwritten")
|
|
||||||
@@ -40,7 +40,6 @@
|
|||||||
allowUnfreePredicate =
|
allowUnfreePredicate =
|
||||||
pkg:
|
pkg:
|
||||||
builtins.elem (nixpkgs.lib.getName pkg) [
|
builtins.elem (nixpkgs.lib.getName pkg) [
|
||||||
"copilot-language-server"
|
|
||||||
"vim-sandwich"
|
"vim-sandwich"
|
||||||
"jupytext.nvim"
|
"jupytext.nvim"
|
||||||
"eyeliner.nvim"
|
"eyeliner.nvim"
|
||||||
@@ -71,8 +70,12 @@
|
|||||||
categoryDefinitions =
|
categoryDefinitions =
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
|
categories,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
themes = import ./themes.nix pkgs;
|
||||||
|
in
|
||||||
{
|
{
|
||||||
lspsAndRuntimeDeps = with pkgs; {
|
lspsAndRuntimeDeps = with pkgs; {
|
||||||
general = [
|
general = [
|
||||||
@@ -113,7 +116,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
startupPlugins = {
|
startupPlugins = {
|
||||||
general = with pkgs.vimPlugins; [
|
general =
|
||||||
|
with pkgs.vimPlugins;
|
||||||
|
[
|
||||||
## plug
|
## plug
|
||||||
vim-plug
|
vim-plug
|
||||||
vim-sandwich
|
vim-sandwich
|
||||||
@@ -155,9 +160,8 @@
|
|||||||
plenary-nvim
|
plenary-nvim
|
||||||
nui-nvim
|
nui-nvim
|
||||||
trouble-nvim
|
trouble-nvim
|
||||||
pkgs.neovimPlugins.shipwright-nvim
|
|
||||||
lush-nvim
|
lush-nvim
|
||||||
zenbones-nvim
|
pkgs.neovimPlugins.shipwright-nvim
|
||||||
nvim-treesitter.withAllGrammars
|
nvim-treesitter.withAllGrammars
|
||||||
nvim-treesitter-textobjects
|
nvim-treesitter-textobjects
|
||||||
# nvim-treesitter-context
|
# nvim-treesitter-context
|
||||||
@@ -174,15 +178,15 @@
|
|||||||
pkgs.neovimPlugins.beancount-nvim
|
pkgs.neovimPlugins.beancount-nvim
|
||||||
pkgs.neovimPlugins.nvimkit-nvim
|
pkgs.neovimPlugins.nvimkit-nvim
|
||||||
codecompanion-nvim
|
codecompanion-nvim
|
||||||
copilot-lua
|
|
||||||
copilot-cmp
|
|
||||||
helm-ls-nvim
|
helm-ls-nvim
|
||||||
kitty-scrollback-nvim
|
kitty-scrollback-nvim
|
||||||
fidget-nvim
|
fidget-nvim
|
||||||
rustaceanvim
|
rustaceanvim
|
||||||
# pkgs.neovimPlugins.m-taskwarrior-d-nvim
|
# pkgs.neovimPlugins.m-taskwarrior-d-nvim
|
||||||
claude-code-nvim
|
claudecode-nvim
|
||||||
];
|
snacks-nvim
|
||||||
|
]
|
||||||
|
++ themes.${categories.colorscheme or "zenwritten"};
|
||||||
};
|
};
|
||||||
|
|
||||||
optionalPlugins = {
|
optionalPlugins = {
|
||||||
@@ -207,6 +211,7 @@
|
|||||||
};
|
};
|
||||||
categories = {
|
categories = {
|
||||||
general = true;
|
general = true;
|
||||||
|
colorscheme = "zenwritten";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ vim.api.nvim_create_user_command("AnkiDeck", function()
|
|||||||
end, {})
|
end, {})
|
||||||
|
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
set cc=81
|
|
||||||
set cocu=""
|
set cocu=""
|
||||||
func! GetContext()
|
func! GetContext()
|
||||||
" https://stackoverflow.com/questions/9464844/how-to-get-group-name-of-highlighting-under-cursor-in-vim
|
" https://stackoverflow.com/questions/9464844/how-to-get-group-name-of-highlighting-under-cursor-in-vim
|
||||||
|
|||||||
@@ -16,5 +16,4 @@ require("diagnostic")
|
|||||||
require("utils")
|
require("utils")
|
||||||
require("zk")
|
require("zk")
|
||||||
require("reload")
|
require("reload")
|
||||||
|
require("theme")
|
||||||
vim.opt.background = "dark"
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ set("n", "s=", "<c-w>=", { desc = "equalize splits" })
|
|||||||
set("n", "sb", ":Lex<cr>", { desc = "file tree" })
|
set("n", "sb", ":Lex<cr>", { desc = "file tree" })
|
||||||
set("n", "<leader><leader>", ":noh<cr>", { desc = "clear highlights" })
|
set("n", "<leader><leader>", ":noh<cr>", { desc = "clear highlights" })
|
||||||
set("n", "<leader>t", ":term<cr>", { desc = "open terminal" })
|
set("n", "<leader>t", ":term<cr>", { desc = "open terminal" })
|
||||||
|
set("n", "<leader>w", "<cmd>w<cr>", { desc = ":w" })
|
||||||
|
|
||||||
-- remaps
|
-- remaps
|
||||||
set("i", "jj", "<esc>", { nowait = true, desc = "exit insert mode" })
|
set("i", "jj", "<esc>", { nowait = true, desc = "exit insert mode" })
|
||||||
@@ -34,9 +35,6 @@ set("i", "<down>", "<nop>")
|
|||||||
set("i", "<up>", "<nop>")
|
set("i", "<up>", "<nop>")
|
||||||
set("i", "<right>", "<nop>")
|
set("i", "<right>", "<nop>")
|
||||||
|
|
||||||
-- search
|
|
||||||
set("n", "<c-_>", ":noh<cr>", { desc = "clear search highlight" })
|
|
||||||
|
|
||||||
-- line numbers
|
-- line numbers
|
||||||
set("n", "<leader>n", ":set nu! rnu!<cr>", { desc = "toggle line numbers" })
|
set("n", "<leader>n", ":set nu! rnu!<cr>", { desc = "toggle line numbers" })
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
vim.opt.background = "dark"
|
||||||
|
|
||||||
|
if vim.g.vscode then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.g.zenwritten_compat = 1
|
||||||
|
vim.cmd.colorscheme(require("nixCatsUtils").getCatOrDefault("colorscheme", "zenwritten"))
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
pkgs: {
|
||||||
|
vscode = [ pkgs.vimPlugins.vscode-nvim ];
|
||||||
|
zenwritten = [ pkgs.vimPlugins.zenbones-nvim ];
|
||||||
|
}
|
||||||
Generated
+33
-33
@@ -123,11 +123,11 @@
|
|||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1786361680,
|
"lastModified": 1788879443,
|
||||||
"narHash": "sha256-IxaZkb9rCGEZ+yGndxKXONeIEcKMzoFUsvLTB5G/caw=",
|
"narHash": "sha256-qb9sL86UCUEd3SYAda4ItN1NV0vhMSdbpA64WckvVI0=",
|
||||||
"owner": "serokell",
|
"owner": "serokell",
|
||||||
"repo": "deploy-rs",
|
"repo": "deploy-rs",
|
||||||
"rev": "16901271e5b30b591e56f7a84f25f186fb20f3e1",
|
"rev": "414ac5f35d79aabe5a0bf52451d8cf61eadf6c88",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -165,11 +165,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1787630552,
|
"lastModified": 1788926592,
|
||||||
"narHash": "sha256-w3LGSHkHWKRH5K4A8plRWaFbaSWfdZAIxv32kO2mpOg=",
|
"narHash": "sha256-cHzKQBhQVLPfMCtK+E0EMeQpwW2/XA9l+8H6xXsT+70=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "25227969423d7ef599f70e16364ac550a0f713cd",
|
"rev": "9d230a63e1419b6efd95728f01a6a72e1986a03f",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -264,7 +264,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_3": {
|
"flake-parts_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
"stylix",
|
"stylix",
|
||||||
@@ -345,11 +345,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787424939,
|
"lastModified": 1788267358,
|
||||||
"narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=",
|
"narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297",
|
"rev": "27555e2624241fb116b49095df4caaee85a25691",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -396,11 +396,11 @@
|
|||||||
"hecuba-services": {
|
"hecuba-services": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787190763,
|
"lastModified": 1788557536,
|
||||||
"narHash": "sha256-hZCD0M5mt6gP5z21dYOslx9d7aoF5XTCgB0axt8O+SA=",
|
"narHash": "sha256-oG0PyMqzA11EGfqY86iU73DjYq5HHoK89kQW0xaPHf4=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "838434daa9844608863c93627aa466a0109237b5",
|
"rev": "29002359b7a863b12bed5a83a1cafc53c660a14a",
|
||||||
"revCount": 209,
|
"revCount": 218,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@github.com/hektor/hecuba-services"
|
"url": "ssh://git@github.com/hektor/hecuba-services"
|
||||||
},
|
},
|
||||||
@@ -417,11 +417,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787540599,
|
"lastModified": 1788921139,
|
||||||
"narHash": "sha256-MHwk52ty3NsLhq9a1IbIfBJZlCUJIdiUYFo52JLK9hY=",
|
"narHash": "sha256-2wRuvf9UDw1SYWtBcxNmxLeAtNU1i/hc1c0AKQHdvlM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "03f4cd46bc1dd4f3a96da778d2ce9f7ce39dd450",
|
"rev": "a2dbe7c2c9333e8234ae8114c7f731784201d108",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -454,10 +454,10 @@
|
|||||||
"nix-secrets": {
|
"nix-secrets": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785190089,
|
"lastModified": 1788786361,
|
||||||
"narHash": "sha256-nhzJq5kkcU9X5QXhErn1pHqqN5TPxUVV0teOd+yMzN4=",
|
"narHash": "sha256-u6qgw8xKHLdlC02HZnC89WzigADbXoO4mGsllMMj5FM=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "3375f7a8ccb4dc3c5ea3c488597c659665973e4d",
|
"rev": "b560101cef698142dd15cacc222c2c6135b8ab04",
|
||||||
"shallow": true,
|
"shallow": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@github.com/hektor/nix-secrets"
|
"url": "ssh://git@github.com/hektor/nix-secrets"
|
||||||
@@ -510,11 +510,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787144466,
|
"lastModified": 1788942796,
|
||||||
"narHash": "sha256-HHfv2/HkNSKbbSyU9iD/g8lbP6r4tl33sSw1W4rXCk0=",
|
"narHash": "sha256-CLoJCCRi9sogsyGXYn8rOCWBLKAntfKUB9Rli/YXgEY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "0471accf8d0a8210b31d947497d179ecc99e0021",
|
"rev": "83bbc895120516d6e86885a188c04beced6535d9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -539,11 +539,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787498568,
|
"lastModified": 1788881743,
|
||||||
"narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
|
"narHash": "sha256-2V9GZGvPfrNzxFozhI9dcqV+c3QdA8YZrvAAzqEB+dI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
|
"rev": "d6524aaca2ff07876657ae2b323f24be4874944b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -689,11 +689,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1786629091,
|
"lastModified": 1788914643,
|
||||||
"narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=",
|
"narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f",
|
"rev": "13616fff713a9f94055c66f15687ebdc17a335df",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -725,7 +725,7 @@
|
|||||||
"base16-helix": "base16-helix",
|
"base16-helix": "base16-helix",
|
||||||
"base16-vim": "base16-vim",
|
"base16-vim": "base16-vim",
|
||||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||||
"flake-parts": "flake-parts_3",
|
"flake-parts": "flake-parts_2",
|
||||||
"gnome-shell": "gnome-shell",
|
"gnome-shell": "gnome-shell",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
@@ -738,11 +738,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1787175104,
|
"lastModified": 1787771653,
|
||||||
"narHash": "sha256-tzNjlb0loxeWlipvxSNAUUihloeTZoyGFhEen87yM9k=",
|
"narHash": "sha256-DkkJSBOXWV/mja5Vy8az5g1KpZlsbUwlmH0BsQhowaQ=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "a9e5a76a1b75b137f266e4f445e1eaba82e9783e",
|
"rev": "5e3809851f486e7fc7e84b40f174c74b60ecc784",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -27,34 +27,36 @@
|
|||||||
claude-code.enable = true;
|
claude-code.enable = true;
|
||||||
opencode.enable = true;
|
opencode.enable = true;
|
||||||
};
|
};
|
||||||
desktop.niri.enable = true;
|
anki.enable = true;
|
||||||
browser.enable = true;
|
audio.enable = true;
|
||||||
browser.primary = "librewolf";
|
browser.primary = "librewolf";
|
||||||
cloud.hetzner.enable = true;
|
cloud = {
|
||||||
gaming.enable = true;
|
hetzner.enable = true;
|
||||||
|
vercel.enable = true;
|
||||||
|
};
|
||||||
comms.signal.enable = true;
|
comms.signal.enable = true;
|
||||||
|
deploy.enable = true;
|
||||||
|
desktop.niri.enable = true;
|
||||||
|
devenv.enable = true;
|
||||||
|
direnv.enable = true;
|
||||||
|
gaming.enable = true;
|
||||||
git.enable = true;
|
git.enable = true;
|
||||||
git.github.enable = true;
|
git.github.enable = true;
|
||||||
|
k8s.k9s.enable = true;
|
||||||
|
keepassxc.enable = true;
|
||||||
|
music.enable = true;
|
||||||
|
nvim.enable = true;
|
||||||
|
pandoc.enable = true;
|
||||||
|
photography.enable = true;
|
||||||
|
secrets.enable = true;
|
||||||
shell = {
|
shell = {
|
||||||
enable = true;
|
enable = true;
|
||||||
bash.aliases.lang-js = true;
|
bash.aliases.lang-js = true;
|
||||||
bash.addBinToPath = true;
|
bash.addBinToPath = true;
|
||||||
};
|
};
|
||||||
anki.enable = true;
|
|
||||||
k8s.k9s.enable = true;
|
|
||||||
secrets.enable = true;
|
|
||||||
taskwarrior.enable = true;
|
|
||||||
audio.enable = true;
|
|
||||||
ssh.enable = true;
|
ssh.enable = true;
|
||||||
deploy.enable = true;
|
taskwarrior.enable = true;
|
||||||
music.enable = true;
|
|
||||||
terminal.enable = true;
|
terminal.enable = true;
|
||||||
devenv.enable = true;
|
|
||||||
keepassxc.enable = true;
|
|
||||||
direnv.enable = true;
|
|
||||||
nvim.enable = true;
|
|
||||||
pandoc.enable = true;
|
|
||||||
photography.enable = true;
|
|
||||||
torrenting.enable = true;
|
torrenting.enable = true;
|
||||||
my.yubikey.enable = true;
|
my.yubikey.enable = true;
|
||||||
zk.enable = true;
|
zk.enable = true;
|
||||||
|
|||||||
@@ -70,7 +70,10 @@
|
|||||||
music.enable = true;
|
music.enable = true;
|
||||||
my.dconf.enable = true;
|
my.dconf.enable = true;
|
||||||
my.stylix.enable = true;
|
my.stylix.enable = true;
|
||||||
nvim.enable = true;
|
nvim = {
|
||||||
|
enable = true;
|
||||||
|
colorscheme = "vscode";
|
||||||
|
};
|
||||||
pandoc.enable = true;
|
pandoc.enable = true;
|
||||||
shell.enable = true;
|
shell.enable = true;
|
||||||
taskwarrior.enable = true;
|
taskwarrior.enable = true;
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ in
|
|||||||
kubectl
|
kubectl
|
||||||
kubernetes
|
kubernetes
|
||||||
kustomize
|
kustomize
|
||||||
minikube
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.kubecolor = {
|
programs.kubecolor = {
|
||||||
|
|||||||
@@ -1,15 +1,28 @@
|
|||||||
{
|
{
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
themes = import "${inputs.nvim}/themes.nix" pkgs;
|
||||||
|
plugins = themes.${config.nvim.colorscheme};
|
||||||
|
in
|
||||||
{
|
{
|
||||||
options.nvim.enable = lib.mkEnableOption "nvim";
|
imports = [ inputs.nvim.homeModules.default ];
|
||||||
|
|
||||||
|
options.nvim.colorscheme = lib.mkOption {
|
||||||
|
type = lib.types.enum (lib.attrNames themes);
|
||||||
|
default = "zenwritten";
|
||||||
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.nvim.enable {
|
config = lib.mkIf config.nvim.enable {
|
||||||
|
nvim.packageDefinitions.merge.nvim = _: {
|
||||||
|
categories.colorscheme = config.nvim.colorscheme;
|
||||||
|
};
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
@@ -19,10 +32,15 @@
|
|||||||
PAGER = "nvimpager";
|
PAGER = "nvimpager";
|
||||||
MANWIDTH = "80";
|
MANWIDTH = "80";
|
||||||
};
|
};
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [ nvimpager ];
|
||||||
inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
|
|
||||||
nvimpager
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
xdg.configFile."nvimpager/init.lua".text = ''
|
||||||
|
vim.opt.clipboard = "unnamedplus"
|
||||||
|
vim.opt.background = "dark"
|
||||||
|
vim.g.zenwritten_compat = 1
|
||||||
|
${lib.concatMapStringsSep "\n" (plugin: ''vim.opt.runtimepath:append("${plugin}")'') plugins}
|
||||||
|
vim.cmd.colorscheme("${config.nvim.colorscheme}")
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,5 +24,6 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
home.file.".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
|
home.file.".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
|
||||||
|
home.file.".local/share/kitty-scrollback.nvim".source = pkgs.vimPlugins.kitty-scrollback-nvim;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,13 @@ in
|
|||||||
useDHCP = lib.mkDefault true;
|
useDHCP = lib.mkDefault true;
|
||||||
};
|
};
|
||||||
nvidia.enable = true;
|
nvidia.enable = true;
|
||||||
restic-backup.enable = true;
|
restic-backup = {
|
||||||
|
enable = true;
|
||||||
|
paths = [
|
||||||
|
"/home"
|
||||||
|
"/data"
|
||||||
|
];
|
||||||
|
};
|
||||||
secrets = {
|
secrets = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nixSigningKey.enable = true;
|
nixSigningKey.enable = true;
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ in
|
|||||||
dbus.enable = true;
|
dbus.enable = true;
|
||||||
displayManager.ly = lib.mkIf cfg.ly.enable {
|
displayManager.ly = lib.mkIf cfg.ly.enable {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
settings.session_log = ".local/state/ly-session.log";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user