From c033c641354acda55f29e81e0a1057a4030b52ef Mon Sep 17 00:00:00 2001 From: Till Date: Thu, 15 May 2025 17:22:04 +0200 Subject: [PATCH 01/33] woof, markdown --- flake.nix | 1 - home/castget/castget.conf | 40 +++++++++++++++++++++------------------ home/fish.nix | 3 ++- home/nvim/default.nix | 20 +++++++++----------- home/nvim/lsp.vim | 2 +- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/flake.nix b/flake.nix index 761a0e9..df0aa1b 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,6 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix - ./system/sway.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix diff --git a/home/castget/castget.conf b/home/castget/castget.conf index 0b9d87a..c582077 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -1,27 +1,38 @@ # vim: set ft=conf -[drei90] -url=http://feeds.feedburner.com/Drei90 -id3album=drei90 +[2.5admins] +url=https://2.5admins.com/feed/podcast [50plus2] url=https://50plus2.podigee.io/feed/mp3 id3album=50+2 +[drei90] +url=http://feeds.feedburner.com/Drei90 +id3album=drei90 + +[drei90ff] +url=https://www.patreon.com/rss/drei90funfriends?auth=QZZ89bFPYjO2_AJjzY_R5meWlz8EGJzX&show=864941 +id3album=drei90ff + +[efpodcast] +url=https://www.eintracht-podcast.de/feed/mp3 + [latenightlinux] url=https://latenightlinux.com/feed/mp3 -[linuxdevtime] -url=https://latenightlinux.com/feed/extra - [linuxafterdark] url=https://linuxafterdark.net/feed/podcast +[linuxdevtime] +url=https://latenightlinux.com/feed/extra + [linuxmatters] url=https://linuxmatters.sh/episode/index.xml -[2.5admins] -url=https://2.5admins.com/feed/podcast +[logbuchnetzpolitik] +url=https://feeds.metaebene.me/lnp/mp3 +id3album=Logbuch Netzpolitik [schlusskonferenz] url=https://schlusskonferenz.podigee.io/feed/mp3 @@ -33,16 +44,9 @@ url=https://tribuenengespraech.podigee.io/feed/mp3 url=https://www.wett-broetchen.de/feed/mp3 id3album=Wettbrötchen -[efpodcast] -url=https://www.eintracht-podcast.de/feed/mp3 - -# [edeltalk] -# url=https://cdn.julephosting.de/podcasts/573-edeltalk-mit-dominik-kevin/feed.rss -# id3album=Edeltalk - -[logbuchnetzpolitik] -url=https://feeds.metaebene.me/lnp/mp3 -id3album=Logbuch Netzpolitik +[edeltalk] +url=https://cdn.julephosting.de/podcasts/573-edeltalk-mit-dominik-kevin/feed.rss +id3album=Edeltalk [*] id3contenttype=Podcast diff --git a/home/fish.nix b/home/fish.nix index a811b6f..f2fd420 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -4,9 +4,10 @@ top = "btm --battery"; linkbox = "ln -s (pwd) ~/box/"; rloft = "tmux source-file ~/.config/tmux/rloft.conf"; - liftbox = "ssh tstraube@login.server.uni-frankfurt.de \"rm -r box/*\" && scp -vr ~/box/ tstraube@login.server.uni-frankfurt.de:box/"; + liftbox = "tar czf - -C ~/box/ . | ssh tstraube@login.server.uni-frankfurt.de 'tar xzf - -C ~/box'"; ktiubox = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/"; ymd = "date +'%Y-%m-%d'"; + dmy = "date +'%-d.-%-m.%Y'"; pulluni = "ssh tstraube@login.server.uni-frankfurt.de \"cd uni-tstraube && git pull\""; pullstat = "tar czf - -C ~/teach/2025_statistik/skript/public/ . | ssh tstraube@login.server.uni-frankfurt.de 'tar xzf - -C ~/public_html/c/stat25'"; pullgrid = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/grid && git pull\""; diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 02b1b71..c1ca072 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -1,25 +1,28 @@ { config, pkgs, ... }: { - home.packages = with pkgs.nodePackages; [ - typescript-language-server + home.packages = with pkgs; [ + nodePackages.typescript-language-server + marksman ]; - programs.neovim = { extraConfig = builtins.readFile ./config.vim; enable = true; defaultEditor = true; plugins = with pkgs.vimPlugins; + let woof = pkgs.vimUtils.buildVimPlugin { name = "woof.vim"; src = builtins.fetchGit { - url = "ssh://git@ktiu.net/home/git/woof.vim/"; + url = "ssh://git@shorbut.ktiu.net/home/git/woof.vim/"; ref = "main"; - rev = "ea2ed3afb7c00a6b1672351e22195c0f8dd5d696"; + rev = "146eca695d0c3901905f4d46d9defd1f624dc193"; }; }; - in [ + in + + [ { plugin = woof; config = '' @@ -56,7 +59,6 @@ \) ''; } - { plugin = goyo; config = '' @@ -65,7 +67,6 @@ nnoremap ]og :Goyo! ''; } - { plugin = limelight-vim; config = '' @@ -76,12 +77,10 @@ nnoremap ]of :Limelight! ''; } - { plugin = nvim-colorizer-lua; config = "lua require 'colorizer'.setup()"; } - { plugin = papercolor-theme; config = '' @@ -89,7 +88,6 @@ colorscheme PaperColor ''; } - typescript-vim { plugin = ultisnips; diff --git a/home/nvim/lsp.vim b/home/nvim/lsp.vim index 0adf222..976e7dc 100644 --- a/home/nvim/lsp.vim +++ b/home/nvim/lsp.vim @@ -69,7 +69,7 @@ lua < Date: Fri, 16 May 2025 08:43:13 +0200 Subject: [PATCH 02/33] khard dump working --- home/nvim/default.nix | 3 ++- home/nvim/khard-dump.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 home/nvim/khard-dump.nix diff --git a/home/nvim/default.nix b/home/nvim/default.nix index c1ca072..e2c8566 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -1,6 +1,7 @@ { config, pkgs, ... }: { + imports = [ ./khard-dump.nix ]; home.packages = with pkgs; [ nodePackages.typescript-language-server marksman @@ -17,7 +18,7 @@ src = builtins.fetchGit { url = "ssh://git@shorbut.ktiu.net/home/git/woof.vim/"; ref = "main"; - rev = "146eca695d0c3901905f4d46d9defd1f624dc193"; + rev = "5c3f6675436e33e56e2f43ed8853925daaf1d011"; }; }; in diff --git a/home/nvim/khard-dump.nix b/home/nvim/khard-dump.nix new file mode 100644 index 0000000..cc13376 --- /dev/null +++ b/home/nvim/khard-dump.nix @@ -0,0 +1,29 @@ +{ config, pkgs, ... }: + +{ + systemd.user.timers = { + khard-dump = { + Unit = { + Description = "Timer to run khard-dump service"; + }; + Timer = { + OnCalendar = "*:00/10"; + Unit = "khard-dump.service"; + }; + }; + }; + + systemd.user.services = { + khard-dump = { + Unit = { + Description = "Dumps contact info to custom cache file"; + }; + Service = { + ExecStart = "${pkgs.writeScript "khard-dump" '' + #! ${pkgs.stdenv.shell} + ${pkgs.khard.outPath}/bin/khard email --parsable --remove-first-line | awk 'BEGIN{FS=OFS="\t"}{print $2, $1}\' > ${config.xdg.cacheHome}/khard-dump + ''}"; + }; + }; + }; +} From 785a2f9dc57013a62036af173c91bd2a8da665a2 Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 16 May 2025 23:08:39 +0200 Subject: [PATCH 03/33] grid pipeline, woof upgrade --- home/fish.nix | 2 +- home/nvim/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home/fish.nix b/home/fish.nix index f2fd420..669f493 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -10,7 +10,7 @@ dmy = "date +'%-d.-%-m.%Y'"; pulluni = "ssh tstraube@login.server.uni-frankfurt.de \"cd uni-tstraube && git pull\""; pullstat = "tar czf - -C ~/teach/2025_statistik/skript/public/ . | ssh tstraube@login.server.uni-frankfurt.de 'tar xzf - -C ~/public_html/c/stat25'"; - pullgrid = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/grid && git pull\""; + pullgrid = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/grid && git pull && npm run build\""; buildfk = "curl -X POST -d '{}' https://api.netlify.com/build_hooks/65dc8705b91d7cbaf0a1e1b5"; showbox = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/box"; showc = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/c/"; diff --git a/home/nvim/default.nix b/home/nvim/default.nix index e2c8566..c1fcabd 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -18,7 +18,7 @@ src = builtins.fetchGit { url = "ssh://git@shorbut.ktiu.net/home/git/woof.vim/"; ref = "main"; - rev = "5c3f6675436e33e56e2f43ed8853925daaf1d011"; + rev = "9dfef63b9c0872fe14315421a1763d82818f59e8"; }; }; in From c59c132d919256054d5350510a71e5d1c21f345d Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 20 May 2025 22:36:44 +0200 Subject: [PATCH 04/33] working --- home/castget/castget.conf | 4 ---- home/default.nix | 1 + home/fish.nix | 31 +------------------------------ 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/home/castget/castget.conf b/home/castget/castget.conf index c582077..8533191 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -11,10 +11,6 @@ id3album=50+2 url=http://feeds.feedburner.com/Drei90 id3album=drei90 -[drei90ff] -url=https://www.patreon.com/rss/drei90funfriends?auth=QZZ89bFPYjO2_AJjzY_R5meWlz8EGJzX&show=864941 -id3album=drei90ff - [efpodcast] url=https://www.eintracht-podcast.de/feed/mp3 diff --git a/home/default.nix b/home/default.nix index 0c610dc..41db11a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -18,6 +18,7 @@ jdk poppler_utils zotero + lorem # graphics gimp diff --git a/home/fish.nix b/home/fish.nix index 669f493..ea5c2a4 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -2,29 +2,12 @@ { home.shellAliases = { top = "btm --battery"; - linkbox = "ln -s (pwd) ~/box/"; - rloft = "tmux source-file ~/.config/tmux/rloft.conf"; - liftbox = "tar czf - -C ~/box/ . | ssh tstraube@login.server.uni-frankfurt.de 'tar xzf - -C ~/box'"; - ktiubox = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/"; ymd = "date +'%Y-%m-%d'"; dmy = "date +'%-d.-%-m.%Y'"; - pulluni = "ssh tstraube@login.server.uni-frankfurt.de \"cd uni-tstraube && git pull\""; - pullstat = "tar czf - -C ~/teach/2025_statistik/skript/public/ . | ssh tstraube@login.server.uni-frankfurt.de 'tar xzf - -C ~/public_html/c/stat25'"; - pullgrid = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/grid && git pull && npm run build\""; - buildfk = "curl -X POST -d '{}' https://api.netlify.com/build_hooks/65dc8705b91d7cbaf0a1e1b5"; - showbox = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/box"; - showc = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/c/"; - castget = "castget -prvC ~/.config/castget/castget.conf"; - castsync = "rsync -va --remove-source-files --progress --stats ~/.local/share/podcasts/ /run/media/till/CLIP\\ JAM/Podcasts/"; - musicsync = "rsync -va --ignore-existing --progress --stats ~/media/music/sync/ /run/media/till/CLIP\\ JAM/Music/"; - cb = "cd $(sed 's|^file://||' /home/till/.config/gtk-3.0/bookmarks | fzf --height 10% --reverse)"; - univpn = "secret-tool lookup server uni-frankfurt.de account tstraube | sudo openconnect --config=/home/till/.config/openconnect/config --passwd-on-stdin"; v = "nvim"; r = "R --no-save --no-restore"; R = "R --no-save --no-restore"; cdg = "cd \$(git rev-parse --show-toplevel)"; - map = "telnet mapscii.me"; - weather = "curl wttr.in/frankfurt"; }; programs.fish = { enable = true; @@ -38,14 +21,6 @@ function fish_greeting; end - function pod --description 'Full service podcast refresh' - castget - udisksctl mount -b /dev/disk/by-label/CLIP\\x20JAM - musicsync - castsync - udisksctl unmount -b /dev/disk/by-label/CLIP\\x20JAM - end - function startrloft --description 'Starts R with custom environment' set -lx R_ENVIRON_USER "~/.config/rloft/RLoft_environ" R -q @@ -63,10 +38,6 @@ end end - function lipsum --description 'Create placeholder text' - nix-shell -p perl536Packages.TextLorem --run 'lorem '(echo $argv) - end - set -U fish_prompt_pwd_dir_length 0 function fish_prompt --description "Write out the prompt" @@ -94,7 +65,7 @@ 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' + test -f ${config.xdg.configHome}/alias.fish && source ${config.xdg.configHome}/alias.fish ''; }; } From 834ab52bb9810c2cc43df43b9e22152c087f8a07 Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 27 Jun 2025 16:05:21 +0200 Subject: [PATCH 05/33] fairly stable --- flake.lock | 24 ++++++++++++------------ home/calendars.nix | 18 ++++++++++++++++++ home/default.nix | 2 -- home/mail/config.neomuttrc | 3 ++- home/r.nix | 2 ++ system/web-server/mail/postfix.nix | 14 +++++++------- 6 files changed, 41 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index d4d2798..5a5e95c 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745742390, - "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", + "lastModified": 1750646418, + "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", + "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745913556, - "narHash": "sha256-hKf2z9fw7vwRBa4CCijolsZt+fqSCixSGai2MS0l+Wg=", + "lastModified": 1751030875, + "narHash": "sha256-x4EqjJUyJ3mHRtFYQP+FSDzT4A+1DEDig1LtwTsIJTc=", "owner": "nix-community", "repo": "nur", - "rev": "670e6a286982af78be5fc0b5109356db2d361119", + "rev": "48ce5dd4e350f18380810882dd787839c6433dda", "type": "github" }, "original": { diff --git a/home/calendars.nix b/home/calendars.nix index 3051570..bb3b888 100644 --- a/home/calendars.nix +++ b/home/calendars.nix @@ -59,32 +59,38 @@ in accounts.calendar.basePath = "${config.xdg.dataHome}/calendars"; accounts.calendar.accounts = { + till = calDefaults // { khal.enable = true; primary = true; khal.color = "light blue"; remote = myRemote "personal"; }; + mitlisa = calDefaults // { khal.enable = true; khal.color = "light magenta"; remote = myRemote "lisa-und-till"; }; + family = calDefaults // { khal.enable = true; khal.color = "dark magenta"; remote = myRemote "family"; }; + bdays = calDefaults // { khal.enable = true; khal.color = "yellow"; remote = myRemote "geburtstage"; }; + polit = calDefaults // { khal.enable = true; khal.color = "dark gray"; remote = myRemote "polit"; }; + ihg = calDefaults // { khal.enable = true; khal.color = "dark cyan"; @@ -93,6 +99,7 @@ in url = "https://geocom.uni-frankfurt.de/radicale/ihg/5012a739-dbaf-334b-f093-8db1860bc26e/"; }; }; + "eintracht_m" = calDefaults // { khal.enable = true; khal.color = "light red"; @@ -101,6 +108,7 @@ in url = "http://i.cal.to/ical/257/eintrachtfrankfurt/spielplan/28ae0d30.f781380b-e6f28bd4.ics"; }; }; + "eintracht_f" = calDefaults // { khal.enable = true; khal.color = "dark red"; @@ -109,6 +117,16 @@ in url = "http://i.cal.to/ical/5940/eintrachtfrankfurt/spielplan-frauen-profis/28ae0d30.f781380b-1763bff2.ics"; }; }; + + "feiertage" = calDefaults // { + khal.enable = true; + khal.color = "dark green"; + remote = { + type = "http"; + url = "https://ics.tools/Feiertage/hessen.ics"; + }; + }; + "grid" = calDefaults // { khal.enable = true; khal.color = "light green"; diff --git a/home/default.nix b/home/default.nix index 41db11a..5a96759 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,7 +5,6 @@ home.packages = with pkgs; [ # messenger - element-desktop signal-desktop tdesktop @@ -30,7 +29,6 @@ # media bookworm - heroic anki-bin freetube qbittorrent diff --git a/home/mail/config.neomuttrc b/home/mail/config.neomuttrc index 870ebec..cc7b6d3 100644 --- a/home/mail/config.neomuttrc +++ b/home/mail/config.neomuttrc @@ -54,7 +54,8 @@ folder-hook . source ~/.config/neomutt/bindings.neomuttrc # source ~/.config/neomutt/pgp.neomuttrc # Compose -set editor = "nvim -c 'call woof#init#Init()'" +# set editor = "nvim -c 'call woof#init#Init()'" +set editor = "nvim" set edit_headers set forward_format = "Fwd: %s" set forward_attachments diff --git a/home/r.nix b/home/r.nix index 9507685..3248ad8 100644 --- a/home/r.nix +++ b/home/r.nix @@ -44,6 +44,7 @@ eurostat extrafont ggplot2 + ggridges jsonlite kableExtra knitr @@ -60,6 +61,7 @@ RColorBrewer readODS revealjs + restatis rlist rmarkdown rnaturalearth diff --git a/system/web-server/mail/postfix.nix b/system/web-server/mail/postfix.nix index a00fba8..e5a1130 100644 --- a/system/web-server/mail/postfix.nix +++ b/system/web-server/mail/postfix.nix @@ -2,13 +2,13 @@ let - submissionHeaderCleanupRules = pkgs.writeText "submission_header_cleanup_rules" '' - /^Received:/ IGNORE - /^X-Originating-IP:/ IGNORE - /^X-Mailer:/ IGNORE - /^User-Agent:/ IGNORE - /^X-Enigmail:/ IGNORE - /^Message-ID:\s+<(.*?)@.*?>/ REPLACE Message-ID: <$1@ktiu.net> + submissionheadercleanuprules = pkgs.writetext "submission_header_cleanup_rules" '' + /^received:/ ignore + /^x-originating-ip:/ ignore + /^x-mailer:/ ignore + /^user-agent:/ ignore + /^x-enigmail:/ ignore + /^message-id:\s+<(.*?)@.*?>/ replace message-id: <$1@ktiu.net> ''; in { From d356eb604b105c77600a6412ff35968b46c079ef Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 27 Jun 2025 16:13:02 +0200 Subject: [PATCH 06/33] pdf template --- home/r.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/r.nix b/home/r.nix index 3248ad8..b3d6949 100644 --- a/home/r.nix +++ b/home/r.nix @@ -29,7 +29,7 @@ src = builtins.fetchGit { url = "ssh://git@ktiu.net/home/git/goethR/"; ref = "main"; - rev = "a3a0363d1fbdf6be19e3597d9484615cd2c47cc0"; + rev = "01776995974c800f6f340daa08fea06f0ff55b1e"; }; propagatedBuildInputs = []; nativeBuildInputs = []; From 08a543c9532663a0e278fc8601161f898a37e502 Mon Sep 17 00:00:00 2001 From: Till Date: Thu, 17 Jul 2025 15:02:31 +0200 Subject: [PATCH 07/33] working setup --- home/mail/config.neomuttrc | 3 +-- home/nvim/default.nix | 2 +- home/r.nix | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/home/mail/config.neomuttrc b/home/mail/config.neomuttrc index cc7b6d3..870ebec 100644 --- a/home/mail/config.neomuttrc +++ b/home/mail/config.neomuttrc @@ -54,8 +54,7 @@ folder-hook . source ~/.config/neomutt/bindings.neomuttrc # source ~/.config/neomutt/pgp.neomuttrc # Compose -# set editor = "nvim -c 'call woof#init#Init()'" -set editor = "nvim" +set editor = "nvim -c 'call woof#init#Init()'" set edit_headers set forward_format = "Fwd: %s" set forward_attachments diff --git a/home/nvim/default.nix b/home/nvim/default.nix index c1fcabd..2b718f8 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -18,7 +18,7 @@ src = builtins.fetchGit { url = "ssh://git@shorbut.ktiu.net/home/git/woof.vim/"; ref = "main"; - rev = "9dfef63b9c0872fe14315421a1763d82818f59e8"; + rev = "69ecc972c3933cd9f358b2928693c6275cfcf8a5"; }; }; in diff --git a/home/r.nix b/home/r.nix index b3d6949..7c3694b 100644 --- a/home/r.nix +++ b/home/r.nix @@ -27,9 +27,9 @@ goethR = pkgs.rPackages.buildRPackage { name = "goethR"; src = builtins.fetchGit { - url = "ssh://git@ktiu.net/home/git/goethR/"; + url = "ssh://git@arielle.ktiu.net/home/git/goethR/"; ref = "main"; - rev = "01776995974c800f6f340daa08fea06f0ff55b1e"; + rev = "f84139455723907258c98384dca9cc58ddfff0ed"; }; propagatedBuildInputs = []; nativeBuildInputs = []; From 94a039fef0eebce7758fc5795d0f2d681d0d6940 Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 18 Jul 2025 01:02:39 +0200 Subject: [PATCH 08/33] update, cosmic --- flake.lock | 52 +++++++++++++------------------------------ flake.nix | 5 +++-- home/firefox.nix | 24 ++++++++++---------- home/slim-desktop.nix | 2 +- system/cosmic.nix | 5 +++++ 5 files changed, 36 insertions(+), 52 deletions(-) create mode 100644 system/cosmic.nix diff --git a/flake.lock b/flake.lock index 5a5e95c..d052c45 100644 --- a/flake.lock +++ b/flake.lock @@ -28,43 +28,43 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1752544374, + "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1750646418, - "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -77,15 +77,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1751030875, - "narHash": "sha256-x4EqjJUyJ3mHRtFYQP+FSDzT4A+1DEDig1LtwTsIJTc=", + "lastModified": 1752752944, + "narHash": "sha256-Tjdl6UwwlnpPfO/W+u6lNMCIY1X2hH3wYjwiMj48GjQ=", "owner": "nix-community", "repo": "nur", - "rev": "48ce5dd4e350f18380810882dd787839c6433dda", + "rev": "1c920036e31c0d5db9d0bb9bd317a2590e7773b6", "type": "github" }, "original": { @@ -100,27 +99,6 @@ "nixpkgs": "nixpkgs", "nur": "nur" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index df0aa1b..4ce31de 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Complete system and home config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/nur"; }; @@ -22,6 +22,7 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix + ./system/cosmic.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix diff --git a/home/firefox.nix b/home/firefox.nix index efb192b..6cb53cd 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -38,7 +38,7 @@ ${config.home.username} = { name = config.home.username; isDefault = true; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ auto-tab-discard keepassxc-browser tampermonkey @@ -48,7 +48,7 @@ ]; search = { force = true; - default = "Google"; + default = "google"; engines = { "Nix Packages" = { urls = [{ @@ -63,61 +63,61 @@ }; "NixOS Wiki" = { urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; + icon = "https://nixos.wiki/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@nw" ]; }; "NixOS Options" = { urls = [{ template = "https://search.nixos.org/options?query={searchTerms}"; }]; - iconUpdateURL = "https://nixos.org/favicon.png"; + icon = "https://nixos.org/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@no" ]; }; "Home manager options" = { urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-24.11"; }]; - iconUpdateURL = "https://mipmip.github.io/home-manager-option-search/images/favicon.png"; + icon = "https://mipmip.github.io/home-manager-option-search/images/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@hm" ]; }; "Google maps" = { urls = [{ template = "http://maps.google.com/?q={searchTerms}"; }]; - iconUpdateURL = "https://www.google.com/images/branding/product/ico/maps15_bnuw3a_32dp.ico"; + icon = "https://www.google.com/images/branding/product/ico/maps15_bnuw3a_32dp.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@gm" ]; }; "Google scholar" = { urls = [{ template = "https://scholar.google.com/scholar?q={searchTerms}"; }]; - iconUpdateURL = "https://scholar.google.com/favicon.ico"; + icon = "https://scholar.google.com/favicon.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@gs" ]; }; "UB" = { urls = [{ template = "https://ubffm.hds.hebis.de/Search/Results?lookfor={searchTerms}"; }]; - iconUpdateURL = "https://ubffm.hds.hebis.de/themes/ubffm/images/favicon.ico"; + icon = "https://ubffm.hds.hebis.de/themes/ubffm/images/favicon.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@ub" ]; }; "SciHub" = { urls = [{ template = "https://libgen.is/search.php?req={searchTerms}"; }]; - iconUpdateURL = "https://libgen.is/favicon.ico"; + icon = "https://libgen.is/favicon.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@lg" ]; }; "Libgen" = { urls = [{ template = "https://libgen.is/search.php?req={searchTerms}"; }]; - iconUpdateURL = "https://libgen.is/favicon.ico"; + icon = "https://libgen.is/favicon.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@lg" ]; }; "Urban Dictionary" = { urls = [{ template = "https://www.urbandictionary.com/define.php?term={searchTerms}"; }]; - iconUpdateURL = "https://www.urbandictionary.com/favicon-32x32.png"; + icon = "https://www.urbandictionary.com/favicon-32x32.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@ud" ]; }; "Leo" = { urls = [{ template = "https://dict.leo.org/englisch-deutsch/{searchTerms}"; }]; - iconUpdateURL = "https://dict.leo.org/img/favicons/ende-32.png"; + icon = "https://dict.leo.org/img/favicons/ende-32.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@leo" ]; }; diff --git a/home/slim-desktop.nix b/home/slim-desktop.nix index 83d8e02..9181845 100644 --- a/home/slim-desktop.nix +++ b/home/slim-desktop.nix @@ -60,7 +60,7 @@ # secrets libsecret keepassxc - yubikey-manager-qt + yubioath-flutter # geospatial duckdb diff --git a/system/cosmic.nix b/system/cosmic.nix new file mode 100644 index 0000000..e6ffb66 --- /dev/null +++ b/system/cosmic.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + services.desktopManager.cosmic.enable = true; +} From 6df0c22603177e1248859a3c1742139cccbb63ae Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 22 Jul 2025 00:13:06 +0200 Subject: [PATCH 09/33] tiny fixes --- home/castget/castget.conf | 8 ++++---- home/firefox.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home/castget/castget.conf b/home/castget/castget.conf index 8533191..973b466 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -9,7 +9,7 @@ id3album=50+2 [drei90] url=http://feeds.feedburner.com/Drei90 -id3album=drei90 +album_tag=drei90 [efpodcast] url=https://www.eintracht-podcast.de/feed/mp3 @@ -28,7 +28,7 @@ url=https://linuxmatters.sh/episode/index.xml [logbuchnetzpolitik] url=https://feeds.metaebene.me/lnp/mp3 -id3album=Logbuch Netzpolitik +album_tag=Logbuch Netzpolitik [schlusskonferenz] url=https://schlusskonferenz.podigee.io/feed/mp3 @@ -38,11 +38,11 @@ url=https://tribuenengespraech.podigee.io/feed/mp3 [wettbrötchen] url=https://www.wett-broetchen.de/feed/mp3 -id3album=Wettbrötchen +album_tag=Wettbrötchen [edeltalk] url=https://cdn.julephosting.de/podcasts/573-edeltalk-mit-dominik-kevin/feed.rss -id3album=Edeltalk +album_tag=Edeltalk [*] id3contenttype=Podcast diff --git a/home/firefox.nix b/home/firefox.nix index 6cb53cd..95f6fed 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -122,7 +122,7 @@ definedAliases = [ "@leo" ]; }; "Wikipedia".metaData.alias = "@wiki"; - "Bing".metaData.hidden = true; + "bing".metaData.hidden = true; "Amazon.de".metaData.hidden = true; }; }; From cb19a0c3c3aa2412247781862c46c0bbd892b064 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 29 Jul 2025 16:04:47 +0200 Subject: [PATCH 10/33] flake update --- flake.lock | 24 ++++++++++++------------ home/castget/castget.conf | 2 +- home/firefox.nix | 9 ++++++--- home/foot.nix | 1 + home/gnome/default.nix | 7 +++++-- home/nvim/default.nix | 2 +- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index d052c45..57bf107 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1752544374, - "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752620740, - "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", + "lastModified": 1753489912, + "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", + "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1752752944, - "narHash": "sha256-Tjdl6UwwlnpPfO/W+u6lNMCIY1X2hH3wYjwiMj48GjQ=", + "lastModified": 1753795681, + "narHash": "sha256-8/E4abkmKnsorksl5M/8j0ko6i5e6tE1sq5IEYXy1HY=", "owner": "nix-community", "repo": "nur", - "rev": "1c920036e31c0d5db9d0bb9bd317a2590e7773b6", + "rev": "dad44483eb16c470b1392aa2e88075a1bb16a9e2", "type": "github" }, "original": { diff --git a/home/castget/castget.conf b/home/castget/castget.conf index 973b466..07456ba 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -5,7 +5,7 @@ url=https://2.5admins.com/feed/podcast [50plus2] url=https://50plus2.podigee.io/feed/mp3 -id3album=50+2 +album_tag=50+2 [drei90] url=http://feeds.feedburner.com/Drei90 diff --git a/home/firefox.nix b/home/firefox.nix index 95f6fed..d012897 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, osConfig, ... }: { programs.firefox = { @@ -39,16 +39,18 @@ name = config.home.username; isDefault = true; extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ + adaptive-tab-bar-colour auto-tab-discard keepassxc-browser tampermonkey ublock-origin vimium + web-archives zotero-connector ]; search = { force = true; - default = "google"; + default = "ddg"; engines = { "Nix Packages" = { urls = [{ @@ -74,7 +76,8 @@ definedAliases = [ "@no" ]; }; "Home manager options" = { - urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-24.11"; }]; + # urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-${osConfig.system.nixos.release}"; }]; + urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-25.05"; }]; icon = "https://mipmip.github.io/home-manager-option-search/images/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@hm" ]; diff --git a/home/foot.nix b/home/foot.nix index 6b67031..8083e47 100644 --- a/home/foot.nix +++ b/home/foot.nix @@ -8,6 +8,7 @@ shell = "${pkgs.fish}/bin/fish -c 'tmux attach'"; pad = "17x17"; font = "JetBrains Mono:size=14"; + # font = "Adwaita Mono:size=14"; initial-window-mode = "maximized"; line-height = "19"; }; diff --git a/home/gnome/default.nix b/home/gnome/default.nix index 19c77f1..a447ab7 100644 --- a/home/gnome/default.nix +++ b/home/gnome/default.nix @@ -7,8 +7,11 @@ size = 32; }; - home.packages = with pkgs; [ - gnomeExtensions.run-or-raise + home.packages = with pkgs.gnomeExtensions; [ + run-or-raise + removable-drive-menu + system-monitor + app-icons-taskbar ]; dconf.settings = { diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 2b718f8..79f5e71 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -18,7 +18,7 @@ src = builtins.fetchGit { url = "ssh://git@shorbut.ktiu.net/home/git/woof.vim/"; ref = "main"; - rev = "69ecc972c3933cd9f358b2928693c6275cfcf8a5"; + rev = "4425fa50137a71ba4c48c3a09c3db1aad06705dc"; }; }; in From 1293b0d9e2e87f181271c910f88fd8a5fdcccd02 Mon Sep 17 00:00:00 2001 From: Till Date: Sat, 9 Aug 2025 23:35:38 +0200 Subject: [PATCH 11/33] diesdas --- home/alt.nix | 1 + home/castget/castget.conf | 2 +- home/default.nix | 3 +-- home/minimal.nix | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home/alt.nix b/home/alt.nix index 7ee559e..2179b4e 100644 --- a/home/alt.nix +++ b/home/alt.nix @@ -47,6 +47,7 @@ ./firefox.nix ./foot.nix ./fish.nix + ./home/vifm ./tmux ./nvim ]; diff --git a/home/castget/castget.conf b/home/castget/castget.conf index 07456ba..4ffce92 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -45,6 +45,6 @@ url=https://cdn.julephosting.de/podcasts/573-edeltalk-mit-dominik-kevin/feed.rss album_tag=Edeltalk [*] -id3contenttype=Podcast +genre_tag=Podcast spool=/home/till/.local/share/podcasts filename=%(channel_title)_%(date)_%(title).mp3 diff --git a/home/default.nix b/home/default.nix index 5a96759..6d1cea7 100644 --- a/home/default.nix +++ b/home/default.nix @@ -30,7 +30,6 @@ # media bookworm anki-bin - freetube qbittorrent nicotine-plus @@ -49,6 +48,6 @@ ]; programs.obs-studio.enable = true; - programs.kitty.enable = true; + programs.freetube.enable = true; } diff --git a/home/minimal.nix b/home/minimal.nix index 11d51ec..a2db679 100644 --- a/home/minimal.nix +++ b/home/minimal.nix @@ -31,6 +31,7 @@ fzf jq progress + rename silver-searcher tldr tmux From 66d2dda8ef189aba910d4934392c7bcc103be2fd Mon Sep 17 00:00:00 2001 From: Till Date: Thu, 14 Aug 2025 17:23:02 +0200 Subject: [PATCH 12/33] update --- flake.lock | 18 +++++++++--------- home/castget/castget.conf | 3 +++ system/desktop.nix | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 57bf107..5c8a0c4 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753489912, - "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", + "lastModified": 1754937576, + "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", + "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1753795681, - "narHash": "sha256-8/E4abkmKnsorksl5M/8j0ko6i5e6tE1sq5IEYXy1HY=", + "lastModified": 1755102471, + "narHash": "sha256-ecWsZvrU/v7phSRIulxUYoCZ+i8s+mQ0ecmxxcgHUko=", "owner": "nix-community", "repo": "nur", - "rev": "dad44483eb16c470b1392aa2e88075a1bb16a9e2", + "rev": "94c6c5b9798480dc220ee2cc8b1ce93a472a8d8f", "type": "github" }, "original": { diff --git a/home/castget/castget.conf b/home/castget/castget.conf index 4ffce92..cd4f148 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -44,6 +44,9 @@ album_tag=Wettbrötchen url=https://cdn.julephosting.de/podcasts/573-edeltalk-mit-dominik-kevin/feed.rss album_tag=Edeltalk +[youredeadtome] +url=https://podcasts.files.bbci.co.uk/p07mdbhg.rss + [*] genre_tag=Podcast spool=/home/till/.local/share/podcasts diff --git a/system/desktop.nix b/system/desktop.nix index 16dee08..ac2b55d 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -29,7 +29,7 @@ ]; }; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; services.pipewire = { enable = true; From 328d1ceff2a98e716abe3b1e6ccf98f5a60f555c Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 1 Sep 2025 23:47:10 +0200 Subject: [PATCH 13/33] r --- flake.lock | 24 ++++++++++++------------ home/default.nix | 2 +- home/r.nix | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 5c8a0c4..36887d2 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755102471, - "narHash": "sha256-ecWsZvrU/v7phSRIulxUYoCZ+i8s+mQ0ecmxxcgHUko=", + "lastModified": 1756068343, + "narHash": "sha256-A9oegMNEvmlMYGiEP8n6gUTKOIVsIkhBjMep5E3lYxg=", "owner": "nix-community", "repo": "nur", - "rev": "94c6c5b9798480dc220ee2cc8b1ce93a472a8d8f", + "rev": "52f74f1fac9a23ef7364bb47edcdcfa6fa7f20f4", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 6d1cea7..76af04f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -48,6 +48,6 @@ ]; programs.obs-studio.enable = true; - programs.freetube.enable = true; + # programs.freetube.enable = true; } diff --git a/home/r.nix b/home/r.nix index 7c3694b..b3a636c 100644 --- a/home/r.nix +++ b/home/r.nix @@ -7,7 +7,7 @@ lectuR = pkgs.rPackages.buildRPackage { name = "lectuR"; src = builtins.fetchGit { - url = "ssh://git@ktiu.net/home/git/lectuR/"; + url = "ssh://git@shorbut.ktiu.net/home/git/lectuR/"; ref = "main"; rev = "0aafe4eb057a7ec12b8d6ac40ce0bfc8dab80c2b"; }; @@ -17,7 +17,7 @@ publishR = pkgs.rPackages.buildRPackage { name = "publishR"; src = builtins.fetchGit { - url = "ssh://git@ktiu.net/home/git/publishR/"; + url = "ssh://git@shorbut.ktiu.net/home/git/publishR/"; ref = "main"; rev = "ee137a66ca3b713205ac44e5165292e7ad6388b6"; }; From 8f3637e3636461e677b69e5f6d7c5e524dd7f7e2 Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 1 Sep 2025 23:40:56 +0200 Subject: [PATCH 14/33] fernseher --- flake.nix | 19 +++++++++++++- system/desktop.nix | 4 +-- system/hardware/homer.nix | 54 +++++++++++++++++++++++++++++++++++++++ system/media.nix | 5 ++++ 4 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 system/hardware/homer.nix create mode 100644 system/media.nix diff --git a/flake.nix b/flake.nix index 4ce31de..deada75 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix - ./system/cosmic.nix + # ./system/cosmic.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix @@ -84,6 +84,23 @@ ]; }; + homer = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; + modules = [ + { + networking.hostName = "homer"; + } + ./system + ./system/desktop.nix + ./system/hardware/homer.nix + ./system/gnome.nix + ./system/steam.nix + ./system/media.nix + # ./system/btrbk.nix + ./system/guest.nix + ]; + }; + }; homeConfigurations = { diff --git a/system/desktop.nix b/system/desktop.nix index ac2b55d..c885c95 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -70,8 +70,8 @@ dbus.enable = true; flatpak.enable = true; fwupd.enable = true; - mullvad-vpn.enable = true; - mullvad-vpn.package = pkgs.mullvad-vpn; + # mullvad-vpn.enable = true; + # mullvad-vpn.package = pkgs.mullvad-vpn; printing.enable = true; }; diff --git a/system/hardware/homer.nix b/system/hardware/homer.nix new file mode 100644 index 0000000..60cfdfd --- /dev/null +++ b/system/hardware/homer.nix @@ -0,0 +1,54 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/hardware/network/broadcom-43xx.nix") + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/809e9e9e-ff44-4ecb-8754-e3f2000e5788"; + fsType = "btrfs"; + options = [ "subvol=root" ]; + }; + + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/68a19b7d-358a-419c-9507-1e103526f44a"; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/809e9e9e-ff44-4ecb-8754-e3f2000e5788"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/809e9e9e-ff44-4ecb-8754-e3f2000e5788"; + fsType = "btrfs"; + options = [ "subvol=nix" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/553D-668A"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/system/media.nix b/system/media.nix new file mode 100644 index 0000000..3bf79d1 --- /dev/null +++ b/system/media.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + # programs.steam.enable = true; +} From 261dbdc6c707ea76cce9fcfb823595cf4d5be493 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 2 Sep 2025 09:57:38 +0200 Subject: [PATCH 15/33] media server --- system/hardware/homer.nix | 12 ++++++++++++ system/media.nix | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/system/hardware/homer.nix b/system/hardware/homer.nix index 60cfdfd..464c914 100644 --- a/system/hardware/homer.nix +++ b/system/hardware/homer.nix @@ -40,6 +40,18 @@ options = [ "fmask=0022" "dmask=0022" ]; }; + fileSystems."/var/mediathek" = { + device = "/dev/disk/by-uuid/d6df2368-015f-4da6-9173-c8c7cdc8acc2"; + fsType = "btrfs"; + options = [ # If you don't have this options attribute, it'll default to "defaults" + # boot options for fstab. Search up fstab mount options you can use + "users" # Allows any user to mount and unmount + "nofail" # Prevent system from failing if this drive doesn't mount + "compress=zstd" + "noatime" + ]; + }; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/system/media.nix b/system/media.nix index 3bf79d1..347374d 100644 --- a/system/media.nix +++ b/system/media.nix @@ -1,5 +1,8 @@ { config, pkgs, ... }: { - # programs.steam.enable = true; + services.sonarr.enable = true; + services.radarr.enable = true; + services.flaresolverr.enable = true; + services.prowlarr.enable = true; } From 2826532a6b6fb2e52a8bd727449d11e948aa129c Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 2 Sep 2025 10:10:16 +0200 Subject: [PATCH 16/33] ssh into guest --- system/guest.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/guest.nix b/system/guest.nix index 31b9b71..4d4e88a 100644 --- a/system/guest.nix +++ b/system/guest.nix @@ -10,5 +10,8 @@ "networkmanager" ]; shell = pkgs.fish; + openssh.authorizedKeys.keyFiles = [ + ./ssh/till${"@"}nova.pub + ]; }; } From 508f09b044654335722ad83078ad07aeac608b73 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 2 Sep 2025 21:54:31 +0200 Subject: [PATCH 17/33] ext4 harddrive --- system/hardware/homer.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/system/hardware/homer.nix b/system/hardware/homer.nix index 464c914..136157c 100644 --- a/system/hardware/homer.nix +++ b/system/hardware/homer.nix @@ -41,14 +41,12 @@ }; fileSystems."/var/mediathek" = { - device = "/dev/disk/by-uuid/d6df2368-015f-4da6-9173-c8c7cdc8acc2"; - fsType = "btrfs"; + device = "/dev/disk/by-uuid/7b0b589f-5759-411a-975a-08a3c7a0f953"; + fsType = "ext3"; options = [ # If you don't have this options attribute, it'll default to "defaults" # boot options for fstab. Search up fstab mount options you can use "users" # Allows any user to mount and unmount "nofail" # Prevent system from failing if this drive doesn't mount - "compress=zstd" - "noatime" ]; }; From 287951ed6ec57e87b0be0a4b023b988640b85839 Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 3 Sep 2025 11:45:01 +0200 Subject: [PATCH 18/33] ext hd --- system/hardware/homer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/hardware/homer.nix b/system/hardware/homer.nix index 136157c..a639ace 100644 --- a/system/hardware/homer.nix +++ b/system/hardware/homer.nix @@ -42,7 +42,7 @@ fileSystems."/var/mediathek" = { device = "/dev/disk/by-uuid/7b0b589f-5759-411a-975a-08a3c7a0f953"; - fsType = "ext3"; + fsType = "ext4"; options = [ # If you don't have this options attribute, it'll default to "defaults" # boot options for fstab. Search up fstab mount options you can use "users" # Allows any user to mount and unmount From 18041ffcc892517aeaf320b386020c15489821eb Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 3 Sep 2025 11:46:03 +0200 Subject: [PATCH 19/33] freetube --- home/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/default.nix b/home/default.nix index 76af04f..6d1cea7 100644 --- a/home/default.nix +++ b/home/default.nix @@ -48,6 +48,6 @@ ]; programs.obs-studio.enable = true; - # programs.freetube.enable = true; + programs.freetube.enable = true; } From fd1af2eb40c9121510f9e9a8ff5e8a9e2f30c204 Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 3 Sep 2025 11:49:54 +0200 Subject: [PATCH 20/33] freetube guest --- home/guest.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/guest.nix b/home/guest.nix index c7f43a7..be48dd0 100644 --- a/home/guest.nix +++ b/home/guest.nix @@ -13,6 +13,7 @@ }; programs.home-manager.enable = true; + programs.freetube.enable = true; xdg.userDirs = { enable = true; From 0cc03a0c42acb39e308caec43738d0083efafdb1 Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 3 Sep 2025 11:59:09 +0200 Subject: [PATCH 21/33] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 36887d2..a41490f 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "lastModified": 1756754095, + "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1756068343, - "narHash": "sha256-A9oegMNEvmlMYGiEP8n6gUTKOIVsIkhBjMep5E3lYxg=", + "lastModified": 1756889379, + "narHash": "sha256-3NSHfLMBFSlMFpBdd4/jUfdPCIDA7mcw2m5eKEgVsbU=", "owner": "nix-community", "repo": "nur", - "rev": "52f74f1fac9a23ef7364bb47edcdcfa6fa7f20f4", + "rev": "fc7b109fc7b7bbeacac51fa8f793c48c5442b343", "type": "github" }, "original": { From 83daf4bcf3d8f633789a327e4cfe2a0c61691d88 Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 3 Sep 2025 12:10:11 +0200 Subject: [PATCH 22/33] freetube package --- home/guest.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/guest.nix b/home/guest.nix index be48dd0..a502d2e 100644 --- a/home/guest.nix +++ b/home/guest.nix @@ -13,7 +13,6 @@ }; programs.home-manager.enable = true; - programs.freetube.enable = true; xdg.userDirs = { enable = true; @@ -37,6 +36,7 @@ # mullvad-vpn ffmpeg libnotify + freetube ]; imports = [ From f4c8d2ae8c66f9d38a635f20d71a1506a9a9ef57 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 2 Sep 2025 10:39:27 +0200 Subject: [PATCH 23/33] firefox --- home/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/firefox.nix b/home/firefox.nix index d012897..529518a 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -141,11 +141,11 @@ user_pref("browser.warnOnQuitShortcut", false); user_pref("dom.security.https_only_mode", true); user_pref("extensions.formautofill.creditCards.enabled", false); - user_pref("extensions.pocket.enabled", true); + user_pref("extensions.pocket.enabled", false); user_pref("intl.accept_languages", "de-de,en-us,en"); user_pref("intl.regional_prefs.use_os_locales", true); user_pref("media.eme.enabled", true); - user_pref("network.trr.custom_uri", "https://dns.quad9.net/dns-query "); + user_pref("network.trr.custom_uri", "https://dns.quad9.net/dns-query"); user_pref("network.trr.mode", 2); user_pref("network.trr.uri", "https://dns.quad9.net/dns-query"); user_pref("permissions.default.desktop-notification", 2); From 9c2d059a8c08d80a8eb43945f618a66c40c419e5 Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 15 Sep 2025 17:48:16 +0200 Subject: [PATCH 24/33] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index a41490f..eef201d 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756754095, - "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1756889379, - "narHash": "sha256-3NSHfLMBFSlMFpBdd4/jUfdPCIDA7mcw2m5eKEgVsbU=", + "lastModified": 1757946652, + "narHash": "sha256-PpPoePu9UIJdjtuaQ1xLM8PVqekI2s9im7r3SWgpVtU=", "owner": "nix-community", "repo": "nur", - "rev": "fc7b109fc7b7bbeacac51fa8f793c48c5442b343", + "rev": "9c4ccef96fa4d2411b89a3696d3e871047219b93", "type": "github" }, "original": { From 45c38642acb5c7320acdc1fb56c7bb79821ff8e1 Mon Sep 17 00:00:00 2001 From: Till Date: Thu, 18 Sep 2025 19:08:04 +0200 Subject: [PATCH 25/33] vifm --- home/alt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/alt.nix b/home/alt.nix index 2179b4e..f0179e4 100644 --- a/home/alt.nix +++ b/home/alt.nix @@ -47,7 +47,7 @@ ./firefox.nix ./foot.nix ./fish.nix - ./home/vifm + ./vifm ./tmux ./nvim ]; From 69c3b03c882f11bc8fe5b322c6bcd63e0585ec2e Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 16 Sep 2025 19:37:19 +0200 Subject: [PATCH 26/33] keymapp --- home/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/default.nix b/home/default.nix index 6d1cea7..d0b4778 100644 --- a/home/default.nix +++ b/home/default.nix @@ -35,6 +35,7 @@ # other quickemu + keymapp ]; From 62efd484f1fe0a332563f79a7665d41fda3870ab Mon Sep 17 00:00:00 2001 From: Till Date: Sat, 4 Oct 2025 12:31:17 +0200 Subject: [PATCH 27/33] freetube, fonts, power_save --- home/guest.nix | 4 +++- system/hardware/homer.nix | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/home/guest.nix b/home/guest.nix index a502d2e..b03555d 100644 --- a/home/guest.nix +++ b/home/guest.nix @@ -33,10 +33,11 @@ wl-clipboard qbittorrent vlc + mpv # mullvad-vpn ffmpeg libnotify - freetube + # freetube ]; imports = [ @@ -46,6 +47,7 @@ ./fish.nix ./tmux ./nvim + ./fonts.nix ]; programs.nix-index = { diff --git a/system/hardware/homer.nix b/system/hardware/homer.nix index a639ace..305cffa 100644 --- a/system/hardware/homer.nix +++ b/system/hardware/homer.nix @@ -13,6 +13,9 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + boot.extraModprobeConfig = '' + options snd_hda_intel power_save=0 + ''; fileSystems."/" = { device = "/dev/disk/by-uuid/809e9e9e-ff44-4ecb-8754-e3f2000e5788"; From 9bb902d7567bb97115d719988352b4ade7d4d25f Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 15 Sep 2025 17:50:39 +0200 Subject: [PATCH 28/33] media server --- system/media.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/system/media.nix b/system/media.nix index 347374d..bcccd09 100644 --- a/system/media.nix +++ b/system/media.nix @@ -1,8 +1,21 @@ { config, pkgs, ... }: { - services.sonarr.enable = true; - services.radarr.enable = true; + services.sonarr = { + enable = true; + group = "media"; + }; + services.radarr = { + enable = true; + group = "media"; + }; + services.flaresolverr.enable = true; services.prowlarr.enable = true; + services.bazarr.enable = true; + + users.groups.media = {}; + + users.users.guest.extraGroups = [ "media" "wheel" ]; + users.users.sonarr.extraGroups = [ "media" ]; } From 3597c5046e0827770ec721186a6e5fd9c75935ae Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 8 Oct 2025 18:20:01 +0200 Subject: [PATCH 29/33] solanum is it --- home/default.nix | 1 + home/gnome/default.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/home/default.nix b/home/default.nix index d0b4778..721210e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -36,6 +36,7 @@ # other quickemu keymapp + gnome-solanum ]; diff --git a/home/gnome/default.nix b/home/gnome/default.nix index a447ab7..d51ab82 100644 --- a/home/gnome/default.nix +++ b/home/gnome/default.nix @@ -11,7 +11,6 @@ run-or-raise removable-drive-menu system-monitor - app-icons-taskbar ]; dconf.settings = { From 4e590e6be84918f8ee8f07dc250662dfaf98eaee Mon Sep 17 00:00:00 2001 From: Till Date: Sun, 12 Oct 2025 12:59:53 +0200 Subject: [PATCH 30/33] do not lock when removing yubikey --- home/nvim/test.md | 0 system/yubikey.nix | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 home/nvim/test.md diff --git a/home/nvim/test.md b/home/nvim/test.md deleted file mode 100644 index e69de29..0000000 diff --git a/system/yubikey.nix b/system/yubikey.nix index f9a4406..1856e2f 100644 --- a/system/yubikey.nix +++ b/system/yubikey.nix @@ -3,14 +3,14 @@ { services.udev = { packages = [ pkgs.yubikey-personalization ]; - extraRules = '' - ACTION=="remove",\ - ENV{ID_BUS}=="usb",\ - ENV{ID_MODEL_ID}=="0407",\ - ENV{ID_VENDOR_ID}=="1050",\ - ENV{ID_VENDOR}=="Yubico",\ - RUN+="${pkgs.systemd}/bin/loginctl lock-sessions" - ''; + # extraRules = '' + # ACTION=="remove",\ + # ENV{ID_BUS}=="usb",\ + # ENV{ID_MODEL_ID}=="0407",\ + # ENV{ID_VENDOR_ID}=="1050",\ + # ENV{ID_VENDOR}=="Yubico",\ + # RUN+="${pkgs.systemd}/bin/loginctl lock-sessions" + # ''; }; security.pam.services = { login.u2fAuth = true; From 049c8cca9de5aca19512aa00fe529cf6022b20c3 Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 13 Oct 2025 16:21:42 +0200 Subject: [PATCH 31/33] ergodox flashing tool --- flake.nix | 2 +- system/ergodox.nix | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 system/ergodox.nix diff --git a/flake.nix b/flake.nix index deada75..570e38e 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix - # ./system/cosmic.nix + ./system/ergodox.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix diff --git a/system/ergodox.nix b/system/ergodox.nix new file mode 100644 index 0000000..bd4e09d --- /dev/null +++ b/system/ergodox.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + services.udev = { + extraRules = '' + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="wheel" + ''; + }; +} From 47b11c510d0c711738d772786a11ce5aa7124e13 Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 13 Oct 2025 16:26:38 +0200 Subject: [PATCH 32/33] isolated dex --- system/web-server/dex.nix | 54 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 system/web-server/dex.nix diff --git a/system/web-server/dex.nix b/system/web-server/dex.nix new file mode 100644 index 0000000..1708e36 --- /dev/null +++ b/system/web-server/dex.nix @@ -0,0 +1,54 @@ +{ config, pkgs, ... }: + +let + + dex = { + hostname = "dex.${config.networking.domain}"; + }; + +in { + + services.dex = { + enable = true; + environmentFile = "/var/custom-access/dex-environemnt"; + settings = { + issuer = "https://${dex.hostname}"; + storage.type = "sqlite3"; + web.http = "127.0.0.1:5556"; + staticClients = [ + { + id = "outline"; + name = "Outline Client"; + redirectURIs = [ "https://${outline.hostname}/auth/oidc.callback" ]; + secretFile = "/var/custom-access/outline-oidc-secret.txt"; + } + ]; + enablePasswordDB = true; + # staticPasswords = [ + # { + # email = "till@ktiu.net"; + # # gen hash with $ htpasswd -nBC 10 "" | tr -d ':\n' + # hash = ""; + # username = "bootstrap-admin"; + # # $ uuidgen + # userID = ""; + # } + # ]; + }; + }; + + security.acme.certs."${config.networking.domain}".extraDomainNames = [ + "dex.${config.networking.domain}" + ]; + + services.nginx.virtualHosts = { + "dex.${config.networking.domain}" = { + onlySSL = true; + useACMEHost = config.networking.domain; + locations."/" = { + proxyPass = "http://${config.services.dex.settings.web.http}"; + proxyWebsockets = true; + }; + }; + }; +} From 2970491f62bca3b1fc57cb66e2cc09319fe44edd Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 13 Oct 2025 16:27:07 +0200 Subject: [PATCH 33/33] update map, outline --- system/web-server/ksh-map.nix | 2 +- system/web-server/outline.nix | 43 ----------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/system/web-server/ksh-map.nix b/system/web-server/ksh-map.nix index 1377262..a0b9e73 100644 --- a/system/web-server/ksh-map.nix +++ b/system/web-server/ksh-map.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - services.nginx.virtualHosts."karte.nichtzudritt.de" = { + services.nginx.virtualHosts."kshmap.ktiu.net" = { forceSSL = true; enableACME = true; root = "/var/www/ksh-map/dist"; diff --git a/system/web-server/outline.nix b/system/web-server/outline.nix index 7a2b699..e2f5cee 100644 --- a/system/web-server/outline.nix +++ b/system/web-server/outline.nix @@ -7,11 +7,6 @@ let mail = "outline@${config.networking.domain}"; }; - # bootstrapping only - # dex = { - # hostname = "dex.${config.networking.domain}"; - # }; - in { services.outline = { @@ -42,38 +37,8 @@ in { # }; }; - # services.dex = { - # enable = true; - # environmentFile = "/var/custom-access/dex-environemnt"; - # settings = { - # issuer = "https://${dex.hostname}"; - # storage.type = "sqlite3"; - # web.http = "127.0.0.1:5556"; - # staticClients = [ - # { - # id = "outline"; - # name = "Outline Client"; - # redirectURIs = [ "https://${outline.hostname}/auth/oidc.callback" ]; - # secretFile = "/var/custom-access/outline-oidc-secret.txt"; - # } - # ]; - # enablePasswordDB = true; - # staticPasswords = [ - # { - # email = "till@ktiu.net"; - # # gen hash with $ htpasswd -nBC 10 "" | tr -d ':\n' - # hash = ""; - # username = "bootstrap-admin"; - # # $ uuidgen - # userID = ""; - # } - # ]; - # }; - # }; - security.acme.certs."${config.networking.domain}".extraDomainNames = [ "outline.${config.networking.domain}" - # "dex.${config.networking.domain}" ]; services.nginx.virtualHosts = { @@ -89,13 +54,5 @@ in { }; }; - # "dex.${config.networking.domain}" = { - # onlySSL = true; - # useACMEHost = config.networking.domain; - # locations."/" = { - # proxyPass = "http://${config.services.dex.settings.web.http}"; - # proxyWebsockets = true; - # }; - # }; }; }