overlays refactor

2025-06-17 19:48:31 +02:00
parent fbd045d53e
commit d2d1ce7830
103 changed files with 156 additions and 323 deletions
--- a/home-modules/bitwarden.nix
+++ b/home-modules/bitwarden.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    bitwarden
--- a/home-modules/calendar-campuszeit-fix.nix
+++ b/home-modules/calendar-campuszeit-fix.nix
@@ -1,4 +1,4 @@
-{ pkgs, user, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = let
    u = pkgs.writers.writePython3Bin "nx_fix_campuszeit_python" {
--- a/home-modules/calendar.nix
+++ b/home-modules/calendar.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, secrets, ... }: let 
+{ pkgs, ... }@all: with all; let
  calendars = with hyper; [
    {
      name = "Preservation";
@@ -85,7 +85,7 @@ in {
        userName = hyper.user; # my globally set username
      };
    };
-  in pkgs.lib.attrsets.mergeAttrsList (
+  in lib.attrsets.mergeAttrsList (
    map (calendar: { 
      "${calendar.name}" = transform_caledar_set ( default_set // calendar );
    }) calendars
@@ -93,7 +93,7 @@ in {

  programs.thunderbird.settings = let
    to_safe_name = name: (builtins.replaceStrings ["."] ["-"]) name;
-  in (pkgs.lib.attrsets.mergeAttrsList (
+  in (lib.attrsets.mergeAttrsList (
    map (calendar: with ( default_set // calendar ); {
      "calendar.registry.${to_safe_name calendar.name}.cache.enabled" = true;
      "calendar.registry.${to_safe_name calendar.name}.calendar-main-default" = primary;
@@ -106,7 +106,7 @@ in {
      "calendar.registry.${to_safe_name calendar.name}.readOnly" = read-only;
    }) calendars
  ) // {
-    "calendar.list.sortOrder" = pkgs.lib.fold (calendar: acc: calendar.name + " " + acc) "" calendars;
+    "calendar.list.sortOrder" = lib.fold (calendar: acc: calendar.name + " " + acc) "" calendars;
    "calendar.week.start" = 1;
  });
 }
--- a/home-modules/chatterino.nix
+++ b/home-modules/chatterino.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, rice, secrets, ... }:
+{ pkgs, ... }@all: with all;
 let
  channels = [
    "Caedrel"
--- a/home-modules/clipboard.nix
+++ b/home-modules/clipboard.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  services.clipman = {
    package = pkgs.clipman;
--- a/home-modules/discord.nix
+++ b/home-modules/discord.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }: 
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
  home = {
    packages = with pkgs; [
--- a/home-modules/email.nix
+++ b/home-modules/email.nix
@@ -1,12 +1,12 @@
-{ pkgs, hyper, rice, secrets, ... }: 
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
  home.packages = with pkgs; [
    thunderbird
  ];

  programs.thunderbird = let
-    inherit (pkgs.lib.generators) toJSON;
+    inherit (lib.generators) toJSON;
    extensions = toJSON {} {
      "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d";
    };
--- a/home-modules/firefox.nix
+++ b/home-modules/firefox.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, ... }:
+{ pkgs, ... }@all: with all;
 # browser.tabs.allow_transparent_browser
 # https://www.reddit.com/r/FirefoxCSS/comments/1dqws4b/firefox_128_will_allow_the_main_browser_content/
 {
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    fish
--- a/home-modules/games.nix
+++ b/home-modules/games.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host == "NxNORTH")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host == "NxNORTH")
 {
  home = {
    packages = (with pkgs.unstable; [
--- a/home-modules/gestures.nix
+++ b/home-modules/gestures.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }: 
-pkgs.lib.mkIf (hyper.host == "NxXPS")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host == "NxXPS")
 {
  home.packages = with pkgs; [
    libinput-gestures
--- a/home-modules/ghostty.nix
+++ b/home-modules/ghostty.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
  programs.ghostty = {
    enable = true;
--- a/home-modules/gimp.nix
+++ b/home-modules/gimp.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    # (gimp-with-plugins.override {
--- a/home-modules/git.nix
+++ b/home-modules/git.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, ... }: 
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    delta
@@ -21,10 +21,10 @@
    };
    extraConfig = {
      credential = {
-        "https://git.da.dicos.de".username = pkgs.lib.mkIf (hyper.host =="NxWSL") "lkurzweg";
-        "https://git.da.dicos.de".password = pkgs.lib.mkIf (hyper.host =="NxWSL") "Test";
+        "https://git.da.dicos.de".username = lib.mkIf (hyper.host =="NxWSL") "lkurzweg";
+        "https://git.da.dicos.de".password = lib.mkIf (hyper.host =="NxWSL") "Test";
      };
-      url."ssh://git@git.da.dicos.de/".insteadOf = pkgs.lib.mkIf (hyper.host =="NxWSL") "https://git.da.dicos.de/";
+      url."ssh://git@git.da.dicos.de/".insteadOf = lib.mkIf (hyper.host =="NxWSL") "https://git.da.dicos.de/";
      pull.rebase = false; # true
    };
  };
--- a/home-modules/gpg.nix
+++ b/home-modules/gpg.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  # there also is a system module
  home.packages = with pkgs; [
--- a/home-modules/gtk.nix
+++ b/home-modules/gtk.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 let
  # theme-name = "Colloid-Pink-Dark-Compact";
  # theme-package = pkgs.colloid-gtk-theme.override {
--- a/home-modules/helix.nix
+++ b/home-modules/helix.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
  home = {
    packages = with pkgs; [
@@ -271,7 +271,7 @@
          command = "nixd";
        };
        "style-check" = {
-          command = pkgs.lib.getExe pkgs.vale-ls; 
+          command = lib.getExe pkgs.vale-ls; 
        };
        "language-tool" = {
          command = "${pkgs.ltex-ls}/bin/ltex-ls";
@@ -287,7 +287,7 @@
          ];
        };
        "llm" = {
-          command = pkgs.lib.getExe pkgs.helix-gpt; 
+          command = lib.getExe pkgs.helix-gpt; 
          args = [
            "--handler"
            "ollama"
--- a/home-modules/hyprland-autoname-workspaces.nix
+++ b/home-modules/hyprland-autoname-workspaces.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }@all: with all;
 {
  home = {
    packages = with pkgs; [ hyprland-autoname-workspaces ];
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, inputs, rice, ... }:
+{ pkgs, ... }@all: with all;
 let
  animation-speed = "5";
  transparency = builtins.toString rice.transparency;
--- a/home-modules/latex.nix
+++ b/home-modules/latex.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
  home.packages = with pkgs; [
    texlab # LSP
--- a/home-modules/mako.nix
+++ b/home-modules/mako.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [ libnotify ];
  services.mako = with rice; {
--- a/home-modules/matrix.nix
+++ b/home-modules/matrix.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    # cinny-desktop
--- a/home-modules/nh.nix
+++ b/home-modules/nh.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
  home = {
    packages = with pkgs; [
--- a/home-modules/nixd.nix
+++ b/home-modules/nixd.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
 	home.packages = with pkgs; [
    nixd
--- a/home-modules/nvidia.nix
+++ b/home-modules/nvidia.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.nvidia.enable == true)
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.nvidia.enable == true)
 {
  home = {
    packages = with pkgs; [
--- a/home-modules/nx-gcal-event.nix
+++ b/home-modules/nx-gcal-event.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, secrets, ... }: let
+{ pkgs, ... }@all: with all;
  sep = " ";
 in {
  home = {
--- a/home-modules/nx2site-backup.nix
+++ b/home-modules/nx2site-backup.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = [
    (pkgs.writeShellApplication {
--- a/home-modules/nx2site.nix
+++ b/home-modules/nx2site.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    (writeShellApplication {
--- a/home-modules/nxgs.nix
+++ b/home-modules/nxgs.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
 	home.packages = with pkgs; [
    ghostscript
--- a/home-modules/obs.nix
+++ b/home-modules/obs.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
  #  home.packages = with pkgs; [
  #   obs-studio
--- a/home-modules/office.nix
+++ b/home-modules/office.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    libreoffice
--- a/home-modules/ollama.nix
+++ b/home-modules/ollama.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    ollama
--- a/home-modules/pandoc.nix
+++ b/home-modules/pandoc.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    pandoc
--- a/home-modules/pkgs-list/shell.nix
+++ b/home-modules/pkgs-list/shell.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    bat
--- a/home-modules/pnx.nix
+++ b/home-modules/pnx.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, secrets, ... }: 
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
  home.packages = [
    pkgs.remmina
--- a/home-modules/programming/c.nix
+++ b/home-modules/programming/c.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home = {
    packages = with pkgs; [
--- a/home-modules/programming/gleam.nix
+++ b/home-modules/programming/gleam.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host != "NxACE")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host != "NxACE")
 {
  home.packages = with pkgs; [
    erlang
--- a/home-modules/programming/go.nix
+++ b/home-modules/programming/go.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home = {
    packages = with pkgs; [
--- a/home-modules/programming/java.nix
+++ b/home-modules/programming/java.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home = {
    packages = with pkgs; [
--- a/home-modules/programming/js.nix
+++ b/home-modules/programming/js.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    nodejs
--- a/home-modules/programming/python.nix
+++ b/home-modules/programming/python.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home = let 
    python-with-packages = pkgs.python3.withPackages (pp: with pp; [
--- a/home-modules/rofi.nix
+++ b/home-modules/rofi.nix
@@ -1,4 +1,5 @@
-{ pkgs, rice, ... }: {
+{ pkgs, ... }@all: with all;
+{
  home.packages = with pkgs; [
    rofi-wayland
  ];
--- a/home-modules/scanning.nix
+++ b/home-modules/scanning.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
 	home.packages = with pkgs; [
 		xsane
--- a/home-modules/sent.nix
+++ b/home-modules/sent.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }:
+{ pkgs, ... }@all: with all;
 let 
  my-sent = pkgs.sent.override {
    patches = [
--- a/home-modules/sops.nix
+++ b/home-modules/sops.nix
@@ -1,12 +1,12 @@
-{ pkgs, hyper, inputs, ... }:
+{ pkgs, ... }@all: with all;
 {
  imports = [
    inputs.sops-nix.homeManagerModules.sops
  ];
  
  sops = {
-    age.keyFile = pkgs.lib.mkIf (hyper.host == "NxACE") "${hyper.home}.age_nx2_key_13.txt";
-    gnupg.home = pkgs.lib.mkIf (hyper.host != "NxACE") "${hyper.home}.gnupg";
+    age.keyFile = lib.mkIf (hyper.host == "NxACE") "${hyper.home}.age_nx2_key_13.txt";
+    gnupg.home = lib.mkIf (hyper.host != "NxACE") "${hyper.home}.gnupg";
    defaultSopsFile = ../sops-secrets.yaml;

    # %r is $XDG_RUNTIME_DIR
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
  home = {
    packages = with pkgs; [ sshfs ];
--- a/home-modules/starship.nix
+++ b/home-modules/starship.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }: 
+{ pkgs, ... }@all: with all;
 {
  programs.starship = {
    enable = true;
@@ -7,7 +7,7 @@
    enableFishIntegration = true;
    settings = with rice.color; {
      add_newline = false;
-      format = pkgs.lib.strings.concatMapStrings (x: "$" + x) [
+      format = lib.strings.concatMapStrings (x: "$" + x) [
        "jobs"
        "battery"
        "username"
--- a/home-modules/tts.nix
+++ b/home-modules/tts.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: 
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    (writeShellApplication {
--- a/home-modules/vale.nix
+++ b/home-modules/vale.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: let 
+{ pkgs, ... }@all: with all; let
  vws = pkgs.vale.withStyles (s: [ s.alex s.google ]); 
 in {
  home = {
--- a/home-modules/virt-manager.nix
+++ b/home-modules/virt-manager.nix
@@ -1,5 +1,5 @@
-{ pkgs, hyper, ... }:
-pkgs.lib.mkIf (hyper.host == "NxNORTH")
+{ pkgs, ... }@all: with all;
+lib.mkIf (hyper.host == "NxNORTH")
 {
  home.packages = with pkgs; [
    virt-manager
--- a/home-modules/vscode.nix
+++ b/home-modules/vscode.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, hyper, rice, ... }:
+{ pkgs, ... }@all: with all;
 {
-  config = pkgs.lib.mkIf (hyper.host != "NxACE") {
+  config = lib.mkIf (hyper.host != "NxACE") {
    home.packages = [
      pkgs.vscodium
      pkgs.nixpkgs-fmt
@@ -92,13 +92,13 @@
  #       url = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375/mutability.nix";
  #       sha256 = "4b5ca670c1ac865927e98ac5bf5c131eca46cc20abf0bd0612db955bfc979de8";
  #     })
-  #     { inherit config pkgs; lib = pkgs.lib; })
+  #     { inherit config pkgs; lib = lib; })

  #   (import
  #     (builtins.fetchurl {
  #       url = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375/vscode.nix";
  #       sha256 = "fed877fa1eefd94bc4806641cea87138df78a47af89c7818ac5e76ebacbd025f";
  #     })
-  #     { inherit config pkgs; lib = pkgs.lib; })
+  #     { inherit config pkgs; lib = lib; })
  # ] else [];
 }
--- a/home-modules/wallpaper-to-colors.nix
+++ b/home-modules/wallpaper-to-colors.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    (writers.writePython3Bin "change_colors_json" {
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, ... }:
+{ pkgs, ... }@all: with all;
 let
  sep = " ";
 in {
--- a/home-modules/wlogout.nix
+++ b/home-modules/wlogout.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice,... }:
+{ pkgs, ... }@all: with all;
 {
  home = {
    packages = with pkgs; [ wlogout ];
--- a/home-modules/yazi.nix
+++ b/home-modules/yazi.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, rice, inputs, ... }: 
+{ pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
    unar