4Lost/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixvim cleanup & fix gpg

Browse Source
This commit is contained in:
Elias Schröter
2026-02-27 14:58:29 +01:00
parent ce176d0022
commit 454ec27541
12 changed files with 297 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
home/programs/git.nix
View File

@@ -1,15 +1,52 @@
{ ... }:
{ lib, pkgs, ... }:
{
home.packages = with pkgs; [
nodejs_22
cz-cli
tig
];
programs.git = {
enable = true;
settings.user = {
name = "4Lost";
email = "elias.schroeter@e.email";
settings = {
init = {
defaultBranch = "main";
};
user = {
email = "elias.schroeter@e.email";
name = "Elias Schröter";
};
};
signing = {
key = "0x99D2EF975FE523CC";
signByDefault = false;
key = "04F3A2ED4B33F254";
format = lib.mkForce "openpgp";
signByDefault = true;
};
};
programs.lazygit = {
enable = true;
# https://github.com/catppuccin/lazygit
settings = {
gui = {
theme = {
activeBorderColor = [
"#f4dbd6"
"bold"
];
inactiveBorderColor = [ "#a5adcb" ];
optionsTextColor = [ "#8aadf4" ];
selectedLineBgColor = [ "#363a4f" ];
cherryPickedCommitBgColor = [ "#494d64" ];
cherryPickedCommitFgColor = [ "#f4dbd6" ];
unstagedChangesColor = [ "#ed8796" ];
defaultFgColor = [ "#cad3f5" ];
searchingActiveBorderColor = [ "#eed49f" ];
};
authorColors = {
"*" = "#b7bdf8";
};
};
};
};
}

1
home/programs/nixvim/plugins/barbar.nix
View File

@@ -82,4 +82,3 @@
];
};
}

5
home/programs/nixvim/plugins/comment-box.nix
View File

@@ -1,4 +1,4 @@
{...}:
{ ... }:
{
programs.nixvim = {
@@ -9,7 +9,7 @@
which-key.settings.spec = [
{
__unkeyed-1 = "<leader>c";
group = "Boxes";
group = "Comment Boxes";
icon = "□ ";
}
];
@@ -53,4 +53,3 @@
];
};
}

4
home/programs/nixvim/plugins/default.nix
View File

@@ -30,6 +30,7 @@
./peek.nix
./markdown-preview.nix
./smart-splits.nix
./snippets.nix
./sniprun.nix
./startup.nix
./surround.nix
@@ -43,10 +44,9 @@
./typst-vim.nix
./undotree.nix
./vimtex.nix
./web-devicons.nix
./which-key.nix
./yanky.nix
./zk.nix
./snippets.nix
];
}

4
home/programs/nixvim/plugins/dynomark.nix
View File

@@ -19,7 +19,7 @@ in
dynomark-nvim
];
extraConfigLua = ''require('dynomark').setup({})'';
extraConfigLua = "require('dynomark').setup({})";
keymaps = [
{
@@ -35,7 +35,7 @@ in
action = "<Plug>(DynomarkRun)";
mode = [ "n" ];
options = {
desc = "Run dynomark query under cursor";
desc = "Run Dynomark query under cursor";
};
}
];

108
home/programs/nixvim/plugins/mkdnflow.nix
View File

