import nur-packages directly

flake.lock

@@ -422,18 +422,23 @@
         "type": "github"
       }
     },
-    "nur": {
+    "nur-packages": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1691846501,
-        "narHash": "sha256-rahFv7X7C2uA0yU91EJdB5rxV9+ZX/RKUJEnfA1HXnY=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "892ced401e457c150de968ff77e970f0b3f97487",
+        "lastModified": 1691851881,
+        "narHash": "sha256-I0B0ub44iFodoLcovB7emDw9I3ORHftIJ+3b4ftoWdw=",
+        "owner": "Mic92",
+        "repo": "nur-packages",
+        "rev": "ae7a64029e769b6e708e284591042d785f2cfe96",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
+        "owner": "Mic92",
+        "repo": "nur-packages",
         "type": "github"
       }
     },
@@ -500,7 +505,7 @@
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
-        "nur": "nur",
+        "nur-packages": "nur-packages",
         "retiolum": "retiolum",
         "sops-nix": "sops-nix",
         "srvos": "srvos",

flake.nix

@@ -28,7 +28,8 @@
     nixpkgs.url = "github:Mic92/nixpkgs/main";
     # for development
     #nixpkgs.url = "/home/joerg/git/nixpkgs";
-    nur.url = "github:nix-community/NUR";
+    nur-packages.url = "github:Mic92/nur-packages";
+    nur-packages.inputs.nixpkgs.follows = "nixpkgs";
     # for development
     #sops-nix.url = "/home/joerg/git/sops-nix";
     sops-nix.url = "github:Mic92/sops-nix";

home-manager/desktop.nix

