Compare commits

...

16 Commits

Author SHA1 Message Date
Armel van Ravels
3631f7887e Add image support to nvim 2026-03-16 10:47:45 +01:00
a7898aadcb Add ripgrep and drop annoying postman 2026-03-13 13:27:49 +01:00
Armel van Ravels
19184a2fe1 Update flake.lock 2026-03-12 08:58:37 +01:00
17040c195e Merge pull request 'Add postman' (#41) from feature/postman into master
Reviewed-on: #41
2026-03-09 14:29:51 +01:00
Armel van Ravels
56f668131a Add postman 2026-03-09 14:28:41 +01:00
da33f01ee8 Remove zsh banner as it is annoying 2026-02-11 22:36:07 +01:00
bf310bf40d Enable intelephense 2026-02-11 22:33:58 +01:00
a4868a8ab8 Add lualine with git branch 2026-02-11 14:17:10 +01:00
95ceb82f0f Add neo-tree to nvim 2026-02-11 13:21:13 +01:00
808e150bc6 Merge pull request 'Add nvim' (#33) from feature/neovim into master
Reviewed-on: #33
2026-02-11 12:22:32 +01:00
f440300cea Add nvim 2026-02-11 12:21:51 +01:00
0d7a1b06e8 Add file browser 2026-02-11 10:22:06 +01:00
eaf7043af3 Merge pull request 'master > home' (#35) from master into home
Reviewed-on: #35
2026-02-07 11:39:18 +01:00
29fc5d439a Merge pull request 'Add libre office' (#34) from feature/libreoffice into master
Reviewed-on: #34
2026-02-07 11:38:52 +01:00
5079c03620 Add libre office 2026-02-07 11:38:04 +01:00
c7a7277b15 Set home e-mail address 2026-02-05 20:32:41 +01:00
9 changed files with 193 additions and 15 deletions

12
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767910483, "lastModified": 1773264488,
"narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", "narHash": "sha256-rK0507bDuWBrZo+0zts9bCs/+RRUEHuvFE5DHWPxX/Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", "rev": "5c0f63f8d55040a7eed69df7e3fcdd15dfb5a04c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1767799921, "lastModified": 1773068389,
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -16,6 +16,9 @@
./programs/firefox.nix ./programs/firefox.nix
./programs/tmux.nix ./programs/tmux.nix
./programs/git.nix ./programs/git.nix
./programs/libreoffice.nix
./programs/nvim.nix
./programs/ripgrep.nix
./wm/rofi.nix ./wm/rofi.nix
./wm/cursor.nix ./wm/cursor.nix
./wm/dconf.nix ./wm/dconf.nix

View File

@@ -5,7 +5,7 @@
enable = true; enable = true;
settings.user = { settings.user = {
name = "Armel van Ravels"; name = "Armel van Ravels";
email = "armel@localhost"; email = "armel@armel.nl";
}; };
}; };
} }

11
programs/libreoffice.nix Normal file
View File

@@ -0,0 +1,11 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
libreoffice
hunspell
hunspellDicts.en_US
hunspellDicts.nl_NL
];
}

158
programs/nvim.nix Normal file
View File

@@ -0,0 +1,158 @@
{ pkgs, ... }:
{
programs.neovim = {
enable = true;
extraLuaPackages = ps: [ ps.magick ];
extraPackages = [
pkgs.ueberzugpp
pkgs.imagemagick
];
plugins = with pkgs.vimPlugins; [
neo-tree-nvim
catppuccin-nvim
tokyonight-nvim
nvim-lspconfig
nvim-cmp
cmp-nvim-lsp
cmp-buffer
cmp-path
plenary-nvim
telescope-nvim
(nvim-treesitter.withAllGrammars)
vim-nix
lualine-nvim
image-nvim
];
extraLuaConfig = ''
vim.cmd("colorscheme catppuccin-mocha")
-- Basic settings
vim.o.number = true
vim.o.relativenumber = true
-- =========================
-- LSP (Neovim 0.11+ way)
-- =========================
-- Add cmp capabilities
local capabilities = require("cmp_nvim_lsp").default_capabilities()
vim.lsp.config("nil_ls", {
capabilities = capabilities,
})
-- PHP LSP
vim.lsp.config("intelephense", {
capabilities = capabilities,
})
vim.lsp.enable("intelephense")
vim.lsp.enable("nil_ls")
-- =========================
-- nvim-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" },
}
})
-- =========================
-- 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
})
'';
};
}

8
programs/ripgrep.nix Normal file
View File

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

View File

@@ -14,14 +14,6 @@
initContent = '' initContent = ''
# Use kitty's ssh helper if running inside kitty # Use kitty's ssh helper if running inside kitty
[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh" [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
[[ $- != *i* ]] && return
# Run fastfetch
if command -v fastfetch >/dev/null 2>&1; then
fastfetch --logo none --config ~/.zsh/fastfetch.jsonc
fi
''; '';
}; };
} }

View File

@@ -23,6 +23,7 @@
"$terminal" = "kitty"; "$terminal" = "kitty";
"$menu" = "rofi -show drun"; "$menu" = "rofi -show drun";
"$bluetoothMenu" = "bzmenu --launcher rofi"; "$bluetoothMenu" = "bzmenu --launcher rofi";
"$files" = "rofi -show filebrowser";
### BASIC LAYOUT ### BASIC LAYOUT
general = { general = {
@@ -77,6 +78,7 @@
"$mod, RETURN, exec, $terminal" "$mod, RETURN, exec, $terminal"
"$mod, D, exec, $menu" "$mod, D, exec, $menu"
"$mod, B, exec, $bluetoothMenu" "$mod, B, exec, $bluetoothMenu"
"$mod, G, exec, $files"
"$mod, Q, killactive" "$mod, Q, killactive"
"$mod, F, fullscreen" "$mod, F, fullscreen"
"$mod, M, exit" "$mod, M, exit"

View File

@@ -1,6 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = [
pkgs.rofi-file-browser
];
programs.rofi = { programs.rofi = {
enable = true; enable = true;
theme = "material"; theme = "material";