@@ -105,65 +105,65 @@
};
};
mappings = {
MkdnEnter = {
key = "<CR>";
modes = [
MkdnEnter = [
[
"n"
"v"
"i"
];
};
MkdnGoBack = {
key = "<BS>";
modes = "n";
};
MkdnDecreaseHeading = {
key = "-";
modes = "n";
};
MkdnIncreaseHeading = {
key = "+";
modes = "n";
};
MkdnNewListItemAboveInsert = {
key = "O";
modes = "n";
};
MkdnNewListItemBelowInsert = {
key = "o";
modes = "n";
};
MkdnTableNewColAfter = {
key = "<leader>ic";
modes = "n";
};
MkdnTableNewColBefore = {
key = "<leader>iC";
modes = "n";
};
MkdnTableNewRowAbove = {
key = "<leader>iR";
modes = "n";
};
MkdnTableNewRowBelow = {
key = "<leader>ir";
modes = "n";
};
MkdnTableNextCell = {
key = "<Tab>";
modes = "i";
};
MkdnTablePrevCell = {
key = "<S-Tab>";
modes = "i";
};
MkdnToggleToDo = {
key = "<C-Space>";
modes = [
]
"<CR>"
];
MkdnGoBack = [
"n"
"<BS>"
];
MkdnDecreaseHeading = [
"n"
"-"
];
MkdnIncreaseHeading = [
"n"
"+"
];
MkdnNewListItemAboveInsert = [
"n"
"O"
];
MkdnNewListItemBelowInsert = [
"n"
"o"
];
MkdnTableNewColAfter = [
"n"
"<leader>ic"
];
MkdnTableNewColBefore = [
"n"
"<leader>iC"
];
MkdnTableNewRowAbove = [
"n"
"<leader>iR"
];
MkdnTableNewRowBelow = [
"n"
"<leader>ir"
];
MkdnTableNextCell = [
"i"
"<Tab>"
];
MkdnTablePrevCell = [
"i"
"<S-Tab>"
];
MkdnToggleToDo = [
[
"n"
"v"
];
};
]
"<C-Space>"
];
};
create_dirs = true;
new_file_template = {

9
home/programs/nixvim/plugins/web-devicons.nix Normal file
View File

@@ -0,0 +1,9 @@
{ ... }:
{
programs.nixvim = {
plugins = {
web-devicons.enable = true;
};
};
}

235
home/programs/river/default.nix
View File

@@ -15,120 +15,131 @@
source = ./src;
};
wayland.windowManager.river = let
all_tags = "$(((1 << 32) - 1))";
scratch_tag = "$((1 << 20 ))";
all_but_scratch_tag = "$(( ((1 << 32) - 1) ^ ${scratch_tag} ))";
tags = i: "$((1 << (${i} - 1)))";
wayland.windowManager.river =
let
all_tags = "$(((1 << 32) - 1))";
scratch_tag = "$((1 << 20 ))";
all_but_scratch_tag = "$(( ((1 << 32) - 1) ^ ${scratch_tag} ))";
tags = i: "$((1 << (${i} - 1)))";
genTagMappings = key: command:
lib.attrsets.mergeAttrsList
(map (i: { "${key (toString i)}" = "${command (toString i)}"; })
(lib.lists.range 1 9));
in {
enable = true;
extraSessionVariables = {
MOZ_ENABLE_WAYLAND = "1";
GDK_BACKEND = "wayland";
};
systemd.enable = true;
xwayland.enable = true;
extraConfig = ''rivertile -view-padding 0 -outer-padding 0 &'';
settings = {
spawn = [
"/home/elias/.config/helperscripts/startEww.sh"
"nextcloud"
];
spawn-tagmask = "${all_but_scratch_tag}";
keyboard-layout = "de";
default-layout = "rivertile";
rule-add = {
"-app-id" = {
"'bar'" = "csd";
"'float*'" = { "-title" = { "'foo'" = "float"; }; };
genTagMappings =
key: command:
lib.attrsets.mergeAttrsList (
map (i: { "${key (toString i)}" = "${command (toString i)}"; }) (lib.lists.range 1 9)
);
in
{
enable = true;
extraSessionVariables = {
MOZ_ENABLE_WAYLAND = "1";
GDK_BACKEND = "wayland";
};
systemd.enable = true;
xwayland.enable = true;
extraConfig = "rivertile -view-padding 0 -outer-padding 0 &";
settings = {
spawn = [
"/home/elias/.config/helperscripts/startEww.sh"
# "nextcloud"
];
spawn-tagmask = "${all_but_scratch_tag}";
keyboard-layout = "de";
default-layout = "rivertile";
rule-add = {
"-app-id" = {
"'bar'" = "csd";
"'float*'" = {
"-title" = {
"'foo'" = "float";
};
};
};
};
map-pointer = {
normal = {
"Super BTN_LEFT" = "move-view";
"Super BTN_RIGHT" = "resize-view";
"Super BTN_MIDDLE" = "toggle-float";
};
};
map = {
normal = {
"Super+Shift Return" = "spawn alacritty";
# Messages
"Control+Super W" = "spawn 'yad --text=\"Hello from Wayland!\" --button=OK'";
# System
"Super P" = "spawn 'rofi -show drun'";
"Super+Shift C" = "close";
# Screenshots
"None Print" =
"spawn 'grim ~/Pictures/screenshot_$(date +%F_%H-%M-%S).png; yad --text=\"Screenshot - Whole Screen to File (/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S))\"'"; # Whole Screen to File
"Super Print" =
"spawn 'grim -g \"$(slurp)\" ~/Pictures/screenshot_$(date +%F_%H-%M-%S).png; yad --text=\"Screenshot - Selection to File (/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S))\"'"; # Selection to File
"Shift Print" =
"spawn 'grim -g \"$(riverctl windows --focused | awk '{print $3,$4,$5,$6}')\" ~/Pictures/active_window_$(date +%F_%H-%M-%S).png; yad --text=\"Screenshot - Active Window to File (/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S))\"'"; # Active Window to File
"Control Print" =
"spawn 'grim -g \"$(slurp)\" - | wl-copy --type image/png; yad --text=\"Screenshot - Whole Screen to Clipboard\"'"; # Whole Screen to Clipboard
"Control+Super Print" =
"spawn 'grim -g \"$(slurp)\" - | wl-copy --type image/png; yad --text=\"Screenshot - Selection to Clipboard\"'"; # Selection to Clipboard
"Control+Shift Print" =
"spawn 'grim -g \"$(riverctl windows --focused | awk '{print $3,$4,$5,$6}')\" - | wl-copy --type image/png; yad --text=\"Screenshot - Active Window to Clipboard\"'"; # Active Window to Clipboard
# Window Control
"Super J" = "focus-view next";
"Super K" = "focus-view previous";
"Super+Shift J" = "swap next";
"Super+Shift K" = "swap previous";
"Super Period" = "focus-output next";
"Super Comma" = "focus-output previous";
"Super+Shift Period" = "send-to-output next";
"Super+Shift Comma" = "send-to-output previous";
"Super H" = ''send-layout-cmd rivertile "main-ratio -0.05"'';
"Super L" = ''send-layout-cmd rivertile "main-ratio +0.05"'';
"Super+Shift H" = ''send-layout-cmd rivertile "main-count +1"'';
"Super+Shift L" = ''send-layout-cmd rivertile "main-count -1"'';
"Super+Alt H" = "move left 100";
"Super+Alt J" = "move down 100";
"Super+Alt K" = "move up 100";
"Super+Alt L" = "move right 100";
"Super+Alt+Control H" = "snap left";
"Super+Alt+Control J" = "snap down";
"Super+Alt+Control K" = "snap up";
"Super+Alt+Control L" = "snap right";
"Super+Alt+Shift H" = "resize horizontal -100";
"Super+Alt+Shift J" = "resize vertical 100";
"Super+Alt+Shift K" = "resize vertical -100";
"Super+Alt+Shift L" = "resize horizontal 100";
"Super+Shift P" = "set-view-tags ${scratch_tag}";
"Super 0" = "set-focused-tags ${all_tags}";
"Super+Shift 0" = "set-view-tags ${all_tags}";
"Super Space" = "toggle-float";
"Super F" = "toggle-fullscreen";
"Super Up" = ''send-layout-cmd rivertile "main-location top"'';
"Super Right" = ''send-layout-cmd rivertile "main-location right"'';
"Super Down" = ''send-layout-cmd rivertile "main-location bottom"'';
"Super Left" = ''send-layout-cmd rivertile "main-location left"'';
# Audio
"None XF86AudioRaiseVolume" = "spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+'";
"None XF86AudioLowerVolume" = "spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-'";
"None XF86AudioMute" = "spawn 'wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle'";
"None XF86AudioMicMute" = "spawn 'wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle'";
# Brightness
"None XF86MonBrightnessUp" = "spawn 'xbacklight -inc 10'";
"None XF86MonBrightnessDown" = "spawn 'xbacklight -dec 10'";
# Powerbutton
"None XF86PowerOff" = "spawn '/home/$USER/.config/eww/scripts/powermenu.sh'";
# Program
"Super C" = "spawn 'firefox'";
"Super Y" = "spawn 'signal-desktop'";
"Super X" = "spawn 'telegram-desktop'";
"Super V" = "spawn 'thunderbird'";
}
// genTagMappings (i: "Super ${i}") (i: "set-focused-tags ${tags i}")
// genTagMappings (i: "Super+Shift ${i}") (i: "set-view-tags ${tags i}")
// genTagMappings (i: "Super+Control ${i}") (i: "toggle-focused-tags ${tags i}")
// genTagMappings (i: "Super+Shift+Control ${i}") (i: "toggle-view-tags ${tags i}");
};
};
map-pointer = {
normal = {
"Super BTN_LEFT" = "move-view";
"Super BTN_RIGHT" = "resize-view";
"Super BTN_MIDDLE" = "toggle-float";
};
};
map = {
normal = {
"Super+Shift Return" = "spawn alacritty";
# Messages
"Control+Super W" = "spawn 'yad --text=\"Hello from Wayland!\" --button=OK'";
# System
"Super P" = "spawn 'rofi -show drun'";
"Super+Shift C" = "close";
# Screenshots
"None Print" = "spawn 'grim ~/Pictures/screenshot_$(date +%F_%H-%M-%S).png; yad --text=\"Screenshot - Whole Screen to File (/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S))\"'"; # Whole Screen to File
"Super Print" = "spawn 'grim -g \"$(slurp)\" ~/Pictures/screenshot_$(date +%F_%H-%M-%S).png; yad --text=\"Screenshot - Selection to File (/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S))\"'"; # Selection to File
"Shift Print" = "spawn 'grim -g \"$(riverctl windows --focused | awk '{print $3,$4,$5,$6}')\" ~/Pictures/active_window_$(date +%F_%H-%M-%S).png; yad --text=\"Screenshot - Active Window to File (/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S))\"'"; # Active Window to File
"Control Print" = "spawn 'grim -g \"$(slurp)\" - | wl-copy --type image/png; yad --text=\"Screenshot - Whole Screen to Clipboard\"'"; # Whole Screen to Clipboard
"Control+Super Print" = "spawn 'grim -g \"$(slurp)\" - | wl-copy --type image/png; yad --text=\"Screenshot - Selection to Clipboard\"'"; # Selection to Clipboard
"Control+Shift Print" = "spawn 'grim -g \"$(riverctl windows --focused | awk '{print $3,$4,$5,$6}')\" - | wl-copy --type image/png; yad --text=\"Screenshot - Active Window to Clipboard\"'"; # Active Window to Clipboard
# Window Control
"Super J" = "focus-view next";
"Super K" = "focus-view previous";
"Super+Shift J" = "swap next";
"Super+Shift K" = "swap previous";
"Super Period" = "focus-output next";
"Super Comma" = "focus-output previous";
"Super+Shift Period" = "send-to-output next";
"Super+Shift Comma" = "send-to-output previous";
"Super H" = ''send-layout-cmd rivertile "main-ratio -0.05"'';
"Super L" = ''send-layout-cmd rivertile "main-ratio +0.05"'';
"Super+Shift H" = ''send-layout-cmd rivertile "main-count +1"'';
"Super+Shift L" = ''send-layout-cmd rivertile "main-count -1"'';
"Super+Alt H" = "move left 100";
"Super+Alt J" = "move down 100";
"Super+Alt K" = "move up 100";
"Super+Alt L" = "move right 100";
"Super+Alt+Control H" = "snap left";
"Super+Alt+Control J" = "snap down";
"Super+Alt+Control K" = "snap up";
"Super+Alt+Control L" = "snap right";
"Super+Alt+Shift H" = "resize horizontal -100";
"Super+Alt+Shift J" = "resize vertical 100";
"Super+Alt+Shift K" = "resize vertical -100";
"Super+Alt+Shift L" = "resize horizontal 100";
"Super+Shift P" = "set-view-tags ${scratch_tag}";
"Super 0" = "set-focused-tags ${all_tags}";
"Super+Shift 0" = "set-view-tags ${all_tags}";
"Super Space" = "toggle-float";
"Super F" = "toggle-fullscreen";
"Super Up" = ''send-layout-cmd rivertile "main-location top"'';
"Super Right" = ''send-layout-cmd rivertile "main-location right"'';
"Super Down" = ''send-layout-cmd rivertile "main-location bottom"'';
"Super Left" = ''send-layout-cmd rivertile "main-location left"'';
# Audio
"None XF86AudioRaiseVolume" = "spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+'";
"None XF86AudioLowerVolume" = "spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-'";
"None XF86AudioMute" = "spawn 'wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle'";
"None XF86AudioMicMute" = "spawn 'wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle'";
# Brightness
"None XF86MonBrightnessUp" = "spawn 'xbacklight -inc 10'";
"None XF86MonBrightnessDown" = "spawn 'xbacklight -dec 10'";
# Powerbutton
"None XF86PowerOff" = "spawn '/home/$USER/.config/eww/scripts/powermenu.sh'";
# Program
"Super C" = "spawn 'firefox'";
"Super Y" = "spawn 'signal-desktop'";
"Super X" = "spawn 'telegram-desktop'";
"Super V" = "spawn 'thunderbird'";
} // genTagMappings (i: "Super ${i}") (i: "set-focused-tags ${tags i}")
// genTagMappings (i: "Super+Shift ${i}")
(i: "set-view-tags ${tags i}")
// genTagMappings (i: "Super+Control ${i}")
(i: "toggle-focused-tags ${tags i}")
// genTagMappings (i: "Super+Shift+Control ${i}")
(i: "toggle-view-tags ${tags i}");
};
};
};
}