New Flake Style XPS fix

2025-05-27 12:12:36 +02:00
parent ce140cf4f2
commit 68cb4377b7
52 changed files with 220 additions and 245 deletions
--- a/home-modules/bitwarden.nix
+++ b/home-modules/bitwarden.nix
@@ -1,8 +1,6 @@
-{ pkgs, hyper ... }:
-lib.mkIf (hyper.host != "NxACE")
+{ pkgs, hyper, ... }:
 {
  home.packages = with pkgs; [
    bitwarden
-    bitwarden-cli
  ];
 }
--- a/home-modules/calendar.nix
+++ b/home-modules/calendar.nix
@@ -102,7 +102,7 @@ in {
      "calendar.registry.${to_safe_name calendar.name}.name" = name;
      "calendar.registry.${to_safe_name calendar.name}.type" = type;
      "calendar.registry.${to_safe_name calendar.name}.uri" = url;
-      "calendar.registry.${to_safe_name calendar.name}.username" = user;
+      "calendar.registry.${to_safe_name calendar.name}.username" = hyper.user;
      "calendar.registry.${to_safe_name calendar.name}.readOnly" = read-only;
    }) calendars
  ) // {
--- a/home-modules/email.nix
+++ b/home-modules/email.nix
@@ -6,14 +6,14 @@ pkgs.lib.mkIf (hyper.host != "NxACE")
  ];

  programs.thunderbird = let
