Compare commits
26 Commits
b1c55cd56d
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3631f7887e | ||
| a7898aadcb | |||
|
|
19184a2fe1 | ||
| 17040c195e | |||
|
|
56f668131a | ||
| da33f01ee8 | |||
| bf310bf40d | |||
| a4868a8ab8 | |||
| 95ceb82f0f | |||
| 808e150bc6 | |||
| f440300cea | |||
| 0d7a1b06e8 | |||
| eaf7043af3 | |||
| 29fc5d439a | |||
| 5079c03620 | |||
| c7a7277b15 | |||
|
|
9a01791c95 | ||
|
|
eb1c9e9fb4 | ||
| bc9dfc098e | |||
| fd5e8f39da | |||
| 5eba1e82d2 | |||
| 7ca09caddd | |||
| 1577f066b2 | |||
| 1a5b256f23 | |||
| 4385000181 | |||
| 2cad286227 |
12
flake.lock
generated
12
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767910483,
|
||||
"narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
|
||||
"lastModified": 1773264488,
|
||||
"narHash": "sha256-rK0507bDuWBrZo+0zts9bCs/+RRUEHuvFE5DHWPxX/Q=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
|
||||
"rev": "5c0f63f8d55040a7eed69df7e3fcdd15dfb5a04c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -23,11 +23,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1767799921,
|
||||
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
|
||||
"lastModified": 1773068389,
|
||||
"narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
|
||||
"rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
4
home.nix
4
home.nix
@@ -15,6 +15,10 @@
|
||||
./programs/direnv.nix
|
||||
./programs/firefox.nix
|
||||
./programs/tmux.nix
|
||||
./programs/git.nix
|
||||
./programs/libreoffice.nix
|
||||
./programs/nvim.nix
|
||||
./programs/ripgrep.nix
|
||||
./wm/rofi.nix
|
||||
./wm/cursor.nix
|
||||
./wm/dconf.nix
|
||||
|
||||
12
programs/fastfetch/config.jsonc
Normal file
12
programs/fastfetch/config.jsonc
Normal file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/master/doc/json_schema.json",
|
||||
"modules": [
|
||||
"os",
|
||||
"uptime",
|
||||
"cpu",
|
||||
"gpu",
|
||||
"memory",
|
||||
"swap",
|
||||
"disk",
|
||||
]
|
||||
}
|
||||
11
programs/git.nix
Normal file
11
programs/git.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{ pkgs, ... } :
|
||||
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user = {
|
||||
name = "Armel van Ravels";
|
||||
email = "armel@armel.nl";
|
||||
};
|
||||
};
|
||||
}
|
||||
11
programs/libreoffice.nix
Normal file
11
programs/libreoffice.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
libreoffice
|
||||
|
||||
hunspell
|
||||
hunspellDicts.en_US
|
||||
hunspellDicts.nl_NL
|
||||
];
|
||||
}
|
||||
158
programs/nvim.nix
Normal file
158
programs/nvim.nix
Normal 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
8
programs/ripgrep.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
ripgrep
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.file.".zsh/fastfetch.jsonc".source =
|
||||
./fastfetch/config.jsonc;
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
oh-my-zsh = {
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
hyprshot
|
||||
hyprlock
|
||||
playerctl
|
||||
speedcrunch
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
@@ -22,6 +23,7 @@
|
||||
"$terminal" = "kitty";
|
||||
"$menu" = "rofi -show drun";
|
||||
"$bluetoothMenu" = "bzmenu --launcher rofi";
|
||||
"$files" = "rofi -show filebrowser";
|
||||
|
||||
### BASIC LAYOUT
|
||||
general = {
|
||||
@@ -76,11 +78,15 @@
|
||||
"$mod, RETURN, exec, $terminal"
|
||||
"$mod, D, exec, $menu"
|
||||
"$mod, B, exec, $bluetoothMenu"
|
||||
"$mod, G, exec, $files"
|
||||
"$mod, Q, killactive"
|
||||
"$mod, F, fullscreen"
|
||||
"$mod, M, exit"
|
||||
"$mod, L, exec, hyprlock"
|
||||
|
||||
# show/hide waybar
|
||||
"$mod, W, exec, pkill -SIGUSR1 -f '^waybar$'"
|
||||
|
||||
# Focus
|
||||
"$mod, LEFT, movefocus, l"
|
||||
"$mod, RIGHT, movefocus, r"
|
||||
@@ -124,6 +130,8 @@
|
||||
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
", XF86AudioNext, exec, playerctl next"
|
||||
", XF86AudioPrev, exec, playerctl previous"
|
||||
|
||||
", XF86Calculator, exec, speedcrunch"
|
||||
];
|
||||
|
||||
bindm = [
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = [
|
||||
pkgs.rofi-file-browser
|
||||
];
|
||||
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
theme = "material";
|
||||
|
||||
Reference in New Issue
Block a user