From 91b542184865e39ab17bd544c51dbd25b02ebf8e Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 10 Mar 2026 14:34:01 +0100 Subject: [PATCH 1/2] reorganization --- home/desktop-full.nix | 15 +++++++++++ home/{profiles => }/desktop-slim.nix | 15 +++++------ home/{profiles => }/minimal.nix | 26 +++++++------------ home/{ => modules}/aichat.nix | 0 home/{ => modules}/calendars.nix | 0 home/{ => modules}/devel.nix | 0 home/{ => modules}/firefox.nix | 0 home/{ => modules}/fish.nix | 0 home/{ => modules}/fonts.nix | 2 +- home/{ => modules}/foot.nix | 0 home/modules/git.nix | 12 +++++++++ home/{ => modules}/gnome.nix | 0 home/{ => modules}/gpg.nix | 0 home/{ => modules}/hyprland.nix | 0 home/{ => modules}/khard-dump.nix | 0 home/{ => modules}/mail/bindings.neomuttrc | 0 home/{ => modules}/mail/config.neomuttrc | 0 home/{ => modules}/mail/default.nix | 0 home/{ => modules}/media.nix | 0 home/{ => modules}/messaging.nix | 2 +- home/{ => modules}/nvim/config.vim | 0 home/{ => modules}/nvim/default.nix | 2 ++ .../nvim/dotfiles/after/ftplugin/markdown.vim | 0 .../nvim/dotfiles/autocommands.vim | 0 .../nvim/dotfiles/ftplugin/markdown.vim | 0 .../nvim/dotfiles/ftplugin/nix.vim | 0 .../nvim/dotfiles/ftplugin/r.vim | 0 .../nvim/dotfiles/ftplugin/rmd.vim | 0 .../nvim/dotfiles/ftplugin/tex.vim | 0 .../nvim/dotfiles/ftplugin/typescript.vim | 0 .../nvim/dotfiles/syntax/rmd.vim | 0 home/{ => modules}/nvim/lsp.lua | 0 home/{ => modules}/nvim/nvim-cmp.lua | 0 home/{ => modules}/office-cli.nix | 0 home/{ => modules}/office-gui.nix | 0 home/{ => modules}/password-store.nix | 0 home/{ => modules}/plasma.nix | 0 home/{ => modules}/r.nix | 0 home/{ => modules}/tasks.nix | 0 home/{ => modules}/tex.nix | 0 home/{ => modules}/tmux.nix | 0 home/{ => modules}/user-dirs.nix | 0 home/{ => modules}/vifm.nix | 0 home/npm.conf | 1 - home/profiles/desktop-full.nix | 15 ----------- home/profiles/on-server.nix | 8 ------ 46 files changed, 47 insertions(+), 51 deletions(-) create mode 100644 home/desktop-full.nix rename home/{profiles => }/desktop-slim.nix (59%) rename home/{profiles => }/minimal.nix (72%) rename home/{ => modules}/aichat.nix (100%) rename home/{ => modules}/calendars.nix (100%) rename home/{ => modules}/devel.nix (100%) rename home/{ => modules}/firefox.nix (100%) rename home/{ => modules}/fish.nix (100%) rename home/{ => modules}/fonts.nix (95%) rename home/{ => modules}/foot.nix (100%) create mode 100644 home/modules/git.nix rename home/{ => modules}/gnome.nix (100%) rename home/{ => modules}/gpg.nix (100%) rename home/{ => modules}/hyprland.nix (100%) rename home/{ => modules}/khard-dump.nix (100%) rename home/{ => modules}/mail/bindings.neomuttrc (100%) rename home/{ => modules}/mail/config.neomuttrc (100%) rename home/{ => modules}/mail/default.nix (100%) rename home/{ => modules}/media.nix (100%) rename home/{ => modules}/messaging.nix (81%) rename home/{ => modules}/nvim/config.vim (100%) rename home/{ => modules}/nvim/default.nix (99%) rename home/{ => modules}/nvim/dotfiles/after/ftplugin/markdown.vim (100%) rename home/{ => modules}/nvim/dotfiles/autocommands.vim (100%) rename home/{ => modules}/nvim/dotfiles/ftplugin/markdown.vim (100%) rename home/{ => modules}/nvim/dotfiles/ftplugin/nix.vim (100%) rename home/{ => modules}/nvim/dotfiles/ftplugin/r.vim (100%) rename home/{ => modules}/nvim/dotfiles/ftplugin/rmd.vim (100%) rename home/{ => modules}/nvim/dotfiles/ftplugin/tex.vim (100%) rename home/{ => modules}/nvim/dotfiles/ftplugin/typescript.vim (100%) rename home/{ => modules}/nvim/dotfiles/syntax/rmd.vim (100%) rename home/{ => modules}/nvim/lsp.lua (100%) rename home/{ => modules}/nvim/nvim-cmp.lua (100%) rename home/{ => modules}/office-cli.nix (100%) rename home/{ => modules}/office-gui.nix (100%) rename home/{ => modules}/password-store.nix (100%) rename home/{ => modules}/plasma.nix (100%) rename home/{ => modules}/r.nix (100%) rename home/{ => modules}/tasks.nix (100%) rename home/{ => modules}/tex.nix (100%) rename home/{ => modules}/tmux.nix (100%) rename home/{ => modules}/user-dirs.nix (100%) rename home/{ => modules}/vifm.nix (100%) delete mode 100644 home/npm.conf delete mode 100644 home/profiles/desktop-full.nix delete mode 100644 home/profiles/on-server.nix diff --git a/home/desktop-full.nix b/home/desktop-full.nix new file mode 100644 index 0000000..dfdf6bb --- /dev/null +++ b/home/desktop-full.nix @@ -0,0 +1,15 @@ +{ ... }: + +{ + imports = [ + ./desktop-slim.nix + + ./modules/messaging.nix + ./modules/r.nix + ./modules/tex.nix + ./modules/mail + ./modules/office-gui.nix + ./modules/office-cli.nix + ./modules/aichat.nix + ]; +} diff --git a/home/profiles/desktop-slim.nix b/home/desktop-slim.nix similarity index 59% rename from home/profiles/desktop-slim.nix rename to home/desktop-slim.nix index c2936c4..9979ab9 100644 --- a/home/profiles/desktop-slim.nix +++ b/home/desktop-slim.nix @@ -4,14 +4,13 @@ imports = [ ./minimal.nix - ../devel.nix - ../firefox.nix - ../fonts.nix - # ../foot.nix - ../media.nix - ../user-dirs.nix - ../gpg.nix - ../password-store.nix + ./modules/devel.nix + ./modules/firefox.nix + ./modules/fonts.nix + ./modules/media.nix + ./modules/user-dirs.nix + ./modules/gpg.nix + ./modules/password-store.nix ]; home.packages = with pkgs; [ diff --git a/home/profiles/minimal.nix b/home/minimal.nix similarity index 72% rename from home/profiles/minimal.nix rename to home/minimal.nix index d04876e..0f9547a 100644 --- a/home/profiles/minimal.nix +++ b/home/minimal.nix @@ -5,6 +5,14 @@ home.homeDirectory = "/home/${config.home.username}"; + imports = [ + ./modules/fish.nix + ./modules/vifm.nix + ./modules/nvim + ./modules/tmux.nix + ./modules/git.nix + ]; + home.packages = with pkgs; [ dust eza @@ -31,30 +39,14 @@ ymd = "date +'%Y-%m-%d'"; }; - imports = [ - ../fish.nix - ../vifm.nix - ../nvim - ../tmux.nix - ]; - programs.nix-index = { enable = true; enableFishIntegration = true; }; - programs.git = { - enable = true; - settings = { - pull.rebase = true; - extraConfig.init.defaultBranch = "main"; - }; - lfs.enable = true; - }; - programs.bottom = { enable = true; - settings.styles.theme = "default-light"; + # settings.styles.theme = "default-light"; }; home.stateVersion = "22.11"; diff --git a/home/aichat.nix b/home/modules/aichat.nix similarity index 100% rename from home/aichat.nix rename to home/modules/aichat.nix diff --git a/home/calendars.nix b/home/modules/calendars.nix similarity index 100% rename from home/calendars.nix rename to home/modules/calendars.nix diff --git a/home/devel.nix b/home/modules/devel.nix similarity index 100% rename from home/devel.nix rename to home/modules/devel.nix diff --git a/home/firefox.nix b/home/modules/firefox.nix similarity index 100% rename from home/firefox.nix rename to home/modules/firefox.nix diff --git a/home/fish.nix b/home/modules/fish.nix similarity index 100% rename from home/fish.nix rename to home/modules/fish.nix diff --git a/home/fonts.nix b/home/modules/fonts.nix similarity index 95% rename from home/fonts.nix rename to home/modules/fonts.nix index d8db3b7..23d9e4a 100644 --- a/home/fonts.nix +++ b/home/modules/fonts.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ diff --git a/home/foot.nix b/home/modules/foot.nix similarity index 100% rename from home/foot.nix rename to home/modules/foot.nix diff --git a/home/modules/git.nix b/home/modules/git.nix new file mode 100644 index 0000000..4119ab0 --- /dev/null +++ b/home/modules/git.nix @@ -0,0 +1,12 @@ +{...}: + +{ + programs.git = { + enable = true; + settings = { + pull.rebase = true; + extraConfig.init.defaultBranch = "main"; + }; + lfs.enable = true; + }; +} diff --git a/home/gnome.nix b/home/modules/gnome.nix similarity index 100% rename from home/gnome.nix rename to home/modules/gnome.nix diff --git a/home/gpg.nix b/home/modules/gpg.nix similarity index 100% rename from home/gpg.nix rename to home/modules/gpg.nix diff --git a/home/hyprland.nix b/home/modules/hyprland.nix similarity index 100% rename from home/hyprland.nix rename to home/modules/hyprland.nix diff --git a/home/khard-dump.nix b/home/modules/khard-dump.nix similarity index 100% rename from home/khard-dump.nix rename to home/modules/khard-dump.nix diff --git a/home/mail/bindings.neomuttrc b/home/modules/mail/bindings.neomuttrc similarity index 100% rename from home/mail/bindings.neomuttrc rename to home/modules/mail/bindings.neomuttrc diff --git a/home/mail/config.neomuttrc b/home/modules/mail/config.neomuttrc similarity index 100% rename from home/mail/config.neomuttrc rename to home/modules/mail/config.neomuttrc diff --git a/home/mail/default.nix b/home/modules/mail/default.nix similarity index 100% rename from home/mail/default.nix rename to home/modules/mail/default.nix diff --git a/home/media.nix b/home/modules/media.nix similarity index 100% rename from home/media.nix rename to home/modules/media.nix diff --git a/home/messaging.nix b/home/modules/messaging.nix similarity index 81% rename from home/messaging.nix rename to home/modules/messaging.nix index e33d6b4..8c8f0dd 100644 --- a/home/messaging.nix +++ b/home/modules/messaging.nix @@ -3,7 +3,7 @@ { home.packages = with pkgs; [ signal-desktop - telegram-desktop + # telegram-desktop simplex-chat-desktop ]; } diff --git a/home/nvim/config.vim b/home/modules/nvim/config.vim similarity index 100% rename from home/nvim/config.vim rename to home/modules/nvim/config.vim diff --git a/home/nvim/default.nix b/home/modules/nvim/default.nix similarity index 99% rename from home/nvim/default.nix rename to home/modules/nvim/default.nix index e982334..a9c3a26 100644 --- a/home/nvim/default.nix +++ b/home/modules/nvim/default.nix @@ -5,6 +5,7 @@ astro-language-server marksman nil + tree-sitter typescript-language-server vim-language-server ]; @@ -107,6 +108,7 @@ vim.lsp.enable('marksman') vim.lsp.enable('nil_ls') vim.lsp.enable('r_language_server') + vim.lsp.enable('rust-analyzer') vim.lsp.enable('texlab') vim.lsp.enable('ts_ls') vim.lsp.enable('vimls') diff --git a/home/nvim/dotfiles/after/ftplugin/markdown.vim b/home/modules/nvim/dotfiles/after/ftplugin/markdown.vim similarity index 100% rename from home/nvim/dotfiles/after/ftplugin/markdown.vim rename to home/modules/nvim/dotfiles/after/ftplugin/markdown.vim diff --git a/home/nvim/dotfiles/autocommands.vim b/home/modules/nvim/dotfiles/autocommands.vim similarity index 100% rename from home/nvim/dotfiles/autocommands.vim rename to home/modules/nvim/dotfiles/autocommands.vim diff --git a/home/nvim/dotfiles/ftplugin/markdown.vim b/home/modules/nvim/dotfiles/ftplugin/markdown.vim similarity index 100% rename from home/nvim/dotfiles/ftplugin/markdown.vim rename to home/modules/nvim/dotfiles/ftplugin/markdown.vim diff --git a/home/nvim/dotfiles/ftplugin/nix.vim b/home/modules/nvim/dotfiles/ftplugin/nix.vim similarity index 100% rename from home/nvim/dotfiles/ftplugin/nix.vim rename to home/modules/nvim/dotfiles/ftplugin/nix.vim diff --git a/home/nvim/dotfiles/ftplugin/r.vim b/home/modules/nvim/dotfiles/ftplugin/r.vim similarity index 100% rename from home/nvim/dotfiles/ftplugin/r.vim rename to home/modules/nvim/dotfiles/ftplugin/r.vim diff --git a/home/nvim/dotfiles/ftplugin/rmd.vim b/home/modules/nvim/dotfiles/ftplugin/rmd.vim similarity index 100% rename from home/nvim/dotfiles/ftplugin/rmd.vim rename to home/modules/nvim/dotfiles/ftplugin/rmd.vim diff --git a/home/nvim/dotfiles/ftplugin/tex.vim b/home/modules/nvim/dotfiles/ftplugin/tex.vim similarity index 100% rename from home/nvim/dotfiles/ftplugin/tex.vim rename to home/modules/nvim/dotfiles/ftplugin/tex.vim diff --git a/home/nvim/dotfiles/ftplugin/typescript.vim b/home/modules/nvim/dotfiles/ftplugin/typescript.vim similarity index 100% rename from home/nvim/dotfiles/ftplugin/typescript.vim rename to home/modules/nvim/dotfiles/ftplugin/typescript.vim diff --git a/home/nvim/dotfiles/syntax/rmd.vim b/home/modules/nvim/dotfiles/syntax/rmd.vim similarity index 100% rename from home/nvim/dotfiles/syntax/rmd.vim rename to home/modules/nvim/dotfiles/syntax/rmd.vim diff --git a/home/nvim/lsp.lua b/home/modules/nvim/lsp.lua similarity index 100% rename from home/nvim/lsp.lua rename to home/modules/nvim/lsp.lua diff --git a/home/nvim/nvim-cmp.lua b/home/modules/nvim/nvim-cmp.lua similarity index 100% rename from home/nvim/nvim-cmp.lua rename to home/modules/nvim/nvim-cmp.lua diff --git a/home/office-cli.nix b/home/modules/office-cli.nix similarity index 100% rename from home/office-cli.nix rename to home/modules/office-cli.nix diff --git a/home/office-gui.nix b/home/modules/office-gui.nix similarity index 100% rename from home/office-gui.nix rename to home/modules/office-gui.nix diff --git a/home/password-store.nix b/home/modules/password-store.nix similarity index 100% rename from home/password-store.nix rename to home/modules/password-store.nix diff --git a/home/plasma.nix b/home/modules/plasma.nix similarity index 100% rename from home/plasma.nix rename to home/modules/plasma.nix diff --git a/home/r.nix b/home/modules/r.nix similarity index 100% rename from home/r.nix rename to home/modules/r.nix diff --git a/home/tasks.nix b/home/modules/tasks.nix similarity index 100% rename from home/tasks.nix rename to home/modules/tasks.nix diff --git a/home/tex.nix b/home/modules/tex.nix similarity index 100% rename from home/tex.nix rename to home/modules/tex.nix diff --git a/home/tmux.nix b/home/modules/tmux.nix similarity index 100% rename from home/tmux.nix rename to home/modules/tmux.nix diff --git a/home/user-dirs.nix b/home/modules/user-dirs.nix similarity index 100% rename from home/user-dirs.nix rename to home/modules/user-dirs.nix diff --git a/home/vifm.nix b/home/modules/vifm.nix similarity index 100% rename from home/vifm.nix rename to home/modules/vifm.nix diff --git a/home/npm.conf b/home/npm.conf deleted file mode 100644 index dc3f6fb..0000000 --- a/home/npm.conf +++ /dev/null @@ -1 +0,0 @@ -prefix = ${HOME}/.npm-packages diff --git a/home/profiles/desktop-full.nix b/home/profiles/desktop-full.nix deleted file mode 100644 index c786f38..0000000 --- a/home/profiles/desktop-full.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: - -{ - imports = [ - ./desktop-slim.nix - - ../messaging.nix - ../r.nix - ../tex.nix - ../mail - ../office-gui.nix - ../office-cli.nix - ../aichat.nix - ]; -} diff --git a/home/profiles/on-server.nix b/home/profiles/on-server.nix deleted file mode 100644 index 68c51f6..0000000 --- a/home/profiles/on-server.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - imports = [ - ./minimal.nix - ./devel.nix - ]; -} From d8ed4fea1cf1c8cbb35210f8e380c3733ceae87c Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 10 Mar 2026 14:34:13 +0100 Subject: [PATCH 2/2] encrypt, no auto_edit --- home/modules/mail/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/home/modules/mail/default.nix b/home/modules/mail/default.nix index f6dba07..3f73a72 100644 --- a/home/modules/mail/default.nix +++ b/home/modules/mail/default.nix @@ -5,8 +5,7 @@ let makeConfig = accountName: '' unset reverse_name - unset crypt_auto_pgp - unset crypt_auto_smime + unset smime_is_default set my_account='${ accountName }' macro index,pager / "tag:${ accountName } " unalternates * @@ -88,7 +87,7 @@ in extraConfig = makeConfig name + '' color status blue default alternates ^tstraube@(em|rz)?.uni-frankfurt.de$ - set crypt_auto_smime + set smime_is_default ''; }; }; @@ -108,7 +107,6 @@ in color status green default alternates @t9e.me$ @ktiu.net$ ^(tillkowski|till.straube)@gmail.com$ set reverse_name - set crypt_auto_pgp ''; }; msmtp.extraConfig.port = "587"; @@ -128,7 +126,6 @@ in neomutt = { extraConfig = makeConfig name + '' color status red default - set crypt_auto_pgp ''; }; passwordCommand = "pass ksh/systemli"; @@ -176,7 +173,7 @@ in settings = { abort_noattach = "ask-yes"; abort_noattach_regex = "\"(attach|enclosed|anbei|anhängen|angehängt|anhang|anhänge|hängt an)\""; - auto_edit = "yes"; + auto_edit = "no"; beep = "no"; confirm_append = "no"; crypt_auto_sign = "yes"; @@ -220,7 +217,7 @@ in { key = "k"; map = [ "pager" ]; action = "previous-entry"; } { key = "j"; map = [ "pager" ]; action = "next-entry"; } { key = ""; map = [ "index" ]; action = "display-message"; } - { key = ""; map = "index"; action = "entire-thread"; } + { key = ""; map = [ "index" ]; action = "entire-thread"; } { key = "gf"; map = [ "index" "pager" ]; action = "change-folder"; } { key = ""; map = [ "editor" ]; action = "complete-query"; } { key = "P"; map = [ "compose" ]; action = "pgp-menu"; }