-    inherit (lib.generators) toJSON;
+    inherit (pkgs.lib.generators) toJSON;
    extensions = toJSON {} {
      "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d";
    };
  in {
    enable = true;
    profiles = {
-      "${hyepr.user}" = {
+      "${hyper.user}" = {
        isDefault = true;
        settings = with rice.color; {
          "calendar.alarms.showmissed" = false;
--- a/home-modules/firefox.nix
+++ b/home-modules/firefox.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, hyper, rice, ... }:
 # browser.tabs.allow_transparent_browser
 # https://www.reddit.com/r/FirefoxCSS/comments/1dqws4b/firefox_128_will_allow_the_main_browser_content/
 {
@@ -9,7 +9,7 @@
    file = with rice.color;  let
      blur = builtins.toString 20;
    in {
-      ".mozilla/firefox/${user}/chrome/userChrome.css".text = /* css */ ''
+      ".mozilla/firefox/${hyper.user}/chrome/userChrome.css".text = /* css */ ''
        :root{
          /* Popup panels */
          --arrowpanel-background                  : rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important;
@@ -95,7 +95,7 @@
        } 
      '';

-      ".mozilla/firefox/${user}/chrome/userContent.css".text = /* css */ ''
+      ".mozilla/firefox/${hyper.user}/chrome/userContent.css".text = /* css */ ''
        /* Removes the white loading page */
        /* url(about:newtab), url(about:home) */
        @-moz-document url(about:blank) {
--- a/home-modules/games.nix
+++ b/home-modules/games.nix
@@ -1,6 +1,6 @@
 { pkgs, hyper, ... }:
 # lib.mkIf (host == "NxNORTH" || host == "NxACE")
-pkgs.lib.mkIf (host == "NxNORTH")
+pkgs.lib.mkIf (hyper.host == "NxNORTH")
 {
  home = {
    packages = (with pkgs.unstable; [
--- a/home-modules/ghostty.nix
+++ b/home-modules/ghostty.nix
@@ -1,7 +1,7 @@
 { config, rice, hyper, inputs, ... }:
 {
  home = {
-  packages = [ inputs.ghostty.packages.${system}.default ];
+  packages = [ inputs.ghostty.packages.${hyper.system}.default ];
    file."${config.xdg.configHome}/ghostty/config".text = with rice.color; /* ini */ ''
      font-family="${rice.font.code.name}"
      clipboard-read=allow
--- a/home-modules/gimp.nix
+++ b/home-modules/gimp.nix
@@ -1,6 +1,6 @@
-{ pkgs-latest, ... }:
+{ pkgs, ... }:
 {
-  home.packages = with pkgs-latest; [
+  home.packages = with pkgs; [
    # (gimp-with-plugins.override {
    #   plugins = with gimpPlugins; [ bimp ];
    # })
--- a/home-modules/git.nix
+++ b/home-modules/git.nix
@@ -1,4 +1,4 @@
-{ pkgs, rice, ... }: 
+{ pkgs, hyper, rice, ... }: 
 {
  home.packages = with pkgs; [
    git
@@ -36,7 +36,7 @@
  programs.git = {
    enable = true;
    userName = ''Lennart J. Kurzweg (Nx2)'';
-    userEmail = "git@nx2.site";
+    userEmail = "git@${hyper.domain}";
    delta = {
      enable = true;
      options = {
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -1,4 +1,4 @@
-{config, pkgs, pkgs-unstable, inputs, host, user, nvidia, rice, lib, ... }:
+{ config, pkgs, hyper, inputs, rice, ... }:
 let
  animation-speed = "5";
  transparency = builtins.toString rice.transparency;
@@ -83,10 +83,10 @@ in {

    settings = {
      monitor =
-        if host == "NxXPS" then (with monitors.xps; [
+        if hyper.host == "NxXPS" then (with monitors.xps; [
          "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
          "${second.name}, ${second.resolution}, ${second.position}, ${second.scale}"
-        ]) else (if host == "NxNORTH" then (with monitors.north; [
+        ]) else (if hyper.host == "NxNORTH" then (with monitors.north; [
          "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
          "${left.name}, ${left.resolution}, ${left.position}, ${left.scale}"
          # "${right.name}, ${right.resolution}, ${right.position}, ${right.scale}"
@@ -95,10 +95,10 @@ in {
        ]));

      workspace = let
-        d1 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name);
-        d2 = if host == "NxXPS" then monitors.xps.second.name else (if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name);
-        d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name);
-        # d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name);
+        d1 = if hyper.host == "NxXPS" then monitors.xps.main.name else (if hyper.host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name);
+        d2 = if hyper.host == "NxXPS" then monitors.xps.second.name else (if hyper.hyper.host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name);
+        d3 = if hyper.host == "NxXPS" then monitors.xps.main.name else (if hyper.host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name);
+        # d3 = if hyper.host == "NxXPS" then monitors.xps.main.name else (if hyper.hyper.host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name);
       compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false";
      in [
        "11, monitor:${d1}, default:true"
@@ -122,7 +122,7 @@ in {
        "28, monitor:${d2}"
        "29, monitor:${d2}"
        "20, monitor:${d2}"
-        "31, monitor:${d3}, default:${let x = if host == "NxNORTH" then "true" else "false"; in x}"
+        "31, monitor:${d3}, default:${let x = if hyper.host == "NxNORTH" then "true" else "false"; in x}"
        "32, monitor:${d3}"
        "33, monitor:${d3}"
        "34, monitor:${d3}"
@@ -143,7 +143,7 @@ in {
      # };


-      env = if nvidia.enable == true then [
+      env = if hyper.nvidia.enable == true then [
        "LIBVA_DRIVER_NAME,nvidia"
        "XDG_SESSION_TYPE,wayland"
        "GBM_BACKEND,nvidia-drm"
@@ -209,7 +209,7 @@ in {
        # bezier = "myBezier, 0.01, 0.9, 0.1, 1.0"; #o
        # bezier = "myBezier, 0.83, 0, 0.17, 1"; # io
        bezier = "myBezier, 0.33, 1, 0.68, 1";
-        animation = let direction = if host == "NxXPS" then "slide" else "slidevert"; in [
+        animation = let direction = if hyper.host == "NxXPS" then "slide" else "slidevert"; in [
          "windows, 1, ${animation-speed}, myBezier, slide"
          "border, 1, ${animation-speed}, myBezier"
          "fade, 1, ${animation-speed}, myBezier"
@@ -591,7 +591,7 @@ in {
      submap = color
      ${action_simple { key = "W"; cmd = ''exec,swww query | sed -n 1p | sed -E 's-.*image: (.*)-"\1"-g' | xargs change_colors_json img && notify-send 'change_colors_json img successfull' ''; }} 
      ${action_simple { key = "M"; cmd = ''exec,change_colors_json manual && notify-send 'change_colors_json manual successfull'  ''; }} 
-      ${action_simple { key = "D"; cmd = ''exec,firefox /home/${user}/.config/color-pallete.html''; }} 
+      ${action_simple { key = "D"; cmd = ''exec,firefox ${hyper.home}/.config/color-pallete.html''; }} 
      bind = , Escape, execr, waybar_mode unset
      bind = , Escape, submap, reset
      submap = reset
@@ -609,7 +609,7 @@ in {
  };

  home.file = let
-    m = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name;
+    m = if hyper.host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name;
  in {
    ".config/hypr/hyprlock.conf".text = ''
      background {
--- a/home-modules/matrix.nix
+++ b/home-modules/matrix.nix
@@ -1,4 +1,4 @@
-{ pkgs, host, ... }:
+{ pkgs, hyper, ... }:
 {
  home.packages = with pkgs; [
    # cinny-desktop
@@ -79,7 +79,7 @@
      nx2site.ssl_verify = on
      nx2site.username = "nx2"
      nx2site.password = "''${sec.data.matrix_nx2site_password}"
-      nx2site.device_name = "Weechat@${host}"
+      nx2site.device_name = "Weechat@${hyper.host}"
      nx2site.autoreconnect_delay = 10
      nx2site.sso_helper_listening_port = 0
    '';
--- a/home-modules/nvidia.nix
+++ b/home-modules/nvidia.nix
@@ -1,5 +1,5 @@
-{ pkgs, lib, nvidia, ... }:
-lib.mkIf (nvidia.enable == true)
+{ pkgs, hyper, ... }:
+pkgs.lib.mkIf (hyper.nvidia.enable == true)
 {
  home = {
    packages = with pkgs; [
--- a/home-modules/obs.nix
+++ b/home-modules/obs.nix
@@ -1,5 +1,5 @@
-{ pkgs, lib, host, ... }:
-lib.mkIf (host != "NxACE")
+{ pkgs, hyper, ... }:
+pkgs.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 @@
-{ config, pkgs, lib, user, ... }:
+{ pkgs, ... }:
 {
  home.packages = with pkgs; [
    libreoffice
--- a/home-modules/ollama.nix
+++ b/home-modules/ollama.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
  home.packages = with pkgs; [
+    ollama
    (writers.writePython3Bin "ooo" {
      libraries = [ pkgs.python3Packages.ollama ];
      flakeIgnore = [ "E501" "E305" "E701" "E704" "E302" "E114" "F841" "E121" ];
--- a/home-modules/pnx.nix
+++ b/home-modules/pnx.nix
@@ -1,5 +1,5 @@
-{ pkgs, lib, host, secrets, ... }: 
-lib.mkIf (host != "NxACE")
+{ pkgs, hyper, secrets, ... }: 
+pkgs.lib.mkIf (hyper.host != "NxACE")
 {
  home.packages = [
    pkgs.remmina
@@ -7,7 +7,7 @@ lib.mkIf (host != "NxACE")

    (pkgs.writeShellScriptBin "connect_to_pnx" ''
      pushd ~/.vpn/
-      sudo openvpn --config /home/nx2/.vpn/ljk-pnx.ovpn --auth-user-pass ~/.vpn/ljk-pnx-pass.txt #gets put there by home-manager
+      sudo openvpn --config ${hyper.home}/.vpn/ljk-pnx.ovpn --auth-user-pass ~/.vpn/ljk-pnx-pass.txt #gets put there by home-manager
      popd
    '')

--- a/home-modules/sent.nix
+++ b/home-modules/sent.nix
@@ -3,8 +3,6 @@ let
  my-sent = pkgs.sent.override {
    patches = [
      ./sent.patch
-      # /home/${user}/.local/share/sent.patch
-      # (builtins.toFile "/home/${user}/   
    ];
  };
 in
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -5,17 +5,17 @@
    file.".ssh/config".text = ''
      HOST nxace
          HostName ssh.${hyper.domain}
-          User nx2
+          User ${hyper.user}
          Port 50022

      HOST nxacel
          HostName 10.0.1.1
-          User nx2
+          User ${hyper.user}
          Port 50022

      HOST nxrpil
          HostName 10.0.1.31
-          User nx2
+          User ${hyper.user}
          Port 22
      
      HOST nxgit
--- a/home-modules/tts.nix
+++ b/home-modules/tts.nix
@@ -1,5 +1,4 @@
-{ pkgs, lib, user, ... }: 
-lib.mkIf (user != "tv")
+{ pkgs, ... }: 
 {
  home.packages = with pkgs; [
    (writeShellApplication {
--- a/home-modules/virt-manager.nix
+++ b/home-modules/virt-manager.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, lib, host, ... }:
-lib.mkIf (host == "NxNORTH")
+{ pkgs, hyper, ... }:
+pkgs.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, lib, host, rice, ... }:
+{ config, pkgs, hyper, rice, ... }:
 {
-  config = lib.mkIf (host != "NxACE") {
+  config = pkgs.lib.mkIf (hyper.host != "NxACE") {
    home.packages = [
      pkgs.vscodium
      pkgs.nixpkgs-fmt
@@ -85,20 +85,20 @@
    };
  };
  
-  imports = if host != "NxACE" then [
-    # Make vscode settings writable
-    (import
-      (builtins.fetchurl {
-        url = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375/mutability.nix";
-        sha256 = "4b5ca670c1ac865927e98ac5bf5c131eca46cc20abf0bd0612db955bfc979de8";
-      })
-      { inherit config lib; })
+  # imports = if hyper.host != "NxACE" then [
+  #   # Make vscode settings writable
+  #   (import
+  #     (builtins.fetchurl {
+  #       url = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375/mutability.nix";
+  #       sha256 = "4b5ca670c1ac865927e98ac5bf5c131eca46cc20abf0bd0612db955bfc979de8";
+  #     })
+  #     { inherit config pkgs; lib = pkgs.lib; })

-    (import
-      (builtins.fetchurl {
-        url = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375/vscode.nix";
-        sha256 = "fed877fa1eefd94bc4806641cea87138df78a47af89c7818ac5e76ebacbd025f";
-      })
-      { inherit config lib pkgs; })
-  ] else [];
+  #   (import
+  #     (builtins.fetchurl {
+  #       url = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375/vscode.nix";
+  #       sha256 = "fed877fa1eefd94bc4806641cea87138df78a47af89c7818ac5e76ebacbd025f";
+  #     })
+  #     { inherit config pkgs; lib = pkgs.lib; })
+  # ] else [];
 }
--- a/home-modules/wallpaper-to-colors.nix
+++ b/home-modules/wallpaper-to-colors.nix
@@ -1,6 +1,6 @@
-{ pkgs-unstable, ... }:
+{ pkgs, ... }:
 {
-  home.packages = with pkgs-unstable; [
+  home.packages = with pkgs; [
    (writers.writePython3Bin "change_colors_json" {
      libraries = with python3Packages; [ numpy pillow scikit-learn ];
      flakeIgnore = [ "E302" "E305" "E226" "E501" ];
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, rice, domain, user, ... }:
+{ pkgs, hyper, rice, ... }:
 let
  sep = " ";
 in {
@@ -121,8 +121,8 @@ def get_ongoing_or_next_event(url, username, password):
 if __name__ == "__main__":
    password_file = "/home/nx2/.config/sops-nix/secrets/nx2site/radicale/password"  # Path to password file
    cache_file = "/tmp/caldav_event_cache.json"  # Path to cache file
-    url = "https://dav.${domain}/"
-    username = "${user}"
+    url = "https://dav.${hyper.domain}/"
+    username = "${hyper.user}"
    password = get_password(password_file)

    event_dict = load_cache(cache_file)