diff --git a/home/calendars/default.nix b/home/calendars/default.nix index 7098830..7294e94 100644 --- a/home/calendars/default.nix +++ b/home/calendars/default.nix @@ -43,11 +43,11 @@ in }; mitlisa = calDefaults // { # khal.color = "light magenta"; - remote = baikalRemote "75db196d-bc81-4de3-96dc-d4c068c1234b"; + remote = baikalRemote "867d77c5-088f-4617-aeb8-6c9a18925e30"; }; family = calDefaults // { # khal.color = "dark magenta"; - remote = baikalRemote "867d77c5-088f-4617-aeb8-6c9a18925e30"; + remote = baikalRemote "75db196d-bc81-4de3-96dc-d4c068c1234b"; }; bdays = calDefaults // { # khal.color = "yellow"; diff --git a/home/default.nix b/home/default.nix index 23c4059..282084a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -34,6 +34,7 @@ # commandline exa + file fzf nnn jq @@ -61,26 +62,28 @@ # office khal - # vdirsyncer khard taskopen gnome.gnome-sound-recorder - zoom-us + # zoom-us + evolution # publishing + hunspell + hunspellDicts.de_DE + hunspellDicts.th_TH + hyphen pandoc + poppler_utils libreoffice zotero zathura - hunspell - hyphen - hunspellDicts.de_DE - hunspellDicts.th_TH # graphics inkscape gimp godot_4 + scrcpy # web qutebrowser @@ -90,15 +93,16 @@ # media vlc - lollypop + rhythmbox freetube yt-dlp - # deveolopment + # development bundix nodejs ruby android-studio + netlify-cli # secrets libsecret @@ -144,12 +148,16 @@ programs.taskwarrior = { enable = true; + dataLocation = "${config.xdg.dataHome}/taskwarrior/tasks"; + colorTheme = "light-256"; config = { - data.location = "${config.xdg.dataHome}/taskwarrior/tasks"; - hooks.location = "${config.xdg.dataHome}/taskwarrior/tasks"; report.list.columns = ["id" "depends.indicator" "priority" "project" "recur.indicator" "scheduled.countdown" "due" "until.age" "status.short" "description.count" "tags"]; report.list.labels= ["ID" "D" "Prio" "Proj" "R" "Scheduled" "Due" "Until" "S" "Description" "Tags"]; }; + extraConfig = " + hooks.location=${config.xdg.dataHome}/taskwarrior/hooks + verbose=affected,context,edit,label,header,new-id,project,special,sync,recur + "; }; } diff --git a/home/fish.nix b/home/fish.nix index a1b5ce9..c5c2866 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -25,8 +25,6 @@ buildfk = "curl -X POST -d '{}' https://api.netlify.com/build_hooks/61669ddfeaa3cccc44e752ea"; showbox = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/box"; showc = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/c/"; - backyin = "duplicity --progress --no-encryption --exclude ~/.local/share/Trash/ --exclude ~/.cache/ ~ file:///run/media/till/yin/nova/"; - backyang = "duplicity --progress --no-encryption --exclude ~/.local/share/Trash/ --exclude ~/.cache/ ~ file:///run/media/till/yang/nova/"; }; shellAbbrs = { openconnect = "openconnect --config=/home/till/.config/openconnect/config"; @@ -76,6 +74,8 @@ set __fish_git_prompt_char_stashstate '↩' set __fish_git_prompt_char_upstream_ahead '+' set __fish_git_prompt_char_upstream_behind '-' + + test -f '/home/till/.config/netlify/helper/path.fish.inc' && source '/home/till/.config/netlify/helper/path.fish.inc' ''; }; } diff --git a/home/foot.nix b/home/foot.nix index cc64ba0..17b732a 100644 --- a/home/foot.nix +++ b/home/foot.nix @@ -7,10 +7,10 @@ main = { shell = "/home/till/.nix-profile/bin/fish -c 'tmux attach || tmux'"; pad = "20x20"; - font = "JetBrains Mono:size=9"; + font = "JetBrains Mono:size=15"; initial-window-mode = "maximized"; - line-height = "11.3"; - dpi-aware = true; + line-height = "19"; + # dpi-aware = "yes"; }; mouse.hide-when-typing = "yes"; cursor = { diff --git a/home/mail/bindings.neomuttrc b/home/mail/bindings.neomuttrc index fbec604..ee4a294 100644 --- a/home/mail/bindings.neomuttrc +++ b/home/mail/bindings.neomuttrc @@ -56,7 +56,7 @@ macro index,pager gu "~/.local/share/mail/gu/Inbox+gmail/IMAP/Inbox" "Go to Gmail" # macro index,pager gk "+ks/IMAP/Inbox" "Go to KS" macro index,pager gi "~/.local/share/mail/ktiu/Inbox" "Go to ktiu" -# macro index,pager gf "+dkg/IMAP/Inbox" "Go to DKG" +macro index,pager gf "~/.local/share/mail/dkg/Inbox" "Go to DKG" macro index,pager L "all\n" "Show all messages (undo limit)" diff --git a/home/mail/default.nix b/home/mail/default.nix index df78813..90da329 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -126,6 +126,49 @@ }; passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till"; }; + dkg = { + address = "kontakt@dkg2023.de"; + realName = "DKG Orga-Team"; + imap.host = "mail.privateemail.com"; + smtp.host = "mail.privateemail.com"; + smtp.tls.useStartTls = true; + notmuch.enable = true; + userName = "helpdesk@dkg2023.de"; + signature.text = '' + DKG '23 + https://dkg2023.de + ''; + signature.showSignature = "append"; + neomutt = { + enable = true; + sendMailCommand = "/home/till/.nix-profile/bin/msmtp"; + extraConfig = '' + set my_mbsync_acct='dkg' + + set mbox='+Archive' + set my_junk='+Junk' + + set crypt_auto_pgp + unset crypt_auto_smime + + unalternates * + alternates @dkg2023.de$ + set reverse_name + set my_signature = ${ + pkgs.writeText + "signature.txt" + config.accounts.email.accounts.dkg.signature.text + } + color status yellow default + ''; + }; + mbsync.enable = true; + msmtp = { + enable = true; + extraConfig.from = "*@dkg2023.de"; + }; + passwordCommand = "secret-tool lookup server mail.privateemail.com account helpdesk@dkg2023.de"; + }; }; }; } diff --git a/home/nvim/config.vim b/home/nvim/config.vim index cb8b49f..dd018f5 100644 --- a/home/nvim/config.vim +++ b/home/nvim/config.vim @@ -44,6 +44,7 @@ nnoremap l nnoremap :hide nnoremap m :make +nnoremap M :!home-manager --flake ~/omniflake switch tnoremap diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 57778a9..5e64241 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -44,9 +44,10 @@ nnoremap o :Files nnoremap O :Files ~/ nnoremap r :Read + nnoremap R :Read ~/ nnoremap a :Ag nnoremap b :Buffers - nnoremap . :Files ~/.config/ + nnoremap . :Files ~/omniflake/ command! -nargs=? -complete=dir Read call fzf#run( \fzf#wrap({'sink': 'read', 'dir': }) \) diff --git a/home/tex.nix b/home/tex.nix index 342294a..dd9d185 100644 --- a/home/tex.nix +++ b/home/tex.nix @@ -6,6 +6,8 @@ let adjustbox arydshln bbding + blindtext + changepage csquotes enotez enumitem @@ -13,24 +15,39 @@ let framed gensymb graphbox + idxlayout + imakeidx lastpage lipsum + ltablex ly1 makecell multirow + needspace nowidow + pdfcol + pdfpages + pgf scheme-medium sourcesanspro + svg tabu + tabulary tcolorbox threeparttable threeparttablex + tikzfill + titlesec titling tocloft translations + transparent was wrapfig xpatch + xtab + xurl + zref ; }); in diff --git a/system/hardware-nova.nix b/system/hardware-nova.nix index 94ef237..5d64b47 100644 --- a/system/hardware-nova.nix +++ b/system/hardware-nova.nix @@ -30,6 +30,12 @@ options = [ "subvol=home/till/.local/share/Steam" "compress=zstd" ]; }; + fileSystems."/home/till/.cache" = + { device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; + fsType = "btrfs"; + options = [ "subvol=home/till/.cache" ]; + }; + fileSystems."/nix" = { device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; fsType = "btrfs";