From 87baf57aa3ce6bc913d2669b840d072473a1f497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Sat, 24 May 2025 21:24:20 +0200 Subject: [PATCH] chore: update flake --- SwarselSystems.org | 147 +++++++----- flake.lock | 283 +++++++++++------------ flake.nix | 3 +- hosts/home/default/default.nix | 2 +- index.html | 357 ++++++++++++++++------------- modules/home/common/gpg-agent.nix | 2 +- modules/home/common/mako.nix | 50 ++-- modules/home/common/packages.nix | 2 +- modules/home/common/zsh.nix | 2 +- modules/nixos/optional/work.nix | 32 +-- modules/nixos/server/matrix.nix | 1 + modules/nixos/server/restic.nix | 2 +- modules/nixos/server/syncthing.nix | 20 +- overlays/default.nix | 10 +- 14 files changed, 497 insertions(+), 416 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index 949daef..357554b 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -235,7 +235,8 @@ When setting this option normally, the password would normally be written world- #+begin_src nix :tangle no :noweb-ref flakeinputs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs-stable24_05.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable24_11.url = "github:NixOS/nixpkgs/nixos-24.11"; systems.url = "github:nix-systems/default-linux"; home-manager = { @@ -1778,7 +1779,7 @@ This is the "reference implementation" of a setup that runs without NixOS, only }; }; - programs.zsh.initExtra = " + programs.zsh.initContent = " export GPG_TTY=\"$(tty)\" export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent @@ -3678,7 +3679,14 @@ When adding a new entry here, do not forget to add it in the default output of t }; nixpkgs-stable24_05 = final: _: { - stable24_05 = import inputs.nixpkgs-stable { + stable24_05 = import inputs.nixpkgs-stable24_05 { + inherit (final) system; + config.allowUnfree = true; + }; + }; + + nixpkgs-stable24_11 = final: _: { + stable24_11 = import inputs.nixpkgs-stable24_11 { inherit (final) system; config.allowUnfree = true; }; @@ -3697,6 +3705,7 @@ When adding a new entry here, do not forget to add it in the default output of t // (modifications final prev) // (nixpkgs-stable final prev) // (nixpkgs-stable24_05 final prev) + // (nixpkgs-stable24_11 final prev) // (zjstatus final prev) // (inputs.vbc-nix.overlays.default final prev) // (inputs.nur.overlays.default final prev) @@ -7113,6 +7122,7 @@ Here we just define some aliases for rebuilding the system, and we allow some in mautrix-telegram = { enable = true; environmentFile = config.sops.templates.mautrixtelegram.path; + registerToSynapse = false; settings = { homeserver = { address = "http://localhost:8008"; @@ -7690,16 +7700,16 @@ Here we just define some aliases for rebuilding the system, and we allow some in devices = [ "sync (@oracle)" "magicant" "${workHostName}" ]; id = "hgp9s-fyq3p"; }; - # "Documents" = { - # path = "/Vault/data/syncthing/Documents"; - # type = "receiveonly"; - # versioning = { - # type = "simple"; - # params.keep = "5"; - # }; - # devices = [ "magicant" "${workHostName}" ]; - # id = "hgr3d-pfu3w"; - # }; + "Documents" = { + path = "/Vault/data/syncthing/Documents"; + type = "receiveonly"; + versioning = { + type = "simple"; + params.keep = "5"; + }; + devices = [ "magicant" "${workHostName}" ]; + id = "hgr3d-pfu3w"; + }; # ".elfeed" = { # path = "/Vault/data/syncthing/.elfeed"; # devices = [ "sync (@oracle)" "magicant" "${workHostName}" ]; @@ -7757,7 +7767,7 @@ Once this is finished, it will house a restic client that manages automatic back templates = { "restic-env".content = '' AWS_ACCESS_KEY_ID=${config.sops.placeholder.resticaccesskey} - AWS_SECRET_ACCESS_KEY=${config.sops.placeholder.resicsecretaccesskey} + AWS_SECRET_ACCESS_KEY=${config.sops.placeholder.resticsecretaccesskey} ''; }; }; @@ -8510,7 +8520,7 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9 #+begin_src nix :tangle modules/nixos/optional/work.nix { self, lib, pkgs, config, ... }: let - inherit (config.swarselsystems) mainUser xdgDir; + inherit (config.swarselsystems) mainUser homeDir xdgDir; owner = mainUser; sopsFile = self + /secrets/work/secrets.yaml; swarselService = name: description: execStart: { @@ -8647,7 +8657,7 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9 # cryptography # ])) # docker - stable.python39 + stable24_11.python39 qemu packer gnumake @@ -8678,20 +8688,20 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9 ''; }; - # syncthing = { - # settings = { - # "winters" = { - # id = "O7RWDMD-AEAHPP7-7TAVLKZ-BSWNBTU-2VA44MS-EYGUNBB-SLHKB3C-ZSLMOAA"; - # }; - # folders = { - # "Documents" = { - # path = "${homeDir}/Documents"; - # devices = [ "magicant" "winters" ]; - # id = "hgr3d-pfu3w"; - # }; - # }; - # }; - # }; + syncthing = { + settings = { + "winters" = { + id = "O7RWDMD-AEAHPP7-7TAVLKZ-BSWNBTU-2VA44MS-EYGUNBB-SLHKB3C-ZSLMOAA"; + }; + folders = { + "Documents" = { + path = "${homeDir}/Documents"; + devices = [ "magicant" "winters" ]; + id = "hgr3d-pfu3w"; + }; + }; + }; + }; udev.extraRules = '' # share screen when dongle detected @@ -9278,7 +9288,7 @@ This holds packages that I can use as provided, or with small modifications (as vim sshfs fuse - ventoy + # ventoy poppler_utils vdhcoapp @@ -10192,6 +10202,27 @@ zsh is the most convenient shell for me and it happens to be super neat to confi Here we set some aliases (some of them should be shellApplications instead) as well as some zsh plugins like =fzf-tab=. Concerning the shell extensions, =zle = will run an existing widget and =zle -N = will make a function available for use. The =my-= functions all remove =.= =/= and =:= from the =WORDCHARS= so that functions will stop there. The keycodes can be found using =showkeys -a= +Regarding =initContent=: +To specify the order, use lib.mkOrder. + +Common order values: +- 500 (mkBefore: Early initialization (replaces initExtraFirst +- 550: Before completion initialization (replaces initExtraBeforeCompInit +- 1000 (default: General configuration (replaces initExtra +- 1500 (mkAfter: Last to run configuration + +To specify both content in Early initialization and General configuration, use lib.mkMerge: + +#+begin_src nix +initContent = let +zshConfigEarlyInit = lib.mkOrder 500 "do something"; +zshConfig = lib.mkOrder 1000 "do something"; +in +lib.mkMerge [ zshConfigEarlyInit zshConfig ]; +#+end_src + +Currently I only use it as before with =initExtra= though. + #+begin_src nix :tangle modules/home/common/zsh.nix { config, pkgs, lib, ... }: let @@ -10267,7 +10298,7 @@ Concerning the shell extensions, =zle = will run an existing widget src = pkgs.zsh-fzf-tab; } ]; - initExtra = '' + initContent = '' my-forward-word() { local WORDCHARS=$WORDCHARS WORDCHARS="''${WORDCHARS//:}" @@ -11252,31 +11283,31 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi config = lib.mkIf config.swarselsystems.modules.mako { services.mako = { enable = true; - # backgroundColor = "#2e3440"; - # borderColor = "#88c0d0"; - borderRadius = 15; - borderSize = 1; - defaultTimeout = 5000; - height = 150; - icons = true; - ignoreTimeout = true; - layer = "overlay"; - maxIconSize = 64; - sort = "-time"; - width = 300; - # font = "monospace 10"; - extraConfig = '' - [urgency=low] - border-color=#cccccc - [urgency=normal] - border-color=#d08770 - [urgency=high] - border-color=#bf616a - default-timeout=3000 - [category=mpd] - default-timeout=2000 - group-by=category - ''; + settings = { + border-radius = 15; + border-size = 1; + default-timeout = 5000; + ignore-timeout = 1; + icons = 1; + layer = "overlay"; + sort = "-time"; + height = 150; + width = 300; + "urgency=low" = { + border-color = lib.mkForce "#cccccc"; + }; + "urgency=normal" = { + border-color = lib.mkForce "#d08770"; + }; + "urgency=high" = { + border-color = lib.mkForce "#bf616a"; + default-timeout = 3000; + }; + "category=mpd" = { + default-timeout = 2000; + group-by = "category"; + }; + }; }; }; @@ -11873,7 +11904,7 @@ Settinfs that are needed for the gpg-agent. Also we are enabling emacs support f enableScDaemon = true; enableSshSupport = true; enableExtraSocket = true; - pinentryPackage = pkgs.pinentry.gtk2; + pinentry.package = pkgs.pinentry.gtk2; defaultCacheTtl = 600; maxCacheTtl = 7200; extraConfig = '' diff --git a/flake.lock b/flake.lock index 73c688c..cf0fd72 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "crane": { "locked": { - "lastModified": 1741148495, - "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1744940522, - "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1744967866, - "narHash": "sha256-jWHOSSZ03R1Dvru5rXEForMgkV1RAsCd+IjMmehpmFg=", + "lastModified": 1748107096, + "narHash": "sha256-PmQY/yDSlxxma3RBW2v+yWSvpJTubcmXUdoAlaJv7Dk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c54fd7dc3e696136c8257abfe12815274b42660e", + "rev": "5e55769b7a39ab810f761874aff5787c74e981da", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "flake-compat_3": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -332,7 +332,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -384,27 +383,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems_5" }, @@ -576,16 +554,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -597,11 +575,11 @@ ] }, "locked": { - "lastModified": 1744919155, - "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -639,11 +617,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1747763032, + "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "type": "github" }, "original": { @@ -677,11 +655,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741442524, - "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", + "lastModified": 1747056319, + "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", + "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", "type": "github" }, "original": { @@ -697,11 +675,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1744704014, - "narHash": "sha256-UGq8nYSq/feyP0bUjd88jHXA7wJMaSPbtRByp7ZOD30=", + "lastModified": 1747908601, + "narHash": "sha256-cSzec5IT7Imx9g+Rhpt4GxrLiNF++V+guzYCnWUjhAI=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "9b92bd3b3d54e02aa0b1881af435802567c2dca9", + "rev": "798541edff98cfa895941abe35f3e056f319a193", "type": "github" }, "original": { @@ -717,11 +695,11 @@ ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1748065210, + "narHash": "sha256-dFqlLNW6UW19m0vg5FHWLH2G2LGkqYyPs/4YqfoZMoM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "acd6aa5a9065c6695212be313e06f08f7184cb25", "type": "github" }, "original": { @@ -761,11 +739,11 @@ ] }, "locked": { - "lastModified": 1744518957, - "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", + "lastModified": 1746934494, + "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", + "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", "type": "github" }, "original": { @@ -781,11 +759,11 @@ ] }, "locked": { - "lastModified": 1744518957, - "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -823,10 +801,10 @@ "nix-secrets": { "flake": false, "locked": { - "lastModified": 1742682980, - "narHash": "sha256-oHqbNiTdpGrOtZtu1UAMjOteEPEDJTolTh/cNqgj2HM=", + "lastModified": 1748102838, + "narHash": "sha256-o8ACYonrWdDSbb30v1xUhl8BuYuLJsAYH9VMRJ/HSKY=", "ref": "main", - "rev": "b9e7aa2f01b68aa186271a1c0db722049fa14c17", + "rev": "3c3d7b593f4b295a1cdf8c4448b4c7ff6c5614ab", "shallow": true, "type": "git", "url": "ssh://git@github.com/Swarsel/nix-secrets.git" @@ -901,11 +879,11 @@ ] }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1747663185, + "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", "type": "github" }, "original": { @@ -916,11 +894,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -932,11 +910,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741241576, - "narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=", + "lastModified": 1746916775, + "narHash": "sha256-TGHTAbjauY7kK8tX8HdFh0A9eXhiRIbwZH6vBHLsofc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffe8d1b1030b5de6eba761102ee34b6e41d040ee", + "rev": "7fb53a7bf9a07f97c34910aa45388083c67751e9", "type": "github" }, "original": { @@ -992,11 +970,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -1006,13 +984,29 @@ "type": "github" } }, - "nixpkgs-stable24_11": { + "nixpkgs-stable24_05": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable24_11": { + "locked": { + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -1024,16 +1018,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1747953325, + "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -1056,11 +1050,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { @@ -1103,11 +1097,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -1135,11 +1129,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -1151,11 +1145,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -1167,11 +1161,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -1261,11 +1255,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744971000, - "narHash": "sha256-WwJZZ1ChbwUWzsZWA4rUvWaISrZ9/+OB2qc3XZbbjTg=", + "lastModified": 1748108751, + "narHash": "sha256-3nny7VjOFPC3geBCQj59qQdKoYE8+bf+tc48YPEL8QU=", "owner": "nix-community", "repo": "NUR", - "rev": "c2d387e6f9e895853816a13d5c84f05f0675e1ea", + "rev": "65f929e6e23929e6da5fa6b95ac3c5c4e43d6216", "type": "github" }, "original": { @@ -1276,7 +1270,10 @@ }, "nur_2": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -1284,11 +1281,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1743884191, - "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -1337,11 +1334,11 @@ ] }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -1359,11 +1356,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -1391,6 +1388,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable24_05": "nixpkgs-stable24_05", "nixpkgs-stable24_11": "nixpkgs-stable24_11", "nswitch-rcm-nix": "nswitch-rcm-nix", "nur": "nur", @@ -1410,11 +1408,11 @@ ] }, "locked": { - "lastModified": 1741228283, - "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", + "lastModified": 1747017456, + "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", + "rev": "5b07506ae89b025b14de91f697eba23b48654c52", "type": "github" }, "original": { @@ -1465,11 +1463,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -1486,7 +1484,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_3", + "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", @@ -1500,11 +1498,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744910471, - "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=", + "lastModified": 1748028561, + "narHash": "sha256-IgtJU6n9vR3nBUdcXrc7K9E+Y/G/4P6hFifGRr1tXMU=", "owner": "danth", "repo": "stylix", - "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51", + "rev": "34b5930894d8315401d93bd8a9a6635e1cd28eff", "type": "github" }, "original": { @@ -1608,28 +1606,27 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1742851696, - "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -1641,11 +1638,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -1738,16 +1735,16 @@ "zjstatus": { "inputs": { "crane": "crane_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1743838985, - "narHash": "sha256-7fmg1fPEJWdCrw2QsanIAA0TT10IvUImZyWbvoSPebA=", + "lastModified": 1745230073, + "narHash": "sha256-OER99U7MiqQ47myvbsiljsax7OsK19NMds4NBM9XXLs=", "owner": "dj95", "repo": "zjstatus", - "rev": "d27f0819903b5f31d527affa875c71cb5c2a8578", + "rev": "a819e3bfe6bfef0438d811cdbb1bcfdc29912c62", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bea27c7..25133aa 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs-stable24_05.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable24_11.url = "github:NixOS/nixpkgs/nixos-24.11"; systems.url = "github:nix-systems/default-linux"; home-manager = { diff --git a/hosts/home/default/default.nix b/hosts/home/default/default.nix index 805e16f..5380d3b 100644 --- a/hosts/home/default/default.nix +++ b/hosts/home/default/default.nix @@ -23,7 +23,7 @@ }; }; - programs.zsh.initExtra = " + programs.zsh.initContent = " export GPG_TTY=\"$(tty)\" export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent diff --git a/index.html b/index.html index 2f2272c..52dc083 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + SwarselSystems: NixOS + Emacs Configuration @@ -263,9 +263,9 @@
  • 3.1.4.3. Home-manager only (default non-NixOS)
  • 3.1.4.4. ChaosTheatre (Demo Physical/VM)
    • @@ -305,7 +305,7 @@
  • 3.2.1.27. fhs
  • 3.2.1.28. swarsel-displaypower
  • 3.2.1.29. swarsel-mgba
    • -
  • 3.2.1.30. sshrm
    • +
  • 3.2.1.30. sshrm
  • 3.2.2. Overlays (additions, overrides, nixpkgs-stable)
    • @@ -313,28 +313,28 @@ @@ -379,7 +379,7 @@
  • 3.3.1.22.3. enable GVfs
  • 3.3.1.22.4. interception-tools: Make CAPS work as ESC/CTRL
  • 3.3.1.22.5. power-profiles-daemon
    • -
  • 3.3.1.22.6. SwayOSD
    • +
  • 3.3.1.22.6. SwayOSD
  • 3.3.1.23. Hardware compatibility settings (Yubikey, Ledger, Keyboards) - udev rules @@ -445,11 +445,11 @@
  • 3.3.4.3. VmWare
  • 3.3.4.4. Auto-login
  • 3.3.4.5. nswitch-rcm
    • -
  • 3.3.4.6. Framework
    • -
  • 3.3.4.7. AMD CPU
    • -
  • 3.3.4.8. AMD GPU
    • -
  • 3.3.4.9. Hibernation
    • -
  • 3.3.4.10. BTRFS
    • +
  • 3.3.4.6. Framework
    • +
  • 3.3.4.7. AMD CPU
    • +
  • 3.3.4.8. AMD GPU
    • +
  • 3.3.4.9. Hibernation
    • +
  • 3.3.4.10. BTRFS
  • 3.3.4.11. work
  • 3.3.4.12. Minimal Install
    • @@ -498,7 +498,7 @@
  • 3.4.1.29.1. gnome-keyring
  • 3.4.1.29.2. KDE Connect
  • 3.4.1.29.3. Mako
    • -
  • 3.4.1.29.4. SwayOSD
    • +
  • 3.4.1.29.4. SwayOSD
  • 3.4.1.29.5. yubikey-touch-detector
    • @@ -523,7 +523,7 @@ @@ -701,7 +701,7 @@ @@ -710,7 +710,7 @@

    -This file has 62656 words spanning 16427 lines and was last revised on 2025-05-24 18:24:21 +0200. +This file has 62776 words spanning 16458 lines and was last revised on 2025-05-24 21:14:33 +0200.

    @@ -763,7 +763,7 @@ This section defines my Emacs configuration. For a while, I considered to use ry

    -My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-05-24 18:24:21 +0200) +My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-05-24 21:14:33 +0200)

    @@ -775,7 +775,7 @@ system-configuration-options 
    ---prefix=/nix/store/igrpvvdnwx413916cslyl8g2dwqa6aq3-emacs-git-pgtk-20250418.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets --with-dbus --with-selinux
