From 6fdac40832969b2d2099692d9f2593614da66d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 3 Jun 2025 14:55:03 +0200 Subject: [PATCH] =?UTF-8?q?24.11=20=E2=86=92=2025.05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/alacritty.nix | 50 ------- configs/fonts.nix | 7 +- configs/neovim.nix | 2 +- configs/packages.nix | 4 +- flake.lock | 267 ++++++++++++++++++++++------------ flake.nix | 6 +- lib/vim/init.vim | 2 - packages/heuretes.nix | 4 +- packages/literature-quote.nix | 12 +- 9 files changed, 189 insertions(+), 165 deletions(-) diff --git a/configs/alacritty.nix b/configs/alacritty.nix index db992d5..0baa9ec 100644 --- a/configs/alacritty.nix +++ b/configs/alacritty.nix @@ -1,58 +1,8 @@ { pkgs, lib, - config, ... }: let - alacritty-cfg = theme: - (pkgs.formats.yaml {}).generate "alacritty.yml" { - bell = { - animation = "EaseOut"; - duration = 100; - color = "#ffffff"; - }; - font = { - normal.family = "Monospace"; - size = 6; - }; - live_config_reload = true; - key_bindings = [ - { - key = "Plus"; - mods = "Control"; - action = "IncreaseFontSize"; - } - { - key = "Minus"; - mods = "Control"; - action = "DecreaseFontSize"; - } - { - key = "Key0"; - mods = "Control"; - action = "ResetFontSize"; - } - ]; - colors = let - colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"]; - colourPairs = lib.getAttrs colourNames theme; - in { - primary = {inherit (theme) background foreground;}; - cursor = {inherit (theme) cursor;}; - normal = lib.mapAttrs (_: colour: colour.dark) colourPairs; - bright = lib.mapAttrs (_: colour: colour.bright) colourPairs; - }; - }; - alacritty-pkg = pkgs.symlinkJoin { - name = "alacritty"; - paths = [ - (pkgs.writers.writeDashBin "alacritty" '' - ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml msg create-window "$@" || - ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@" - '') - pkgs.alacritty - ]; - }; in { environment.variables.TERMINAL = "alacritty"; diff --git a/configs/fonts.nix b/configs/fonts.nix index 43083c2..104fc9a 100644 --- a/configs/fonts.nix +++ b/configs/fonts.nix @@ -24,11 +24,6 @@ url = "https://github.com/MKilani/Djehuty/archive/master.zip"; sha256 = "sha256-S3vZxdeBj57KJsF+zaZw7sQw8T+z1aVC2CnpnZ0/x2c="; }; - brill = zip-font "Brill" { - url = "https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip"; - stripRoot = false; - hash = "sha256-ugmEIkeBzD/4C9wkVfbctEtnzI8Kw+YD6KGcbk4BAf4="; - }; antinoou = zip-font "Antinoou" { url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip"; sha256 = "0jwihj08n4yrshcx07dnaml2x9yws6dgyjkvg19jqbz17drbp3sw"; @@ -92,7 +87,7 @@ in { newGardiner junicode koineGreek - brill + # brill ezra-sil fira font-awesome diff --git a/configs/neovim.nix b/configs/neovim.nix index eef97e9..a011bd7 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -37,7 +37,7 @@ environment.systemPackages = [ (pkgs.writers.writeDashBin "vim" ''neovim "$@"'') (niveumPackages.vim.override { - stylixColors = config.lib.stylix.colors; + # stylixColors = config.lib.stylix.colors; colorscheme = "base16-gruvbox-light-medium"; }) diff --git a/configs/packages.nix b/configs/packages.nix index 2f9479e..21570c5 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -85,7 +85,7 @@ in { gcc python3Packages.jsonschema # json validation pup # html toolkit - xsv # csv toolkit + xan # csv toolkit magic-wormhole-rs # file transfer man-pages man-pages-posix @@ -119,7 +119,7 @@ in { pdftk # pdf toolkit mupdf poppler_utils # pdf toolkit - okular # the word is nucular + kdePackages.okular # the word is nucular xournalpp # for annotating pdfs pdfpc # presenter console for pdf slides niveumPackages.hc # print files as qr codes diff --git a/flake.lock b/flake.lock index 3b88450..7dc6782 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "fromYaml": "fromYaml_2" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1737857314, - "narHash": "sha256-T9THCbnlj4CkKbTP+lisA5PUMoTXE7uh4FyDQzui+dc=", + "lastModified": 1746626503, + "narHash": "sha256-mRnIdJLP+0NSim9ao30ue0Z3ttSuxzXwQG7UN1KuKfU=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "c077f430f3717d41bb303d031398058665315166", + "rev": "7ad9b4886eccb5eecc0686a16266ddabf6cbefe9", "type": "github" }, "original": { @@ -307,11 +307,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": { @@ -337,7 +337,6 @@ } }, "flake-compat_2": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -382,11 +381,32 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -465,27 +485,6 @@ } }, "flake-utils_5": { - "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_6": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -583,16 +582,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" } @@ -611,11 +610,11 @@ ] }, "locked": { - "lastModified": 1736917206, - "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=", + "lastModified": 1744693102, + "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425", + "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e", "type": "github" }, "original": { @@ -654,16 +653,16 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -1109,11 +1108,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1746886008, - "narHash": "sha256-JtzH3pV0oqlR9lTccOU5SbAY8PzbEp2lyXKlD/DGdRQ=", + "lastModified": 1748885823, + "narHash": "sha256-Ea5JtjFUoTpMJGnbXmXirk8dDdVIWmDp0o+eQDc9vzs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bb671aaa84205c180ec9122d9aa2f5823b7b2aa", + "rev": "3603bcb66c0a5d4529370510bd6529d34107d63a", "type": "github" }, "original": { @@ -1231,27 +1230,27 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -1263,11 +1262,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -1395,11 +1394,37 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746881822, - "narHash": "sha256-+U1n00EyLKzvZlMHK/YGS6OGIYsKfaz4j1qydyyrIRk=", + "lastModified": 1748883059, + "narHash": "sha256-sBG2NR+tB1y4xMYguJT2IsTV2mf8PzWRoz2gScUFHg8=", "owner": "nix-community", "repo": "NUR", - "rev": "887e5be213778cb047379434b6bb41ad09d9c8db", + "rev": "7995f4bde30d1dc463f7d39a5118709e19d8e608", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "nur_3": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "owner": "nix-community", + "repo": "NUR", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -1568,11 +1593,11 @@ ] }, "locked": { - "lastModified": 1746844454, - "narHash": "sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko=", + "lastModified": 1748832016, + "narHash": "sha256-TQSaFa1wWJr6GOs+K8lecK4AKKr8k6mwxHIPCOmVkgs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "be092436d4c0c303b654e4007453b69c0e33009e", + "rev": "7ec2ea005b600dac9436a7c5c6b66d960cbfcea2", "type": "github" }, "original": { @@ -1626,11 +1651,11 @@ ] }, "locked": { - "lastModified": 1746864785, - "narHash": "sha256-e3v25k0qrpo0+8wr1JRxER9fYkkJNcIYuBM0LH3PXxU=", + "lastModified": 1748892379, + "narHash": "sha256-mDDxMwKFURX1K1Z8X/kmt+jYjswofDf0br+Mkw2tmSE=", "owner": "kmein", "repo": "scripts", - "rev": "394e5769da98ea1added4fbc152a6299551d20ea", + "rev": "f44c7a4a6caa1ef5d6b7bf7e93acea0d96f30c21", "type": "github" }, "original": { @@ -1646,11 +1671,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1739285100, - "narHash": "sha256-tQZ8sXCU6yvC0ut/+ezRUSd89Nbyqqn0JVCjYDwcqQA=", + "lastModified": 1747157099, + "narHash": "sha256-i2s6jU+8GLKVjhWDyvFYxmXI7A44c9p6apPPyKt0ETk=", "owner": "krebs", "repo": "stockholm", - "rev": "8d0538bf86e4f9df4f5cc358a1760b255be797e9", + "rev": "d4abc837cc7b87b4f23fe48cc306df26e3de7aab", "type": "github" }, "original": { @@ -1697,7 +1722,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_5", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": [ @@ -1706,22 +1731,25 @@ "nixpkgs": [ "nixpkgs" ], + "nur": "nur_3", "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746143246, - "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=", + "lastModified": 1748884606, + "narHash": "sha256-kG45D1iaM8j///luopldYoVBd4L+41YscY8PjwLtcZM=", "owner": "danth", "repo": "stylix", - "rev": "20ace60f9cb5e179cb2256abaee505780df8e804", + "rev": "2ccc6cbd33b3d9c52b6f6c096a66880a52f37933", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -1822,7 +1850,7 @@ }, "telebots_2": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -1884,11 +1912,11 @@ ] }, "locked": { - "lastModified": 1738004786, - "narHash": "sha256-JQe2jTE1GS8qDtsEO5K1E0rLA6IHr7CqMlsm4Ne4YsM=", + "lastModified": 1748887042, + "narHash": "sha256-WWQxnmKyQm/iccHxDdobdGOPfcVNf+PQwy9HQ2b9W8g=", "owner": "kmein", "repo": "tinc-graph", - "rev": "b7027f323f322f4de3f7575ad2694493f341b1ae", + "rev": "8847b2d0e69065bf4bbb9885fbd465f3b1b2369a", "type": "github" }, "original": { @@ -1917,28 +1945,43 @@ "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": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", "type": "github" } }, "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": { @@ -1947,6 +1990,22 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1977,11 +2036,33 @@ ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fd351f0..34a1091 100644 --- a/flake.nix +++ b/flake.nix @@ -6,21 +6,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-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; 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-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; 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-24.11"; + stylix.url = "github:danth/stylix/release-25.05"; telebots.url = "github:kmein/telebots"; tinc-graph.url = "github:kmein/tinc-graph"; voidrice.url = "github:Lukesmithxyz/voidrice"; diff --git a/lib/vim/init.vim b/lib/vim/init.vim index 1f1479a..41e69f9 100644 --- a/lib/vim/init.vim +++ b/lib/vim/init.vim @@ -40,8 +40,6 @@ let g:netrw_banner=0 let g:netrw_browse_split=4 let g:netrw_altv=1 " open splits to the right let g:netrw_liststyle=3 " tree view -let g:netrw_list_hide=netrw_gitignore#Hide() -let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+' let g:netrw_winsize = 25 call matchadd('colorcolumn', '\%101v', 100) diff --git a/packages/heuretes.nix b/packages/heuretes.nix index e726d4c..3057597 100644 --- a/packages/heuretes.nix +++ b/packages/heuretes.nix @@ -1,7 +1,7 @@ { writers, fetchurl, - xsv, + xan, }: let database = fetchurl { url = "http://c.krebsco.de/greek.csv"; @@ -9,5 +9,5 @@ }; in writers.writeDashBin "heuretes" '' - ${xsv}/bin/xsv search -s simple "^$*$" ${database} | ${xsv}/bin/xsv table + ${xan}/bin/xan search -s simple "^$*$" ${database} | ${xan}/bin/xan table '' diff --git a/packages/literature-quote.nix b/packages/literature-quote.nix index 3751243..86e9b33 100644 --- a/packages/literature-quote.nix +++ b/packages/literature-quote.nix @@ -1,31 +1,31 @@ { writers, lib, - xsv, + xan, curl, gnused, }: writers.writeDashBin "literature-quote" '' - PATH=$PATH:${lib.makeBinPath [xsv curl gnused]} + PATH=$PATH:${lib.makeBinPath [xan curl gnused]} ROW=$(curl -Ls http://kmein.github.io/logotheca/quotes.csv | shuf -n1) ( - QUOTE="$(echo "$ROW" | xsv select 4)" + QUOTE="$(echo "$ROW" | xan select 4)" echo "$QUOTE" | sed 's/^"//;s/"$//;s/\s*||\s*/\n\n/g;s/\s*|\s*/\n/g' echo - AUTHOR="$(echo "$ROW" | xsv select 1)" + AUTHOR="$(echo "$ROW" | xan select 1)" # Prepare the output ATTRIBUTION="($AUTHOR" - SOURCE="$(echo "$ROW" | xsv select 2)" + SOURCE="$(echo "$ROW" | xan select 2)" # Add SOURCE if it's not empty if [ -n "$SOURCE" ]; then ATTRIBUTION="$ATTRIBUTION: $SOURCE" fi - LOC="$(echo "$ROW" | xsv select 3 | sed 's/""//;s/-/–/g')" + LOC="$(echo "$ROW" | xan select 3 | sed 's/""//;s/-/–/g')" # Add LOC if it's not empty if [ -n "$LOC" ]; then ATTRIBUTION="$ATTRIBUTION, $LOC"