pls: begin download feature

stylix: remove home-manager override
vim: fix lsp config
2026-03-16 10:11:08 +01:00 · 2025-12-04 16:51:03 +01:00 · 2025-12-04 16:50:53 +01:00 · 2025-12-04 16:50:32 +01:00 · 2025-12-04 16:19:46 +01:00 · 2025-12-04 16:19:34 +01:00
23 changed files with 102 additions and 76 deletions
--- a/configs/bots/autorenkalender.nix
+++ b/configs/bots/autorenkalender.nix
@@ -1,17 +1,9 @@
 {
-  pkgs,
-  lib,
  config,
+  inputs,
  ...
 }: let
-  autorenkalender-package = pkgs.fetchFromGitHub {
-    owner = "kmein";
-    repo = "autorenkalender";
-    rev = "cf49a7b057301332d980eb47042a626add93db66";
-    sha256 = "1pa7sjg33vdnjianrqldv445jdzzv3mn231ljk1j58hs0cd505gs";
-  };
-  autorenkalender =
-    pkgs.python3Packages.callPackage autorenkalender-package {};
+  autorenkalender = inputs.autorenkalender.packages.x86_64-linux.default;
 in {
  niveum.bots.autorenkalender = {
    enable = true;
--- a/flake.lock
+++ b/flake.lock
@@ -90,6 +90,26 @@
        "type": "github"
      }
    },