+--prefix=/nix/store/hwf3ap27kzhi83zfdbdps1xz771lnfgm-emacs-git-pgtk-20250524.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets --with-dbus --with-selinux
    @@ -890,7 +890,8 @@ In outputs = inputs@ [...], the inputs@ makes it so th inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs-stable24_05.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable24_11.url = "github:NixOS/nixpkgs/nixos-24.11"; systems.url = "github:nix-systems/default-linux"; home-manager = { @@ -1151,7 +1152,8 @@ This automatically creates a topology diagram of my configuration. 
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
+nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
+nixpkgs-stable24_05.url = "github:NixOS/nixpkgs/nixos-24.05";
 nixpkgs-stable24_11.url = "github:NixOS/nixpkgs/nixos-24.11";
 systems.url = "github:nix-systems/default-linux";
 home-manager = {
@@ -2770,7 +2772,7 @@ This is the "reference implementation" of a setup that runs without NixOS, only
     };
   };
 
-  programs.zsh.initExtra = "
+  programs.zsh.initContent = "
   export GPG_TTY=\"$(tty)\"
   export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
   gpgconf --launch gpg-agent
@@ -2800,8 +2802,8 @@ This is just a demo host. It applies all the configuration found in the common p
 I also set the WLR_RENDERER_ALLOW_SOFTWARE=1 to allow this configuration to run in a virtualized environment. I also enable qemuGuest for a smoother experience when testing on QEMU.
    -
    -
    3.1.4.4.1. Main configuration
    +
    +
    3.1.4.4.1. Main configuration
    { self, inputs, config, pkgs, lib, primaryUser, ... }:
@@ -2880,8 +2882,8 @@ in
    -
    -
    3.1.4.4.2. NixOS dummy options configuration
    +
    +
    3.1.4.4.2. NixOS dummy options configuration
    _:
@@ -2891,8 +2893,8 @@ in
    -
    -
    3.1.4.4.3. home-manager dummy options configuration
    +
    +
    3.1.4.4.3. home-manager dummy options configuration
    _:
@@ -4669,8 +4671,8 @@ appimageTools.wrapType2 {
    -
    -
    3.2.1.30. sshrm
    +
    +
    3.2.1.30. sshrm

    This programs simply runs ssh-keygen on the last host that I tried to ssh into. I need this frequently when working with cloud-init usually. @@ -4758,7 +4760,14 @@ let }; nixpkgs-stable24_05 = final: _: { - stable24_05 = import inputs.nixpkgs-stable { + stable24_05 = import inputs.nixpkgs-stable24_05 { + inherit (final) system; + config.allowUnfree = true; + }; + }; + + nixpkgs-stable24_11 = final: _: { + stable24_11 = import inputs.nixpkgs-stable24_11 { inherit (final) system; config.allowUnfree = true; }; @@ -4777,6 +4786,7 @@ in // (modifications final prev) // (nixpkgs-stable final prev) // (nixpkgs-stable24_05 final prev) + // (nixpkgs-stable24_11 final prev) // (zjstatus final prev) // (inputs.vbc-nix.overlays.default final prev) // (inputs.nur.overlays.default final prev) @@ -4819,8 +4829,8 @@ in

    -
    -
    3.2.3.1.1. Personal
    +
    +
    3.2.3.1.1. Personal
    { lib, config, ... }:
@@ -4887,8 +4897,8 @@ in
    -
    -
    3.2.3.1.2. Chaostheatre
    +
    +
    3.2.3.1.2. Chaostheatre
    { lib, config, ... }:
@@ -4952,8 +4962,8 @@ in
    -
    -
    3.2.3.1.3. toto
    +
    +
    3.2.3.1.3. toto
    { lib, config, ... }:
@@ -4985,8 +4995,8 @@ in
    -
    -
    3.2.3.1.4. Work
    +
    +
    3.2.3.1.4. Work
    { lib, config, ... }:
@@ -5007,8 +5017,8 @@ in
    -
    -
    3.2.3.1.5. Framework
    +
    +
    3.2.3.1.5. Framework
    { lib, config, ... }:
@@ -5029,8 +5039,8 @@ in
    -
    -
    3.2.3.1.6. AMD CPU
    +
    +
    3.2.3.1.6. AMD CPU
    { lib, config, ... }:
@@ -5051,8 +5061,8 @@ in
    -
    -
    3.2.3.1.7. AMD GPU
    +
    +
    3.2.3.1.7. AMD GPU
    { lib, config, ... }:
@@ -5073,8 +5083,8 @@ in
    -
    -
    3.2.3.1.8. Hibernation
    +
    +
    3.2.3.1.8. Hibernation
    { lib, config, ... }:
@@ -5095,8 +5105,8 @@ in
    -
    -
    3.2.3.1.9. BTRFS
    +
    +
    3.2.3.1.9. BTRFS
    { lib, config, ... }:
@@ -5117,8 +5127,8 @@ in
    -
    -
    3.2.3.1.10. Local Server
    +
    +
    3.2.3.1.10. Local Server
    { lib, config, ... }:
@@ -5169,8 +5179,8 @@ in
    -
    -
    3.2.3.1.11. OCI Sync Server
    +
    +
    3.2.3.1.11. OCI Sync Server
    { lib, config, ... }:
@@ -5227,8 +5237,8 @@ in
    -
    -
    3.2.3.2.1. Personal
    +
    +
    3.2.3.2.1. Personal
    { lib, config, ... }:
@@ -5285,8 +5295,8 @@ in
    -
    -
    3.2.3.2.2. Chaostheatre
    +
    +
    3.2.3.2.2. Chaostheatre
    { lib, config, ... }:
@@ -5338,8 +5348,8 @@ in
    -
    -
    3.2.3.2.3. toto
    +
    +
    3.2.3.2.3. toto
    { lib, config, ... }:
@@ -5359,8 +5369,8 @@ in
    -
    -
    3.2.3.2.4. Work
    +
    +
    3.2.3.2.4. Work
    { lib, config, ... }:
@@ -5380,8 +5390,8 @@ in
    -
    -
    3.2.3.2.5. Framework
    +
    +
    3.2.3.2.5. Framework
    { lib, config, ... }:
@@ -5402,8 +5412,8 @@ in
    -
    -
    3.2.3.2.6. Darwin
    +
    +
    3.2.3.2.6. Darwin
    { lib, config, ... }:
@@ -5421,8 +5431,8 @@ in
    -
    -
    3.2.3.2.7. Local Server
    +
    +
    3.2.3.2.7. Local Server
    { lib, config, ... }:
@@ -6955,8 +6965,8 @@ Most of the time I am using power-saver, however, it is good to be
    -
    -
    3.3.1.22.6. SwayOSD
    +
    +
    3.3.1.22.6. SwayOSD
    { lib, pkgs, config, ... }:
@@ -8402,6 +8412,7 @@ in
       mautrix-telegram = {
         enable = true;
         environmentFile = config.sops.templates.mautrixtelegram.path;
+        registerToSynapse = false;
         settings = {
           homeserver = {
             address = "http://localhost:8008";
@@ -8979,16 +8990,16 @@ in
             devices = [ "sync (@oracle)" "magicant" "${workHostName}" ];
             id = "hgp9s-fyq3p";
           };
-          # "Documents" = {
-          #   path = "/Vault/data/syncthing/Documents";
-          #   type = "receiveonly";
-          #   versioning = {
-          #     type = "simple";
-          #     params.keep = "5";
-          #   };
-          #   devices = [ "magicant" "${workHostName}" ];
-          #   id = "hgr3d-pfu3w";
-          # };
+          "Documents" = {
+            path = "/Vault/data/syncthing/Documents";
+            type = "receiveonly";
+            versioning = {
+              type = "simple";
+              params.keep = "5";
+            };
+            devices = [ "magicant" "${workHostName}" ];
+            id = "hgr3d-pfu3w";
+          };
           # ".elfeed" = {
           #   path = "/Vault/data/syncthing/.elfeed";
           #   devices = [ "sync (@oracle)" "magicant" "${workHostName}" ];
@@ -9048,7 +9059,7 @@ in
       templates = {
         "restic-env".content = ''
           AWS_ACCESS_KEY_ID=${config.sops.placeholder.resticaccesskey}
-          AWS_SECRET_ACCESS_KEY=${config.sops.placeholder.resicsecretaccesskey}
+          AWS_SECRET_ACCESS_KEY=${config.sops.placeholder.resticsecretaccesskey}
         '';
       };
     };
@@ -9706,8 +9717,8 @@ This smashes Atmosphere 1.3.2 on the switch, which is what I am currenty using.
    -
    -
    3.3.4.6. Framework
    +
    +
    3.3.4.6. Framework

    This holds configuration that is specific to framework laptops. @@ -9745,8 +9756,8 @@ This holds configuration that is specific to framework laptops.

    -
    -
    3.3.4.7. AMD CPU
    +
    +
    3.3.4.7. AMD CPU
    { lib, config, ... }:
@@ -9762,8 +9773,8 @@ This holds configuration that is specific to framework laptops.
    -
    -
    3.3.4.8. AMD GPU
    +
    +
    3.3.4.8. AMD GPU
    { lib, config, ... }:
@@ -9785,8 +9796,8 @@ This holds configuration that is specific to framework laptops.
    -
    -
    3.3.4.9. Hibernation
    +
    +
    3.3.4.9. Hibernation
    { lib, config, ... }:
@@ -9817,8 +9828,8 @@ This holds configuration that is specific to framework laptops.
    -
    -
    3.3.4.10. BTRFS
    +
    +
    3.3.4.10. BTRFS
    { lib, config, ... }:
@@ -9844,7 +9855,7 @@ Options that I need specifically at work. There are more options at 
 
    { self, lib, pkgs, config, ... }:
 let
-  inherit (config.swarselsystems) mainUser xdgDir;
+  inherit (config.swarselsystems) mainUser homeDir xdgDir;
   owner = mainUser;
   sopsFile = self + /secrets/work/secrets.yaml;
   swarselService = name: description: execStart: {
@@ -9981,7 +9992,7 @@ in
       # cryptography
       # ]))
       #   docker
-      stable.python39
+      stable24_11.python39
       qemu
       packer
       gnumake
@@ -10012,20 +10023,20 @@ in
                           '';
       };
 
-      # syncthing = {
-      #   settings = {
-      #     "winters" = {
-      #       id = "O7RWDMD-AEAHPP7-7TAVLKZ-BSWNBTU-2VA44MS-EYGUNBB-SLHKB3C-ZSLMOAA";
-      #     };
-      #     folders = {
-      #       "Documents" = {
-      #         path = "${homeDir}/Documents";
-      #         devices = [ "magicant" "winters" ];
-      #         id = "hgr3d-pfu3w";
-      #       };
-      #     };
-      #   };
-      # };
+      syncthing = {
+        settings = {
+          "winters" = {
+            id = "O7RWDMD-AEAHPP7-7TAVLKZ-BSWNBTU-2VA44MS-EYGUNBB-SLHKB3C-ZSLMOAA";
+          };
+          folders = {
+            "Documents" = {
+              path = "${homeDir}/Documents";
+              devices = [ "magicant" "winters" ];
+              id = "hgr3d-pfu3w";
+            };
+          };
+        };
+      };
 
       udev.extraRules = ''
         # share screen when dongle detected
@@ -10636,7 +10647,7 @@ This holds packages that I can use as provided, or with small modifications (as
       vim
       sshfs
       fuse
-      ventoy
+      # ventoy
       poppler_utils
       vdhcoapp
 
@@ -11605,6 +11616,38 @@ Here we set some aliases (some of them should be shellApplications instead) as w
 Concerning the shell extensions, zle <widget-name> will run an existing widget and zle -N <function_name> will make a function available for use. The my- functions all remove . / and : from the WORDCHARS so that functions will stop there. The keycodes can be found using showkeys -a
 
    
 
+
    
+Regarding initContent:
+To specify the order, use lib.mkOrder.
+
    
+
+
    
+Common order values:
+
    
+
      
+
    • 500 (mkBefore: Early initialization (replaces initExtraFirst
      • 
+
    • 550: Before completion initialization (replaces initExtraBeforeCompInit
      • 
+
    • 1000 (default: General configuration (replaces initExtra
      • 
+
    • 1500 (mkAfter: Last to run configuration
      • 
+
    
+
+
    
+To specify both content in Early initialization and General configuration, use lib.mkMerge:
+
    
+
+
    
+
    initContent = let
+zshConfigEarlyInit = lib.mkOrder 500 "do something";
+zshConfig = lib.mkOrder 1000 "do something";
+in
+lib.mkMerge [ zshConfigEarlyInit zshConfig ];
+
    
+
    
+
+
    
+Currently I only use it as before with initExtra though.
+
    
+
 
    
 
    { config, pkgs, lib, ... }:
 let
@@ -11680,7 +11723,7 @@ in
           src = pkgs.zsh-fzf-tab;
         }
       ];
-      initExtra = ''
+      initContent = ''
         my-forward-word() {
           local WORDCHARS=$WORDCHARS
           WORDCHARS="''${WORDCHARS//:}"
@@ -12701,31 +12744,31 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
   config = lib.mkIf config.swarselsystems.modules.mako {
     services.mako = {
       enable = true;
-      # backgroundColor = "#2e3440";
-      # borderColor = "#88c0d0";
-      borderRadius = 15;
-      borderSize = 1;
-      defaultTimeout = 5000;
-      height = 150;
-      icons = true;
-      ignoreTimeout = true;
-      layer = "overlay";
-      maxIconSize = 64;
-      sort = "-time";
-      width = 300;
-      # font = "monospace 10";
-      extraConfig = ''
-        [urgency=low]
-        border-color=#cccccc
-        [urgency=normal]
-        border-color=#d08770
-        [urgency=high]
-        border-color=#bf616a
-        default-timeout=3000
-        [category=mpd]
-        default-timeout=2000
-        group-by=category
-      '';
+      settings = {
+        border-radius = 15;
+        border-size = 1;
+        default-timeout = 5000;
+        ignore-timeout = 1;
+        icons = 1;
+        layer = "overlay";
+        sort = "-time";
+        height = 150;
+        width = 300;
+        "urgency=low" = {
+          border-color = lib.mkForce "#cccccc";
+        };
+        "urgency=normal" = {
+          border-color = lib.mkForce "#d08770";
+        };
+        "urgency=high" = {
+          border-color = lib.mkForce "#bf616a";
+          default-timeout = 3000;
+        };
+        "category=mpd" = {
+          default-timeout = 2000;
+          group-by = "category";
+        };
+      };
     };
   };
 
@@ -12734,8 +12777,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
    -
    -
    3.4.1.29.4. SwayOSD
    +
    +
    3.4.1.29.4. SwayOSD
    { lib, config, ... }:
@@ -13331,7 +13374,7 @@ in
       enableScDaemon = true;
       enableSshSupport = true;
       enableExtraSocket = true;
-      pinentryPackage = pkgs.pinentry.gtk2;
+      pinentry.package = pkgs.pinentry.gtk2;
       defaultCacheTtl = 600;
       maxCacheTtl = 7200;
       extraConfig = ''
@@ -13984,8 +14027,8 @@ in
    -
    -
    3.4.4.3. Framework
    +
    +
    3.4.4.3. Framework

    This holds configuration that is specific to framework laptops. @@ -17825,8 +17868,8 @@ autocmd DocStart vc-impimba-1.m.imp.ac.at/ui/webconsole mode ignore

    -
    -

    6.3. tridactyl theme

    +
    +

    6.3. tridactyl theme

    @@ -18323,7 +18366,7 @@ sync USER HOST:
    diff --git a/modules/home/common/gpg-agent.nix b/modules/home/common/gpg-agent.nix index b17f204..0ef546d 100644 --- a/modules/home/common/gpg-agent.nix +++ b/modules/home/common/gpg-agent.nix @@ -11,7 +11,7 @@ in enableScDaemon = true; enableSshSupport = true; enableExtraSocket = true; - pinentryPackage = pkgs.pinentry.gtk2; + pinentry.package = pkgs.pinentry.gtk2; defaultCacheTtl = 600; maxCacheTtl = 7200; extraConfig = '' diff --git a/modules/home/common/mako.nix b/modules/home/common/mako.nix index 6388674..bbff8c3 100644 --- a/modules/home/common/mako.nix +++ b/modules/home/common/mako.nix @@ -4,31 +4,31 @@ config = lib.mkIf config.swarselsystems.modules.mako { services.mako = { enable = true; - # backgroundColor = "#2e3440"; - # borderColor = "#88c0d0"; - borderRadius = 15; - borderSize = 1; - defaultTimeout = 5000; - height = 150; - icons = true; - ignoreTimeout = true; - layer = "overlay"; - maxIconSize = 64; - sort = "-time"; - width = 300; - # font = "monospace 10"; - extraConfig = '' - [urgency=low] - border-color=#cccccc - [urgency=normal] - border-color=#d08770 - [urgency=high] - border-color=#bf616a - default-timeout=3000 - [category=mpd] - default-timeout=2000 - group-by=category - ''; + settings = { + border-radius = 15; + border-size = 1; + default-timeout = 5000; + ignore-timeout = 1; + icons = 1; + layer = "overlay"; + sort = "-time"; + height = 150; + width = 300; + "urgency=low" = { + border-color = lib.mkForce "#cccccc"; + }; + "urgency=normal" = { + border-color = lib.mkForce "#d08770"; + }; + "urgency=high" = { + border-color = lib.mkForce "#bf616a"; + default-timeout = 3000; + }; + "category=mpd" = { + default-timeout = 2000; + group-by = "category"; + }; + }; }; }; diff --git a/modules/home/common/packages.nix b/modules/home/common/packages.nix index 9498224..59017f6 100644 --- a/modules/home/common/packages.nix +++ b/modules/home/common/packages.nix @@ -40,7 +40,7 @@ vim sshfs fuse - ventoy + # ventoy poppler_utils vdhcoapp diff --git a/modules/home/common/zsh.nix b/modules/home/common/zsh.nix index 2fcc6c7..ead444b 100644 --- a/modules/home/common/zsh.nix +++ b/modules/home/common/zsh.nix @@ -72,7 +72,7 @@ in src = pkgs.zsh-fzf-tab; } ]; - initExtra = '' + initContent = '' my-forward-word() { local WORDCHARS=$WORDCHARS WORDCHARS="''${WORDCHARS//:}" diff --git a/modules/nixos/optional/work.nix b/modules/nixos/optional/work.nix index 5ee7d0c..6fa2224 100644 --- a/modules/nixos/optional/work.nix +++ b/modules/nixos/optional/work.nix @@ -1,6 +1,6 @@ { self, lib, pkgs, config, ... }: let - inherit (config.swarselsystems) mainUser xdgDir; + inherit (config.swarselsystems) mainUser homeDir xdgDir; owner = mainUser; sopsFile = self + /secrets/work/secrets.yaml; swarselService = name: description: execStart: { @@ -137,7 +137,7 @@ in # cryptography # ])) # docker - stable.python39 + stable24_11.python39 qemu packer gnumake @@ -168,20 +168,20 @@ in ''; }; - # syncthing = { - # settings = { - # "winters" = { - # id = "O7RWDMD-AEAHPP7-7TAVLKZ-BSWNBTU-2VA44MS-EYGUNBB-SLHKB3C-ZSLMOAA"; - # }; - # folders = { - # "Documents" = { - # path = "${homeDir}/Documents"; - # devices = [ "magicant" "winters" ]; - # id = "hgr3d-pfu3w"; - # }; - # }; - # }; - # }; + syncthing = { + settings = { + "winters" = { + id = "O7RWDMD-AEAHPP7-7TAVLKZ-BSWNBTU-2VA44MS-EYGUNBB-SLHKB3C-ZSLMOAA"; + }; + folders = { + "Documents" = { + path = "${homeDir}/Documents"; + devices = [ "magicant" "winters" ]; + id = "hgr3d-pfu3w"; + }; + }; + }; + }; udev.extraRules = '' # share screen when dongle detected diff --git a/modules/nixos/server/matrix.nix b/modules/nixos/server/matrix.nix index 1fd743c..f566541 100644 --- a/modules/nixos/server/matrix.nix +++ b/modules/nixos/server/matrix.nix @@ -143,6 +143,7 @@ in mautrix-telegram = { enable = true; environmentFile = config.sops.templates.mautrixtelegram.path; + registerToSynapse = false; settings = { homeserver = { address = "http://localhost:8008"; diff --git a/modules/nixos/server/restic.nix b/modules/nixos/server/restic.nix index ce7dfc4..3e256b5 100644 --- a/modules/nixos/server/restic.nix +++ b/modules/nixos/server/restic.nix @@ -16,7 +16,7 @@ in templates = { "restic-env".content = '' AWS_ACCESS_KEY_ID=${config.sops.placeholder.resticaccesskey} - AWS_SECRET_ACCESS_KEY=${config.sops.placeholder.resicsecretaccesskey} + AWS_SECRET_ACCESS_KEY=${config.sops.placeholder.resticsecretaccesskey} ''; }; }; diff --git a/modules/nixos/server/syncthing.nix b/modules/nixos/server/syncthing.nix index 796f896..8837dd7 100644 --- a/modules/nixos/server/syncthing.nix +++ b/modules/nixos/server/syncthing.nix @@ -74,16 +74,16 @@ in devices = [ "sync (@oracle)" "magicant" "${workHostName}" ]; id = "hgp9s-fyq3p"; }; - # "Documents" = { - # path = "/Vault/data/syncthing/Documents"; - # type = "receiveonly"; - # versioning = { - # type = "simple"; - # params.keep = "5"; - # }; - # devices = [ "magicant" "${workHostName}" ]; - # id = "hgr3d-pfu3w"; - # }; + "Documents" = { + path = "/Vault/data/syncthing/Documents"; + type = "receiveonly"; + versioning = { + type = "simple"; + params.keep = "5"; + }; + devices = [ "magicant" "${workHostName}" ]; + id = "hgr3d-pfu3w"; + }; # ".elfeed" = { # path = "/Vault/data/syncthing/.elfeed"; # devices = [ "sync (@oracle)" "magicant" "${workHostName}" ]; diff --git a/overlays/default.nix b/overlays/default.nix index 5ebe477..dadd763 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -41,7 +41,14 @@ let }; nixpkgs-stable24_05 = final: _: { - stable24_05 = import inputs.nixpkgs-stable { + stable24_05 = import inputs.nixpkgs-stable24_05 { + inherit (final) system; + config.allowUnfree = true; + }; + }; + + nixpkgs-stable24_11 = final: _: { + stable24_11 = import inputs.nixpkgs-stable24_11 { inherit (final) system; config.allowUnfree = true; }; @@ -60,6 +67,7 @@ in // (modifications final prev) // (nixpkgs-stable final prev) // (nixpkgs-stable24_05 final prev) + // (nixpkgs-stable24_11 final prev) // (zjstatus final prev) // (inputs.vbc-nix.overlays.default final prev) // (inputs.nur.overlays.default final prev)