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

4
home/default.nix
View File

@@ -1,6 +1,10 @@
{ pkgs, ... }:
{
imports = [
./services
];
home = {
username = "elias";
homeDirectory = "/home/elias";

47
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";
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 @@
];
};
}

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

@@ -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";
};
}
];

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

@@ -105,66 +105,66 @@
};
};
mappings = {
MkdnEnter = {
key = "<CR>";
modes = [
MkdnEnter = [
[
"n"
"v"
"i"
]
"<CR>"
];
};
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 = [
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 = {
use_template = true;

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

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

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

@@ -15,17 +15,20 @@
source = ./src;
};
wayland.windowManager.river = let
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 {
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";
@@ -33,11 +36,11 @@
};
systemd.enable = true;
xwayland.enable = true;
extraConfig = ''rivertile -view-padding 0 -outer-padding 0 &'';
extraConfig = "rivertile -view-padding 0 -outer-padding 0 &";
settings = {
spawn = [
"/home/elias/.config/helperscripts/startEww.sh"
"nextcloud"
# "nextcloud"
];
spawn-tagmask = "${all_but_scratch_tag}";
keyboard-layout = "de";
@@ -45,7 +48,11 @@
rule-add = {
"-app-id" = {
"'bar'" = "csd";
"'float*'" = { "-title" = { "'foo'" = "float"; }; };
"'float*'" = {
"-title" = {
"'foo'" = "float";
};
};
};
};
map-pointer = {
@@ -64,12 +71,18 @@
"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
"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";
@@ -121,13 +134,11 @@
"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}");
}
// 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}");
};
};
};

4
home/services/default.nix
View File

@@ -2,8 +2,8 @@
{
imports = [
./ssh-agent
./gpg-agent
./ssh-agent.nix
./gpg-agent.nix
./hypridle.nix
./nextcloud.nix
];

58
home/services/gpg-agent.nix
View File

@@ -1,18 +1,64 @@
{ pkgs, ... }:
# See https://github.com/nix-community/home-manager/issues/3095
let
pinentryRofi = pkgs.writeShellApplication {
name = "pinentry-rofi-with-env";
text = ''
PATH="$PATH:${pkgs.coreutils}/bin:${pkgs.rofi}/bin"
"${pkgs.pinentry-rofi}/bin/pinentry-rofi" "$@"
'';
};
in
{
home.packages = with pkgs; [ pinentry-rofi pinentry-gnome3 ];
home.packages = with pkgs; [
pinentry-rofi
pinentry-gnome3
];
programs.gpg = {
enable = true;
scdaemonSettings = {
disable-ccid = true;
};
settings = {
personal-cipher-preferences = "AES256 AES192 AES";
personal-digest-preferences = "SHA512 SHA384 SHA256";
personal-compress-preferences = "ZLIB BZIP2 ZIP Uncompressed";
default-preference-list = "SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed";
cert-digest-algo = "SHA512";
s2k-digest-algo = "SHA512";
s2k-cipher-algo = "AES256";
charset = "utf-8";
no-comments = true;
no-emit-version = true;
no-greeting = true;
keyid-format = "0xlong";
list-options = "show-uid-validity";
verify-options = "show-uid-validity";
with-fingerprint = true;
require-cross-certification = true;
no-symkey-cache = true;
armor = true;
use-agent = true;
throw-keyids = true;
keyserver = "hkps://keyserver.ubuntu.com:443";
};
};
programs.gpg.enable = true;
services.gpg-agent = {
enable = true;
pinentryPackage = pkgs.pinentry-gnome3;
enableZshIntegration = true;
defaultCacheTtl = 7200; # 2h
maxCacheTtl = 28800; # 8h
enableNushellIntegration = true;
defaultCacheTtl = 60;
maxCacheTtl = 120;
enableSshSupport = true;
sshKeys = [ "8E42E6C65D5F9894CFFF294851AB0CEB5F0B1FAA" ];
pinentry.package = pkgs.pinentry-gnome3;
# under extraConfig
# pinentry-program ${pinentryRofi}/bin/pinentry-rofi-with-env
extraConfig = ''
ttyname $GPG_TTY
'';
};
}

17
home/services/nextcloud.nix
View File

@@ -1,17 +1,8 @@
{ pkgs, ... }:
{ ... }:
{
systemd.user.services.nextcloud = {
description = "Nextcloud Desktop Client";
after = [ "graphical-session.target" ]; # started nach der grafischen Sitzung
serviceConfig = {
ExecStart = "${pkgs.nextcloud}/bin/nextcloud";
Restart = "on-failure";
Environment = ''
MOZ_ENABLE_WAYLAND=1
GDK_BACKEND=wayland
'';
};
wantedBy = [ "default.target" ];
services.nextcloud-client = {
enable = true;
startInBackground = true;
};
}