+    "autorenkalender": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764859438,
+        "narHash": "sha256-OahcfG2AH4ackDw/xamqwVnZr+pFSIk/hBaYmy4bALI=",
+        "owner": "kmein",
+        "repo": "autorenkalender",
+        "rev": "b06647b0ead5157a9bd8bbd2c66a8b2367c6f123",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kmein",
+        "repo": "autorenkalender",
+        "type": "github"
+      }
+    },
    "base16": {
      "inputs": {
        "fromYaml": "fromYaml"
@@ -128,11 +148,11 @@
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1752979451,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "lastModified": 1760703920,
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
        "type": "github"
      },
      "original": {
@@ -345,11 +365,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1758112371,
-        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
+        "lastModified": 1764724327,
+        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
+        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
        "type": "github"
      },
      "original": {
@@ -425,11 +445,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "lastModified": 1763759067,
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
        "type": "github"
      },
      "original": {
@@ -558,11 +578,11 @@
      "flake": false,
      "locked": {
        "host": "gitlab.gnome.org",
-        "lastModified": 1762869044,
-        "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
+        "lastModified": 1764524476,
+        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
+        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
        "type": "gitlab"
      },
      "original": {
@@ -630,11 +650,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764613336,
-        "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=",
+        "lastModified": 1764776959,
+        "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f3902b5d8767985680875ad86d028371100faeb3",
+        "rev": "e1680d594a9281651cbf7d126941a8c8e2396183",
        "type": "github"
      },
      "original": {
@@ -1104,11 +1124,11 @@
    },
    "nixpkgs-unstable_2": {
      "locked": {
-        "lastModified": 1764698775,
-        "narHash": "sha256-55o7xNThCGl5d1BH64AKi6YlUNvm+VmvZLGGODgUuPw=",
+        "lastModified": 1764856811,
+        "narHash": "sha256-p7ihpz21BB+NhuT3qVL3clzWz+UyZlt7S3RRXxZGPls=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "485d50996724833a61cc524e39de19886a3cfd7d",
+        "rev": "152586a6a98226db20aab6e6e1c9a37c535acfbc",
        "type": "github"
      },
      "original": {
@@ -1120,11 +1140,11 @@
    },
    "nixpkgs_10": {
      "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "lastModified": 1764667669,
+        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "rev": "418468ac9527e799809c900eda37cbff999199b6",
        "type": "github"
      },
      "original": {
@@ -1290,11 +1310,11 @@
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1764522689,
-        "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
+        "lastModified": 1764677808,
+        "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
+        "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
        "type": "github"
      },
      "original": {
@@ -1421,11 +1441,11 @@
        "nixpkgs": "nixpkgs_10"
      },
      "locked": {
-        "lastModified": 1764683664,
-        "narHash": "sha256-Mr5HKf/bjAJ8H7/H0qJSk2BEV/OILkDIFKrGK0dUVUk=",
+        "lastModified": 1764853233,
+        "narHash": "sha256-bp7B5alQk7nDLtFLKaOHhSPBNVCcwIxMXjcc/VzY0hg=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "b8b40e258cf4c959b06b7322648c87674633629b",
+        "rev": "5e8ec1167d3a375e2857fbe915b3d8658d3e6472",
        "type": "github"
      },
      "original": {
@@ -1446,11 +1466,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1758998580,
-        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
+        "lastModified": 1764773531,
+        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
+        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
        "type": "github"
      },
      "original": {
@@ -1544,6 +1564,7 @@
    "root": {
      "inputs": {
        "agenix": "agenix",
+        "autorenkalender": "autorenkalender",
        "coptic-dictionary": "coptic-dictionary",
        "flake-utils": "flake-utils_3",
        "home-manager": "home-manager_2",
@@ -1620,11 +1641,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764643237,
-        "narHash": "sha256-6Ezx9DqVv5UZ7DBK9rcNwBuQUENFyWPS7M09I+FvNao=",
+        "lastModified": 1764816035,
+        "narHash": "sha256-F0IQSmSj4t2ThkbWZooAhkCTO+YpZSd2Pqiv2uoYEHo=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "e66d6b924ac59e6c722f69332f6540ea57c69233",
+        "rev": "74d9abb7c5c030469f90d97a67d127cc5d76c238",
        "type": "github"
      },
      "original": {
@@ -1762,11 +1783,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1764695017,
-        "narHash": "sha256-hJVPGt8MqRL0WHkNRclT4J1rJMurYsPw7dL8UwlFoaI=",
+        "lastModified": 1764836393,
+        "narHash": "sha256-J2jgYyXiXctr91MSuBQ6dwB1YaC7DpzKp+Rkj6pqS8o=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "a1e741dbce6e846129777c2a017e1354bc87b92b",
+        "rev": "6f3b50c8fa9c468fc787e211b700e46592bf9d56",
        "type": "github"
      },
      "original": {
@@ -2015,11 +2036,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1757716333,
-        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
+        "lastModified": 1763914658,
+        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
+        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
        "type": "github"
      },
      "original": {
@@ -2031,11 +2052,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1757811970,
-        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
+        "lastModified": 1764465359,
+        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
+        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
        "type": "github"
      },
      "original": {
@@ -2047,11 +2068,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1757811247,
-        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
+        "lastModified": 1764464512,
+        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
+        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,7 @@

    agenix.url = "github:ryantm/agenix";
    # alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master";
+    autorenkalender.url = "github:kmein/autorenkalender";
    coptic-dictionary.url = "github:kmein/coptic-dictionary";
    flake-utils.url = "github:numtide/flake-utils";
    home-manager.url = "github:nix-community/home-manager/release-25.11";
@@ -30,6 +31,7 @@
    wallpapers.url = "github:kmein/wallpapers";
    ical-ephemeris.url = "git+ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris";

+    autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
    agenix.inputs.home-manager.follows = "home-manager";
    agenix.inputs.nixpkgs.follows = "nixpkgs";
    coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
@@ -48,7 +50,6 @@
    scripts.inputs.flake-utils.follows = "flake-utils";
    scripts.inputs.nixpkgs.follows = "nixpkgs";
    scripts.inputs.rust-overlay.follows = "rust-overlay";
-    stylix.inputs.home-manager.follows = "home-manager";
    stylix.inputs.nixpkgs.follows = "nixpkgs";
    tinc-graph.inputs.flake-utils.follows = "flake-utils";
    tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
--- a/lib/vim/init.lua
+++ b/lib/vim/init.lua
@@ -155,10 +155,11 @@ local language_servers = {
 }

 for server, settings in pairs(language_servers) do
-  require('lspconfig')[server].setup{
+  vim.lsp.config(server, {
    on_attach = on_attach,
    flags = lsp_flags,
    settings = settings,
    capabilities = capabilities
-  }
+  })
+  vim.lsp.enable(server)
 end
--- a/lib/vim/init.vim
+++ b/lib/vim/init.vim
@@ -102,6 +102,7 @@ augroup filetypes
  autocmd bufnewfile,bufread urls,config set filetype=conf
  autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
  autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
+  autocmd bufnewfile,bufread *.ex,*.exs packadd vim-elixir | set filetype=elixir
  autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
  autocmd filetype javascript packadd vim-javascript
  autocmd filetype make setlocal noexpandtab
--- a/packages/pls.nix
+++ b/packages/pls.nix
@@ -1,6 +1,7 @@
 {
  lib,
  writers,
+  yt-dlp,
  miller,
  gnused,
  curl,
@@ -95,6 +96,10 @@
    "ich kann damit leben"
    "es ist was es ist"
  ];
+
+  download = writers.writeDash "download" ''
+    ${yt-dlp}/bin/yt-dlp --add-metadata --audio-format mp3 --audio-quality 0 -xic "$@"
+  '';
 in
  writers.writeDashBin "pls" ''
    case "$1" in
--- a/packages/vim.nix
+++ b/packages/vim.nix
@@ -81,6 +81,7 @@
        dhall-vim
        elm-vim
        emmet-vim
+        vim-elixir
        haskell-vim
        niveumPackages.vimPlugins-icalendar-vim
        niveumPackages.vimPlugins-jq-vim
--- a/packages/vimPlugins/cheat-sh.nix
+++ b/packages/vimPlugins/cheat-sh.nix
@@ -1,7 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "cheat.sh-vim";
  version = "826219d1";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/icalendar-vim.nix
+++ b/packages/vimPlugins/icalendar-vim.nix
@@ -1,7 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "icalendar.vim";
  version = "542fff45";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/jq-vim.nix
+++ b/packages/vimPlugins/jq-vim.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "jq.vim";
  version = "5baf8ed1";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/mdwa-nvim.nix
+++ b/packages/vimPlugins/mdwa-nvim.nix
@@ -1,8 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-  lib,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "mdwa.nvim";
  version = "9f37270";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/typst-vim.nix
+++ b/packages/vimPlugins/typst-vim.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "typst.vim";
  version = "2882f21";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-256noir.nix
+++ b/packages/vimPlugins/vim-256noir.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "vim-256noir";
  version = "e8668a18";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-colors-paramount.nix
+++ b/packages/vimPlugins/vim-colors-paramount.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix rec {
+vimUtils.buildVimPlugin {
  pname = "vim-colors-paramount";
  version = "a5601d36";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-ernest.nix
+++ b/packages/vimPlugins/vim-ernest.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
  lib,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "vim-ernest";
  version = "4b99bc3";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-fetch.nix
+++ b/packages/vimPlugins/vim-fetch.nix
@@ -1,7 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix rec {
+}: (vimUtils.buildVimPlugin {
  pname = "vim-fetch";
  version = "76c08586";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-fsharp.nix
+++ b/packages/vimPlugins/vim-fsharp.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "vim-fsharp";
  version = "627db7d7";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-mail.nix
+++ b/packages/vimPlugins/vim-mail.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "vim-mail";
  version = "acdbb5bd";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-reason-plus.nix
+++ b/packages/vimPlugins/vim-reason-plus.nix
@@ -1,7 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "vim-reason-plus";
  version = "c11a2940";
  src = fetchFromGitHub {
--- a/packages/weechat-declarative.nix
+++ b/packages/weechat-declarative.nix
@@ -136,7 +136,7 @@
    ))
  );

-  weechat = weechat.override {
+  weechatPkg = pkgs.weechat.override {
    configure = _: {
      init = "/exec -oc cat ${setFile}";

@@ -162,14 +162,14 @@
        cfg.files
      )
    }
-    exec ${weechat}/bin/weechat "$@"
+    exec ${weechatPkg}/bin/weechat "$@"
  '';
 in
  pkgs.symlinkJoin {
    name = "weechat-configured";
    paths = [
      wrapper
-      weechat
+      weechatPkg
    ];
    postBuild = ''
      ln -s ${setFile} $out/weechat.set
--- a/2
+++ b/2
--- a/systems/ful/ical-ephemeris.nix
+++ b/systems/ful/ical-ephemeris.nix
@@ -15,9 +15,14 @@ in
    enable = true;
    inherit port;
    brevoApiKeyFile = config.age.secrets.brevo-key.path;
+    copecartIpnKeyFile = config.age.secrets.copecart-ipn.path;
    baseUrl = "https://ical-ephemeris.kmein.de";
  };

+  age.secrets.copecart-ipn = {
+    file = ../../secrets/copecart-ipn.age;
+  };
+
  age.secrets.brevo-key = {
    file = ../../secrets/brevo-key.age;
  };
--- a/systems/makanek/configuration.nix
+++ b/systems/makanek/configuration.nix
@@ -13,7 +13,7 @@ in {
    ./menstruation.nix
    ./moinbot.nix
    ./monitoring
-    ./names.nix
+    # ./names.nix
    ./nextcloud.nix
    ../../configs/mycelium.nix
    ./radio-news.nix
Author	SHA1	Message	Date
Kierán Meinhardt	a1af05ff48	pls: begin download feature	2025-12-04 16:51:03 +01:00
Kierán Meinhardt	83536372f0	stylix: remove home-manager override	2025-12-04 16:50:53 +01:00
Kierán Meinhardt	3357121044	vim: fix lsp config	2025-12-04 16:50:32 +01:00
Kierán Meinhardt	2a7e972256	onomap: disable	2025-12-04 16:19:46 +01:00
Kierán Meinhardt	0d75ab146e	secrets: update	2025-12-04 16:19:34 +01:00
Kierán Meinhardt	385ae53c7e	weechat-declarative: fix	2025-12-04 16:19:13 +01:00
Kierán Meinhardt	a08c41d3db	autorenkalender: get from flake	2025-12-04 16:19:02 +01:00
Kierán Meinhardt	bd84c35138	vim: add elixir plugin	2025-12-04 15:15:46 +01:00
Kierán Meinhardt	04722684aa	update	2025-12-04 15:15:45 +01:00