Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

2025-11-18 18:53:57 +01:00
parent f35d0efada 3a6e1ce3c6
commit 79b2493f23
12 changed files with 218 additions and 311 deletions
--- a/home-modules/bar/caldav-event.nix
+++ b/home-modules/bar/caldav-event.nix
@@ -73,7 +73,7 @@ def get_ongoing_or_next_event(url, username, password):
        return next_event_dict

    except Exception as e:
-        print(f"Error accessing {url}: {e}")
+        print(f"Error accessing {url}: {str(e)[:30]}...")
        return None

 def is_expired(event_dict: dict):
--- a/home-modules/calendar.nix
+++ b/home-modules/calendar.nix
@@ -33,27 +33,13 @@
      read-only = true;
      type = "ics";
    }
-    {
-      name = "LEC";
-      url = "https://${domain}/lec.ics";
-      color = "#A87000";
-      read-only = true;
-      type = "ics";
-    }
-    {
-      name = "LR";
-      url = "https://${domain}/lr.ics";
-      color = "#005040";
-      read-only = true;
-      type = "ics";
-    }
-    {
-      name = "Worlds";
-      url = "https://zlypher.github.io/lol-events/cal/league-of-legends-world-championship.ical";
-      color = "#A4C3DE";
-      read-only = true;
-      type = "ics";
-    }
+    # {
+    #   name = "LEC";
+    #   url = "https://${domain}/lec.ics";
+    #   color = "#A87000";
+    #   read-only = true;
+    #   type = "ics";
+    # }
    {
      name = "Feiertage Hessen";
      url = "https://ics.tools/Feiertage/hessen.ics";
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -25,11 +25,11 @@
      $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^}
      $(echo -e "$logo" | sed -n 5p): ''${TERM^}
      $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g')
-      $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\&/')
      $(echo -e "$logo" | sed -n 8p): ''$(uname -r | sed -E 's=(.+-.+-.+-.+)-.+=\1=g')
-      $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
      $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g')
-      $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | sed 's/./\U&/')
+      $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
      "
      echo -e "$msg"
    '')
--- a/home-modules/games.nix
+++ b/home-modules/games.nix
@@ -1,20 +1,19 @@
-{ pkgs, ... }@all: with all;
-lib.mkIf (hyper.host == "NxNORTH")
-{
+{ pkgs, ... }@all: with all; {
  home = {
-    packages = (with pkgs.unstable; [
-      protonup-ng
-      mangohud
-
-      prismlauncher
-
-      # heroic
-
+    packages = (with pkgs; [
+      unstable.protonup-ng
+      unstable.mangohud
+    ]) ++ (if hyper.host == "NxNORTH" then (with pkgs; [
+      unstable.prismlauncher
+      heroic
      # mindustry-wayland 
-    ]) ++ [ pkgs.heroic ];
-    sessionVariables = {
-      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
-    };
+    ]) else if hyper.host == "NxXPS" then (with pkgs; [
+      heroic
+    ]) else if hyper.host == "NxACE" then (with pkgs; [
+      heroic
+    ]) else []);
+
+    sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
  };
 }

--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -6,6 +6,7 @@
  monitors = {
    xps = {
      main   = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1080"; scale = "1.0"; };
+      # main   = { name = "eDP-1"; resolution = "1920x1080"; position = "1920x1080"; scale = "1.0"; };
      second = { name = "desc:Sony SONY TV 0x01010101";  resolution = "1920x1080"; position = "1920x0";    scale = "1.0"; };
      third = { name = "DP-6";   resolution = "1920x1080"; position = "0x0";    scale = "1.0"; };
    };
@@ -51,6 +52,7 @@ in {
          "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}"
          "${second.name}, ${second.resolution}, ${second.position}, ${second.scale}"
          "${third.name}, ${third.resolution}, ${third.position}, ${third.scale}"
+          " ,preferred, auto, 1, mirror, eDP-1"
        ]) 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}"
