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

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"
     '')

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}"

home-modules/rofi.nix

@@ -1,114 +1,46 @@
-{ pkgs, ... }@all: with all;
+{ pkgs, ... }@all: with all; {
-{
+  home = {
-  home.packages = with pkgs; [
+    packages = with pkgs; [ rofi-wayland ];
-    rofi-wayland
+    file = let # the home-manager module sucks
-  ];
+      trdr = "${rice.lib.float-to-drune rice.transparency}";
-  home.file = let 
+      ts = builtins.toString;
-    trdr = "${rice.lib.float-to-drune rice.transparency}";
+    in with rice.color; {
-  in with rice.color; {
+      ".config/rofi/config.rasi".text = ''
-    ".config/rofi/config.rasi".text = ''
+        configuration {
-      configuration {
+          show-icons: false;
-        show-icons: false;
+          display-drun: "";
-        display-drun: "";
+          disable-history: false;
-        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};
-      * {
+          text-color: ${foreground};
-        font: "${rice.font.code.name} 12";
+          background-color: transparent;
-        foreground: ${foreground};
+          padding: 0px;
-        background-color: ${background}${trdr};
+          margin: 0px;
-        padding: 0px;
+          spacing: 0px;
-        margin: 0px;
+          border-width: 0px;
-        spacing: 0px;
+        }
-        border-width: 0px;
+        window {
-      }
+          background-color: transparent;
-
+          border: ${ts rice.border-width}px;
-      #window {
+          border-radius: ${ts rice.rounding}px;
-        background-color: ${background}${trdr};
+          border-color: ${ts rice.color.border};
-        border: ${builtins.toString rice.border-width}px;
+        }
-        border-radius: ${builtins.toString rice.rounding};
+        listview { scrollbar: false; }
-        border-color: ${border};
+        element { border-radius: ${ts rice.rounding}px; }
-      }
+        element.normal.normal    { background-color: ${accent.darker}; text-color: ${accent.base}; }
-      #mainbox {
+        element.selected.normal  { background-color: ${accent.base}; text-color: ${accent.bright}; }
-        border: 0;
+        element.alternate.normal { background-color: ${secondary.darker}; text-color: ${secondary.base}; }
-        padding: 0;
+        inputbar { children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; }
-      }
+        prompt { }
-      #message {
+        textbox-prompt-colon {
-        border: 0px;
+          expand: false;
-      }
+          str: ">";
-      #textbox {
+        }
-        text-color: ${foreground};
+        case-indicator { }
-      }
+        entry { placeholder: ""; }
-      #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;
-      }
-    '';
   };
 }

system-modules/calendar/lec.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }@all: with all;
 {
   systemd.timers."nx_cal_lec" = {
-    enable = true;
+    enable = false;
     wantedBy = [ "timers.target" ];
     timerConfig = {
       OnBootSec = "40m";

system-modules/users.nix

@@ -31,6 +31,7 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5sYVtPLHXatTjrpol46xr9R4TidcB4t8axO6/ReNNR nxxps-nx2@nxace"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/zcoYuYbamTPMOZPfsP1yQJ5Y6sDlPfBwui8MQjKWn nxnorth-nx2@nxace"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnbJx7nVeVi5jK1Eybm+jQoopiCTslewuHFLv2yCt4f nxdcs-nx2@nxace"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOWa0xeARLSGbliVCqloGRvF7KlM6TcJSFhd+BxcvRt nxs23u-nx2@ssh.nx2.site"
       ];
     };
   };