This commit is contained in:
2026-06-16 18:13:56 +02:00
parent ef0aef2178
commit 49b7373ce1
44 changed files with 648 additions and 506 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs, ...}:
{ pkgs, ... }:
{
home.packages = [

View File

@@ -6,7 +6,7 @@
enableZshIntegration = true;
nix-direnv.enable = true;
};
home.file.".config/direnv/direnvrc" = {
source = ./direnv/direnvrc;
};

View File

@@ -12,25 +12,28 @@
policies = {
# From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
ExtensionSettings = with builtins;
let extension = shortId: uuid: {
name = uuid;
value = {
install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
installation_mode = "normal_installed";
ExtensionSettings =
with builtins;
let
extension = shortId: uuid: {
name = uuid;
value = {
install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
installation_mode = "normal_installed";
};
};
};
in listToAttrs [
in
listToAttrs [
(extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
(extension "ublock-origin" "uBlock0@raymondhill.net")
(extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack")
(extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack")
];
# To add additional extensions, find it on addons.mozilla.org, find
# the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
# Then, download the XPI by filling it in to the install_url template, unzip it,
# run `jq .browser_specific_settings.gecko.id manifest.json` or
# `jq .applications.gecko.id manifest.json` to get the UUID
# To add additional extensions, find it on addons.mozilla.org, find
# the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
# Then, download the XPI by filling it in to the install_url template, unzip it,
# run `jq .browser_specific_settings.gecko.id manifest.json` or
# `jq .applications.gecko.id manifest.json` to get the UUID
};
};
}

View File

@@ -1,4 +1,9 @@
{ lib, pkgsUnstable, config, ... }:
{
lib,
pkgsUnstable,
config,
...
}:
{
options.home.git = {

View File

@@ -30,132 +30,132 @@
];
initLua = ''
vim.cmd("colorscheme catppuccin-mocha")
-- Basic settings
vim.o.number = true
vim.o.relativenumber = true
vim.cmd("colorscheme catppuccin-mocha")
-- Basic settings
vim.o.number = true
vim.o.relativenumber = true
-- =========================
-- LSP (Neovim 0.11+ way)
-- =========================
-- =========================
-- LSP (Neovim 0.11+ way)
-- =========================
-- Add cmp capabilities
local capabilities = require("cmp_nvim_lsp").default_capabilities()
-- Add cmp capabilities
local capabilities = require("cmp_nvim_lsp").default_capabilities()
vim.lsp.config("nil_ls", {
capabilities = capabilities,
})
vim.lsp.config("nil_ls", {
capabilities = capabilities,
})
-- PHP LSP
vim.lsp.config("intelephense", {
capabilities = capabilities,
})
-- PHP LSP
vim.lsp.config("intelephense", {
capabilities = capabilities,
})
vim.lsp.enable("intelephense")
vim.lsp.enable("intelephense")
vim.lsp.enable("nil_ls")
vim.lsp.enable("nil_ls")
-- =========================
-- nvim-cmp
-- =========================
-- =========================
-- nvim-cmp
-- =========================
local cmp = require("cmp")
local cmp = require("cmp")
cmp.setup({
mapping = cmp.mapping.preset.insert({
["<C-Space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm({ select = true }),
}),
sources = {
{ name = "nvim_lsp" },
{ name = "buffer" },
{ name = "path" },
cmp.setup({
mapping = cmp.mapping.preset.insert({
["<C-Space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm({ select = true }),
}),
sources = {
{ name = "nvim_lsp" },
{ name = "buffer" },
{ name = "path" },
}
})
-- =========================
-- Telescope
-- =========================
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-- =========================
-- Lualine (status line with Git branch)
-- =========================
require('lualine').setup {
options = {
theme = 'catppuccin', -- match your colorscheme
section_separators = {'', ''},
component_separators = {'', ''},
},
sections = {
lualine_a = {'mode'},
lualine_b = {'branch'}, -- shows Git branch here
lualine_c = {'filename'},
lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
}
}
-- =========================
-- image-nvim
-- =========================
require("image").setup({
backend = "ueberzug", -- or "ueberzug" or "sixel"
processor = "magick_cli", -- or "magick_rock"
integrations = {
markdown = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
only_render_image_at_cursor_mode = "popup", -- or "inline"
floating_windows = false, -- if true, images will be rendered in floating markdown windows
filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
},
asciidoc = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
only_render_image_at_cursor_mode = "popup",
floating_windows = false,
filetypes = { "asciidoc", "adoc" },
},
neorg = {
enabled = true,
filetypes = { "norg" },
},
rst = {
enabled = true,
},
typst = {
enabled = true,
filetypes = { "typst" },
},
html = {
enabled = false,
},
css = {
enabled = false,
},
},
max_width = nil,
max_height = nil,
max_width_window_percentage = nil,
max_height_window_percentage = 50,
scale_factor = 1.0,
window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
})
-- =========================
-- Telescope
-- =========================
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-- =========================
-- Lualine (status line with Git branch)
-- =========================
require('lualine').setup {
options = {
theme = 'catppuccin', -- match your colorscheme
section_separators = {'', ''},
component_separators = {'', ''},
},
sections = {
lualine_a = {'mode'},
lualine_b = {'branch'}, -- shows Git branch here
lualine_c = {'filename'},
lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
}
}
-- =========================
-- image-nvim
-- =========================
require("image").setup({
backend = "ueberzug", -- or "ueberzug" or "sixel"
processor = "magick_cli", -- or "magick_rock"
integrations = {
markdown = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
only_render_image_at_cursor_mode = "popup", -- or "inline"
floating_windows = false, -- if true, images will be rendered in floating markdown windows
filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
},
asciidoc = {
enabled = true,
clear_in_insert_mode = false,
download_remote_images = true,
only_render_image_at_cursor = false,
only_render_image_at_cursor_mode = "popup",
floating_windows = false,
filetypes = { "asciidoc", "adoc" },
},
neorg = {
enabled = true,
filetypes = { "norg" },
},
rst = {
enabled = true,
},
typst = {
enabled = true,
filetypes = { "typst" },
},
html = {
enabled = false,
},
css = {
enabled = false,
},
},
max_width = nil,
max_height = nil,
max_width_window_percentage = nil,
max_height_window_percentage = 50,
scale_factor = 1.0,
window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
})
'';
};
}

View File

@@ -1,8 +1,7 @@
{ pkgs, ... }:
{ pkgs, ... }:
{
home.packages = with pkgs; [
ripgrep
];
}

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }:
{
programs.tmux = {
programs.tmux = {
enable = true;
mouse = true;
};

View File

@@ -9,7 +9,7 @@
ms-dotnettools.csharp
ms-dotnettools.csdevkit
ms-dotnettools.vscode-dotnet-runtime
mkhl.direnv # Direnv integration for VSCode
mkhl.direnv # Direnv integration for VSCode
catppuccin.catppuccin-vsc
bmewburn.vscode-intelephense-client
continue.continue

View File

@@ -1,8 +1,7 @@
{ pkgs, ... }:
{
home.file.".zsh/fastfetch.jsonc".source =
./fastfetch/config.jsonc;
home.file.".zsh/fastfetch.jsonc".source = ./fastfetch/config.jsonc;
programs.zsh = {
enable = true;