diff --git a/configs/bash.nix b/configs/bash.nix index 8cedc47..1aeb572 100644 --- a/configs/bash.nix +++ b/configs/bash.nix @@ -5,6 +5,6 @@ interactiveShellInit = '' set -o vi ''; - enableCompletion = true; + completion.enable = true; }; } diff --git a/configs/browser.nix b/configs/browser.nix index 18e05bb..f447c2e 100644 --- a/configs/browser.nix +++ b/configs/browser.nix @@ -6,7 +6,7 @@ }: { environment.systemPackages = [ niveumPackages.cro - pkgs.tor-browser-bundle-bin + pkgs.tor-browser pkgs.firefox pkgs.brave ]; diff --git a/configs/default.nix b/configs/default.nix index 4839ca1..34e717a 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -3,7 +3,6 @@ lib, config, niveumPackages, - unstablePackages, inputs, ... }: @@ -27,9 +26,6 @@ in dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"''; }; permittedInsecurePackages = [ - "qtwebkit-5.212.0-alpha4" - "zotero-6.0.26" - "electron-25.9.0" ]; }; }; diff --git a/configs/fonts.nix b/configs/fonts.nix index 3f83761..7accb61 100644 --- a/configs/fonts.nix +++ b/configs/fonts.nix @@ -107,7 +107,7 @@ in { roboto-mono noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji roboto-slab scheherazade-new source-code-pro @@ -115,7 +115,7 @@ in { source-serif-pro theano niveumPackages.tocharian-font - vistafonts + vista-fonts vollkorn zilla-slab ]; # google-fonts league-of-moveable-type diff --git a/configs/git.nix b/configs/git.nix index 2b7ba07..672bdff 100644 --- a/configs/git.nix +++ b/configs/git.nix @@ -29,9 +29,7 @@ in { programs.git = { enable = true; package = pkgs.gitFull; - userName = kieran.name; - userEmail = kieran.email; - aliases = { + settings.alias = { br = "branch"; co = "checkout"; ci = "commit"; @@ -45,19 +43,12 @@ in { graph = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all"; }; ignores = ignorePaths; - extraConfig = { - pull.ff = "only"; - rebase.autoStash = true; - merge.autoStash = true; - push.autoSetupRemote = true; - - # # ref https://github.com/dandavison/delta - # core.pager = "${pkgs.delta}/bin/delta"; - # interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only"; - # delta.navigate = true; - # merge.conflictStyle = "diff3"; - # diff.colorMoved = "default"; - }; + settings.user.name = kieran.name; + settings.user.email = kieran.email; + settings.pull.ff = "only"; + settings.rebase.autoStash = true; + settings.merge.autoStash = true; + settings.push.autoSetupRemove = true; }; }; } diff --git a/configs/i3.nix b/configs/i3.nix index 48ae7f1..f62bb59 100644 --- a/configs/i3.nix +++ b/configs/i3.nix @@ -94,7 +94,7 @@ in { services.xserver = { windowManager.i3 = { enable = true; - package = pkgs.i3-gaps; + package = pkgs.i3; }; }; @@ -132,7 +132,7 @@ in { border = 1; }; bars = [ - (config.home-manager.users.me.lib.stylix.i3.bar + (config.home-manager.users.me.stylix.targets.i3.exportedBarConfig // rec { workspaceButtons = true; mode = "hide"; # "dock"; diff --git a/configs/packages.nix b/configs/packages.nix index 98fa236..ef32cf5 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -4,7 +4,6 @@ lib, inputs, niveumPackages, - unstablePackages, ... }: let worldradio = pkgs.callPackage ../packages/worldradio.nix {}; @@ -71,7 +70,7 @@ in { '') # INTERNET aria2 - tdesktop + telegram-desktop whois dnsutils # FILE MANAGERS @@ -103,7 +102,7 @@ in { wdisplays libnotify # for notify-send xclip # clipboard CLI - xdragon # drag and drop + dragon-drop # drag and drop xorg.xkill # kill by clicking portfolio # personal finance overview audacity @@ -121,13 +120,13 @@ in { zoom-us # video conferencing (pkgs.writers.writeDashBin "im" '' weechat_password=$(${pkgs.pass}/bin/pass weechat) - exec ${unstablePackages.weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek' + exec ${weechat}/bin/weechat -t -r '/mouse enable; /remote add makanek http://${externalNetwork.makanek}:8002 -password='"$weechat_password"'; /remote connect makanek' '') alejandra # nix formatter pdfgrep # search in pdf pdftk # pdf toolkit mupdf - poppler_utils # pdf toolkit + poppler-utils # pdf toolkit kdePackages.okular # the word is nucular xournalpp # for annotating pdfs pdfpc # presenter console for pdf slides @@ -152,7 +151,6 @@ in { niveumPackages.pls niveumPackages.mpv-tv niveumPackages.mpv-iptv - jellyfin-media-player niveumPackages.devanagari niveumPackages.betacode # ancient greek betacode to unicode converter niveumPackages.meteo @@ -242,8 +240,6 @@ in { dhall html-tidy - nodePackages.csslint - nodePackages.jsonlint deno # better node.js go texlive.combined.scheme-full diff --git a/configs/ssh.nix b/configs/ssh.nix index 566da63..4283647 100644 --- a/configs/ssh.nix +++ b/configs/ssh.nix @@ -4,6 +4,7 @@ in { users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys; programs.ssh.startAgent = true; + services.gnome.gcr-ssh-agent.enable = false; home-manager.users.me = { # https://discourse.nixos.org/t/gnome-keyring-and-ssh-agent-without-gnome/11663 @@ -40,6 +41,7 @@ in { home-manager.users.me.programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = { "github.com" = { hostname = "ssh.github.com"; diff --git a/configs/stylix.nix b/configs/stylix.nix index df56761..a3ce601 100644 --- a/configs/stylix.nix +++ b/configs/stylix.nix @@ -70,7 +70,7 @@ in { }; emoji = { - package = pkgs.noto-fonts-emoji; + package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; diff --git a/flake.lock b/flake.lock index 2a771e4..5b61a63 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -111,27 +111,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -162,11 +163,11 @@ "fromYaml": "fromYaml_2" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -218,11 +219,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751515480, - "narHash": "sha256-vCYcc/b8WizF6vnjuRVxSiU8hy9L3vOTWDVKpWM7xRE=", + "lastModified": 1760516981, + "narHash": "sha256-4AYTAH7WDL6C6WKktc9UEQRiav6oPzVpKuFWRyYeuTQ=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "47ad4c7afb169df6f9d48d0df3d7e2f71d9ddd8f", + "rev": "01dfc9a07c070092e3187be8edbd2243a9e301a5", "type": "github" }, "original": { @@ -344,11 +345,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -403,11 +404,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -424,11 +425,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -556,18 +557,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "host": "gitlab.gnome.org", + "lastModified": 1762869044, + "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" + "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.1", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "hercules-ci-effects": { @@ -584,11 +587,11 @@ ] }, "locked": { - "lastModified": 1748000383, - "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", + "lastModified": 1758022363, + "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "231726642197817d20310b9d39dd4afb9e899489", + "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", "type": "github" }, "original": { @@ -627,16 +630,16 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1764613336, + "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "f3902b5d8767985680875ad86d028371100faeb3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -647,11 +650,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1759829502, - "narHash": "sha256-hVW5cAQdbUkKicOuD1D26qazXVCeimDDitJmLd7b1YM=", + "lastModified": 1761309163, + "narHash": "sha256-x5BdTIoG/ANMhJJw+IMWLbdXJ7vTh3dou8zN4LCnTeU=", "ref": "refs/heads/master", - "rev": "1f57f78d59fcc8d439d591f47fb283b73420bfe2", - "revCount": 19, + "rev": "949682c2ec4da9a23c414a8ca8c039652cbbef0c", + "revCount": 22, "type": "git", "url": "ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris" }, @@ -1101,11 +1104,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1755996835, - "narHash": "sha256-hG2eV+5tMHSE3XFmJTgx87GrTAD3RJz2Lj+zM0TShg4=", + "lastModified": 1764698775, + "narHash": "sha256-55o7xNThCGl5d1BH64AKi6YlUNvm+VmvZLGGODgUuPw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42e1afa45385017e72b59ad15c3f786d09a704be", + "rev": "485d50996724833a61cc524e39de19886a3cfd7d", "type": "github" }, "original": { @@ -1117,11 +1120,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -1133,11 +1136,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -1287,16 +1290,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -1418,11 +1421,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1755984779, - "narHash": "sha256-/W53HyLk4qSrPJjYWdD5SK+3p0Ns9Bg6MKHoeqLVqi0=", + "lastModified": 1764683664, + "narHash": "sha256-Mr5HKf/bjAJ8H7/H0qJSk2BEV/OILkDIFKrGK0dUVUk=", "owner": "nix-community", "repo": "NUR", - "rev": "20caa31dbef80914895e41b56be4cabc740b2126", + "rev": "b8b40e258cf4c959b06b7322648c87674633629b", "type": "github" }, "original": { @@ -1440,15 +1443,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_2" + ] }, "locked": { - "lastModified": 1751320053, - "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -1526,11 +1528,11 @@ }, "retiolum_2": { "locked": { - "lastModified": 1740597428, - "narHash": "sha256-WyGfu6MvNXrkcbUCwNGX59UvIj38+xvIgZEZRdp49lI=", + "lastModified": 1756302470, + "narHash": "sha256-uPxzGBAugKayJywTixtipZ6UmoyEwu9t1hwV8PebzS0=", "owner": "krebs", "repo": "retiolum", - "rev": "1fa596dc8b176c9ea35823b33f8579c6d96fb7f9", + "rev": "17d947cc08bb17ee979e6332e35f89d64033e204", "type": "github" }, "original": { @@ -1618,11 +1620,11 @@ ] }, "locked": { - "lastModified": 1755916474, - "narHash": "sha256-r0WnHKwA8DQNSHDmN3LNaqu41GbWDYqLS7IQAGR+6Wg=", + "lastModified": 1764643237, + "narHash": "sha256-6Ezx9DqVv5UZ7DBK9rcNwBuQUENFyWPS7M09I+FvNao=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "897ecf2b25be05e6ccb7661703f9f2fdec155f42", + "rev": "e66d6b924ac59e6c722f69332f6540ea57c69233", "type": "github" }, "original": { @@ -1676,11 +1678,11 @@ ] }, "locked": { - "lastModified": 1753033513, - "narHash": "sha256-TnfXFloY4Ntq+0hp+q9GGmuhtB1oueFiB+pcBUNYzFs=", + "lastModified": 1763370753, + "narHash": "sha256-sjYc9aP52GrVCPWxf+B0o0lqDGVGfpXqX9MI9eKyCZI=", "owner": "kmein", "repo": "scripts", - "rev": "cc37fa4aec70f53731b9131bb8830b4445b75b3d", + "rev": "e71d09ba89bb1e210a7e103aaa3fe619dbc801e7", "type": "github" }, "original": { @@ -1696,11 +1698,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1754761025, - "narHash": "sha256-Mo2BkJXIz6HKM8cX2S7bRdX6Q3E1UOcyVL4v10QEUzk=", + "lastModified": 1763891069, + "narHash": "sha256-GzxFKwCfzmdCk5j+fNznXdse0rKIqZ5nBPmO4mZ0wj0=", "owner": "krebs", "repo": "stockholm", - "rev": "fc32e4609140fffa1312a4ca1aeea550b7467448", + "rev": "13d07fa93aeb1394db269d7110da13e596e868a9", "type": "github" }, "original": { @@ -1760,16 +1762,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755710103, - "narHash": "sha256-VmheUy4UzWDy/u0TvCCHptgF30peL7wRxkHy7EVpDrQ=", + "lastModified": 1764695017, + "narHash": "sha256-hJVPGt8MqRL0WHkNRclT4J1rJMurYsPw7dL8UwlFoaI=", "owner": "danth", "repo": "stylix", - "rev": "79be65b20d7b8fb7e8f39ba8121cfe41b7f46808", + "rev": "a1e741dbce6e846129777c2a017e1354bc87b92b", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -2013,11 +2015,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -2029,11 +2031,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -2045,11 +2047,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -2067,33 +2069,11 @@ ] }, "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { @@ -2121,11 +2101,11 @@ "voidrice_2": { "flake": false, "locked": { - "lastModified": 1744355318, - "narHash": "sha256-9U1Do0w2oT5E6uZxSKoHAzbGbSLQRQlT65KcPGzwhW8=", + "lastModified": 1763008506, + "narHash": "sha256-0LYBMIKXZjoM4VPasWCwBwpUxgV2FpjRde4NYyvRyOA=", "owner": "Lukesmithxyz", "repo": "voidrice", - "rev": "f853f1884a8f0c244765192dc6f5a910a7e2b8e5", + "rev": "4a3ad91070328668cd3c8c375e38843f21506e7a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 86d1c54..5ed05e8 100644 --- a/flake.nix +++ b/flake.nix @@ -8,21 +8,21 @@ # alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master"; coptic-dictionary.url = "github:kmein/coptic-dictionary"; flake-utils.url = "github:numtide/flake-utils"; - home-manager.url = "github:nix-community/home-manager/release-25.05"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; menstruation-backend.url = "github:kmein/menstruation.rs"; menstruation-telegram.url = "github:kmein/menstruation-telegram"; nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05"; nixinate.url = "github:matthewcroughan/nixinate"; nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/master"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nur.url = "github:nix-community/NUR"; recht.url = "github:kmein/recht"; retiolum.url = "github:krebs/retiolum"; rust-overlay.url = "github:oxalica/rust-overlay"; scripts.url = "github:kmein/scripts"; stockholm.url = "github:krebs/stockholm"; - stylix.url = "github:danth/stylix/release-25.05"; + stylix.url = "github:danth/stylix/release-25.11"; telebots.url = "github:kmein/telebots"; tinc-graph.url = "github:kmein/tinc-graph"; voidrice.url = "github:Lukesmithxyz/voidrice"; diff --git a/packages/hc.nix b/packages/hc.nix index b481de8..89bc3ef 100644 --- a/packages/hc.nix +++ b/packages/hc.nix @@ -9,7 +9,7 @@ gnugrep, qrencode, texlive, - utillinux, + util-linux, zbar, }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gnugrep qrencode texlive.combined.scheme-full - utillinux + util-linux zbar ]} ''; diff --git a/packages/weechat-declarative.nix b/packages/weechat-declarative.nix index 0b58577..28a5536 100644 --- a/packages/weechat-declarative.nix +++ b/packages/weechat-declarative.nix @@ -1,7 +1,6 @@ { pkgs, lib, - unstablePackages, ... } @ args: let # config cannot be declared in the input attribute set because that would @@ -137,7 +136,7 @@ )) ); - weechat = unstablePackages.weechat.override { + weechat = weechat.override { configure = _: { init = "/exec -oc cat ${setFile}"; @@ -170,7 +169,7 @@ in name = "weechat-configured"; paths = [ wrapper - unstablePackages.weechat + weechat ]; postBuild = '' ln -s ${setFile} $out/weechat.set diff --git a/systems/makanek/weechat.nix b/systems/makanek/weechat.nix index 6bf5716..fc138c9 100644 --- a/systems/makanek/weechat.nix +++ b/systems/makanek/weechat.nix @@ -1,15 +1,11 @@ { lib, pkgs, - config, - unstablePackages, ... }: let inherit (import ../../lib) kieran; weechatHome = "/var/lib/weechat"; - weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix { - inherit unstablePackages; - }; + weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {}; in { systemd.services.weechat = let tmux = pkgs.writers.writeDash "tmux" '' diff --git a/systems/moto/configuration.nix b/systems/moto/configuration.nix index 3b8d382..06baa41 100644 --- a/systems/moto/configuration.nix +++ b/systems/moto/configuration.nix @@ -26,7 +26,7 @@ in { procps tzdata unzip - utillinux + util-linux vim which xz