--- a/home-modules/rofi.nix
+++ b/home-modules/rofi.nix
@@ -1,114 +1,46 @@
-{ pkgs, ... }@all: with all;
-{
-  home.packages = with pkgs; [
-    rofi-wayland
-  ];
-  home.file = let 
-    trdr = "${rice.lib.float-to-drune rice.transparency}";
-  in with rice.color; {
-    ".config/rofi/config.rasi".text = ''
-      configuration {
-        show-icons: false;
-        display-drun: "";
-        disable-history: false;
-        drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>] [<span weight='light' size='small'><i>({exec})</i></span>]";
-      }
-
-      * {
-        font: "${rice.font.code.name} 12";
-        foreground: ${foreground};
-        background-color: ${background}${trdr};
-        padding: 0px;
-        margin: 0px;
-        spacing: 0px;
-        border-width: 0px;
-      }
-
-      #window {
-        background-color: ${background}${trdr};
-        border: ${builtins.toString rice.border-width}px;
-        border-radius: ${builtins.toString rice.rounding};
-        border-color: ${border};
-      }
-      #mainbox {
-        border: 0;
-        padding: 0;
-      }
-      #message {
-        border: 0px;
-      }
-      #textbox {
-        text-color: ${foreground};
-      }
-      #listview {
-        fixed-height: 0;
-        border: 0px;
-        spacing: 0px ;
-        scrollbar: false;
-        padding: 0px;
-      }
-
-
-
-      #element {
-        border: 0;
-        padding: 0px;
-        border-radius: ${if rice.rounding > 0 then "2" else "0"}px;
-      }
-
-      #element.normal.normal    { background-color: ${background}${trdr};    text-color: ${accent.base}; }
-      #element.selected.normal  { background-color: ${tertiary.base}${trdr}; text-color: ${background}; }
-      #element.alternate.normal { background-color: ${background}${trdr};    text-color: ${secondary.base}; }
-
-
-      #scrollbar {
-        width: ${builtins.toString rice.border-width}px ;
-        border: 0;
-        handle-width: 8px ;
-        padding: 0;
-      }
-      #sidebar {
-        border: ${builtins.toString rice.border-width}px dash;
-      }
-      #button.selected {
-        text-color: ${foreground};
-      }
-      #inputbar {
-        spacing: 0;
-        text-color: ${background};
-        background-color: ${accent.base}${trdr};
-        padding: 0;
-        margine-bottom: 2px;
-        children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
-      }
-      #prompt {
-        spacing: 0;
-        background-color: transparent;
-        text-color: ${foreground};
-      }
-      #textbox-prompt-colon {
-        expand: false;
-        str: ">";
-        margin: 0px 0.3em 0em 0em ;
-        text-color: ${background};
-        background-color: transparent;
-      }
-      #case-indicator {
-        spacing: 0;
-        text-color: ${foreground};
-        background-color: transparent;
-      }
-      #entry {
-        spacing: 0;
-        text-color: ${background};
-        background-color: transparent;
-        placeholder: "";
-      }
-
-      element-text, element-icon {
-        background-color: inherit;
-        text-color: inherit;
-      }
-    '';
+{ pkgs, ... }@all: with all; {
+  home = {
+    packages = with pkgs; [ rofi-wayland ];
+    file = let # the home-manager module sucks
+      trdr = "${rice.lib.float-to-drune rice.transparency}";
+      ts = builtins.toString;
+    in with rice.color; {
+      ".config/rofi/config.rasi".text = ''
+        configuration {
+          show-icons: false;
+          display-drun: "";
+          disable-history: false;
+        }
+        * {
+          font: "${rice.font.code.name} 12";
+          foreground: ${foreground};
+          text-color: ${foreground};
+          background-color: transparent;
+          padding: 0px;
+          margin: 0px;
+          spacing: 0px;
+          border-width: 0px;
+        }
+        window {
+          background-color: ${background}${trdr};
+          border: ${ts rice.border-width}px;
+          border-radius: ${ts rice.rounding}px;
+          border-color: ${ts rice.color.border};
+        }
+        listview { scrollbar: false; }
+        element { border-radius: ${ts rice.rounding}px; }
+        element.normal.normal    { background-color: ${accent.darker}; text-color: ${accent.base}; }
+        element.selected.normal  { background-color: ${accent.base}; text-color: ${accent.bright}; }
+        element.alternate.normal { background-color: ${secondary.darker}; text-color: ${secondary.base}; }
+        inputbar { children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; }
+        prompt { }
+        textbox-prompt-colon {
+          expand: false;
+          str: ">";
+        }
+        case-indicator { }
+        entry { placeholder: ""; }
+      '';
+    };
  };
 }