@@ -1,5 +1,5 @@
 { pkgs
-, config
+, inputs
 , ...
 }: {
   imports = [
@@ -37,7 +37,7 @@
 
     arandr
     signal-desktop
-    config.nur.repos.mic92.pandoc-bin
+    inputs.nur-packages.packages.${pkgs.hostPlatform.system}.pandoc-bin
     nix-output-monitor
     gnome.adwaita-icon-theme
     hicolor-icon-theme
@@ -138,7 +138,7 @@
 
     nixos-shell
   ]
-  ++ (with config.nur.repos.mic92; [
+  ++ (with inputs.nur-packages.packages.${pkgs.hostPlatform.system}; [
     speedscope
     inxi
     source-code-pro-nerdfonts

home-manager/flake-module.nix

@@ -11,7 +11,6 @@
                 extraModules
                 ++ [
                   ./common.nix
-                  inputs.nur.hmModules.nur
                   inputs.nix-index-database.hmModules.nix-index
                   { programs.nix-index-database.comma.enable = true; }
                 ];

home-manager/modules/debugging.nix

@@ -1,14 +1,5 @@
 { pkgs
-, config
 , ...
 }: {
-  home.packages = with pkgs;
-    [
-      pwndbg
-      radare2
-    ]
-    ++ (with config.nur.repos.mic92; [
-      gdbgui
-      gdb-dashboard
-    ]);
+  home.packages = with pkgs; [ radare2 ];
 }

nixos/eve/modules/bitwarden.nix

@@ -1,5 +1,6 @@
 { pkgs
 , config
+, inputs
 , ...
 }:
 let
@@ -60,7 +61,7 @@ in
     serviceConfig = {
       Restart = "on-failure";
       RestartSec = "2s";
-      ExecStart = "${config.nur.repos.mic92.vaultwarden_ldap}/bin/vaultwarden_ldap";
+      ExecStart = "${inputs.nur-packages.packages.${pkgs.hostPlatform.system}.vaultwarden_ldap}/bin/vaultwarden_ldap";
       Environment = "CONFIG_PATH=/run/vaultwarden_ldap/config.toml";
 
       RuntimeDirectory = [ "vaultwarden_ldap" ];

nixos/eve/modules/gitea/default.nix

@@ -1,6 +1,7 @@
 { config
 , pkgs
 , lib
+, inputs
 , ...
 }: {
   services.gitea = {
@@ -46,7 +47,9 @@
           wrapProgram $out/bin/retiolum \
             --set PATH ${lib.makeBinPath (with pkgs; [git openssh gnutar gnugrep coreutils nix coreutils bzip2 jq bash])}
           wrapProgram $out/bin/irc-notify \
-            --set PATH ${lib.makeBinPath (with pkgs; [git openssh coreutils gnugrep gnused config.nur.repos.mic92.ircsink bash])}
+            --set PATH ${lib.makeBinPath (with pkgs; [
+            git openssh coreutils gnugrep gnused inputs.nur-packages.packages.${pkgs.hostPlatform.system}.ircsink bash
+          ])}
           cat > $out/bin/irc-stockholm <<EOF
           #!/usr/bin/env bash
           export GIT_URL=https://git.thalheim.io/Mic92/stockholm

nixos/eve/modules/goatcounter.nix

@@ -1,4 +1,4 @@
-{ config, ... }: {
+{ config, pkgs, inputs, lib, ... }: {
   systemd.services.goatcounter = {
     wantedBy = [ "multi-user.target" ];
     enable = true;
@@ -8,7 +8,7 @@
       RestartSec = "2s";
       EnvironmentFile = [ config.sops.secrets.goatcounter-smtp-password.path ];
       ExecStart = ''
-        ${config.nur.repos.mic92.goatcounter}/bin/goatcounter \
+        ${inputs.nur-packages.packages.${pkgs.hostPlatform.system}.goatcounter}/bin/goatcounter \
           serve \
           -automigrate \
           -listen localhost:3004 \
@@ -33,7 +33,7 @@
   };
 
   environment.systemPackages = [
-    config.nur.repos.mic92.goatcounter
+    inputs.nur-packages.packages.${pkgs.hostPlatform.system}.goatcounter
   ];
 
   services.postgresql.ensureDatabases = [ "goatcounter" ];

nixos/eve/modules/home-assistant/transmission.nix

@@ -1,4 +1,4 @@
-{ config
+{ inputs
 , pkgs
 , ...
 }: {
@@ -19,7 +19,7 @@
     };
   };
   services.home-assistant.customCards = {
-    "lovelace-multiline-text-input-card.js" = pkgs.stdenv.mkDerivation rec {
+    "lovelace-multiline-text-input-card.js" = pkgs.stdenv.mkDerivation {
       name = "lovelace-multiline-text-input-card.js";
       src = pkgs.fetchFromGitHub {
         owner = "faeibson";
@@ -80,7 +80,7 @@
       {
         name = "irc_flix";
         platform = "command_line";
-        command = ''${config.nur.repos.mic92.ircsink}/bin/ircsink --server=irc.r --nick=transmission --target="#flix"'';
+        command = ''${inputs.nur-packages.packages.${pkgs.hostPlatform.system}.ircsink}/bin/ircsink --server=irc.r --nick=transmission --target="#flix"'';
       }
     ];
   };

nixos/eve/modules/mastodon-hnbot.nix

@@ -1,10 +1,11 @@
 { pkgs
 , config
+, inputs
 , ...
 }: {
   systemd.services.mastodon-hnbot = {
     path = [
-      config.nur.repos.mic92.mastodon-hnbot
+      inputs.nur-packages.packages.${pkgs.hostPlatform.system}.mastodon-hnbot
     ];
     script = ''
       exec hnbot \

nixos/eve/modules/nginx/default.nix

@@ -9,7 +9,6 @@
     ./homepage.nix
     ./ip.nix
     ./muc.nix
-    ./threema.nix
     ./retiolum.nix
     ./screenshare
     ./mta-sts.nix

nixos/eve/modules/nginx/threema.nix

@@ -1,9 +0,0 @@
-{ config, ... }: {
-  services.nginx = {
-    virtualHosts."threema.thalheim.io" = {
-      useACMEHost = "thalheim.io";
-      forceSSL = true;
-      root = "${config.nur.repos.mic92.threema-web}";
-    };
-  };
-}

nixos/flake-module.nix

@@ -36,7 +36,6 @@ let
         ./modules/i18n.nix
         ./modules/sshd
         ./modules/zfs.nix
-        inputs.nur.nixosModules.nur
 
         inputs.srvos.nixosModules.common
         inputs.srvos.nixosModules.mixins-telegraf

nixos/images/base-config.nix

@@ -1,6 +1,7 @@
 { lib
 , pkgs
 , config
+, inputs
 , ...
 }: {
   system.stateVersion = config.system.nixos.version;
@@ -77,7 +78,7 @@
       sleep 1
       done
       echo "SSH Hidden Service at $(cat /var/lib/tor/onion/ssh/hostname)" | \
-        ${config.nur.repos.mic92.ircsink}/bin/ircsink \
+        ${inputs.nur-packages.packages.${pkgs.hostPlatform.system}.ircsink}/bin/ircsink \
         --port=6697 --secure --server=irc.hackint.org --nick=nixos-installer --target="#krebs-announce"
 
     '';

nixos/images/flake-module.nix

@@ -1,10 +1,9 @@
 { self, lib, ... }:
 let
-  inherit (self.inputs) nixos-generators nur;
+  inherit (self.inputs) nixos-generators;
   defaultModule = { ... }: {
     imports = [
       ./base-config.nix
-      self.inputs.nur.nixosModules.nur
     ];
     _module.args.inputs = self.inputs;
   };

nixos/modules/nix-path.nix

@@ -3,6 +3,5 @@
   nix.nixPath = [
     "nixpkgs=${inputs.nixpkgs}"
     "home-manager=${inputs.home-manager}"
-    "nur=${inputs.nur}"
   ];
 }

nixos/modules/pinned-registry.nix

@@ -9,9 +9,5 @@
       type = "path";
       path = inputs.nixpkgs;
     };
-    nur.to = {
-      type = "path";
-      path = inputs.nur;
-    };
   };
 }