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

flake-modules/colors.json

@@ -6,8 +6,8 @@
         },
         "to_alter": {
             "accent": "#ff3232",
-            "secondary": "#ff3232",
-            "tertiary": "#ff3232",
+            "secondary": "#6632ff",
+            "tertiary": "#dd32dd",
             "special": "#31feff",
             "weird": "#baff31"
         }

home-modules/hyprland.nix

@@ -187,19 +187,19 @@ in {
         ];
       };
 
-      # gestures = {
-      #   workspace_swipe = true;
-      #   workspace_swipe_fingers = "4";
-      #   workspace_swipe_distance = "300";
-      #   workspace_swipe_invert = true;
-      #   workspace_swipe_min_speed_to_force = "30";
-      #   workspace_swipe_cancel_ratio = "0.5";
-      #   workspace_swipe_create_new = false;
-      #   workspace_swipe_direction_lock = false;
-      #   workspace_swipe_direction_lock_threshold = "10";
-      #   workspace_swipe_forever = true;
-      #   workspace_swipe_use_r = false;
-      # };
+      gestures = {
+        workspace_swipe_distance = "300";
+        # workspace_swipe_touch = true;
+        workspace_swipe_invert = true;
+        # workspace_swipe_touch_invert = true;
+        workspace_swipe_min_speed_to_force = "30";
+        workspace_swipe_cancel_ratio = "0.5";
+        workspace_swipe_create_new = false;
+        workspace_swipe_direction_lock = false;
+        workspace_swipe_direction_lock_threshold = "10";
+        workspace_swipe_forever = true;
+        workspace_swipe_use_r = false;
+      };
 
 
       gesture = [
@@ -232,6 +232,7 @@ in {
         "fcitx5"
         # "ibus engine xkb:de::deu"
         "libinput-gestures"
+        "systemctl --user start hyprpanel"
         # "hyprswitch --daemon"
       ];
 
@@ -491,6 +492,10 @@ in {
         # "SUPER, TAB, exec, hyprswitch --daemon --do-initial-execute"
         "SUPER, Next, resizeactive, 10% 10%" 
         "SUPER, Prior, resizeactive, -10% -10%" 
+        "SUPER ALT, j, resizeactive, 0%  10%" 
+        "SUPER ALT, k, resizeactive, 0% -10%" 
+        "SUPER ALT, l, resizeactive, 10% -10%" 
+        "SUPER ALT, h, resizeactive, -10% 0%" 
       ];
       plugin = {
         overview = {

system-modules/dm.nix

@@ -1,31 +1,85 @@
-{ pkgs, ... }@all: with all; {
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      hyprland = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland --remember-user-session --window-padding 5";
-        user = hyper.user;
-      };
-      default_session = hyprland;
-      vt = 2;
-    };  
-    # useTextGreeter = true;
-  };
-  # services.displayManager.ly = {
+{ config, pkgs, ... }@all: with all; {
+  # services.greetd = {
   #   enable = true;
-  #   package = pkgs.ly;
-  #   settings = {
-  #     # animation = "matrix";
-  #     # clear_password = true;
-  #     clock = "%c";
-  #     lang = "de";
-  #     load = true;
-  #     # numlock = false;
-  #     save = true;
+  #   settings = rec {
+  #     hyprland = {
+  #       command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland --remember-user-session --window-padding 5";
+  #       user = hyper.user;
+  #     };
+  #     default_session = hyprland;
+  #     vt = 2;
   #   };  
+  #   # useTextGreeter = true;
   # };
+  services.displayManager.ly = {
+# info and docs at https://codeberg.org/fairyglade/ly/src/branch/master/res/config.ini
+    enable = true;
+    package = pkgs.ly;
+    settings = with rice.color; let h = rice.lib.nohash; in {
+      allow_empty_password = false;
+      animation = "matrix";
+      animation_timeout_sec = 0; # forever
+      asterisk = "*";
+      auth_fails = 10;
+      # auto_login_session = "hyprland";
+      # auto_login_user = hyper.user;
+      battery_id = if hyper.isMobile then "BAT0" else null;
+      bg = "0x00${h background}";
+      bigclock_12hr = false;
+      bigclock = "en";
+      bigclock_seconds = false;
+      blank_box = true; # not transparent
+      border_fg = "0x00${h border}";
+      box_title = " Optimistic Nihilism ";
+      clear_password = true;
+      clock = "%c";
+      cmatrix_fg = "0x00${h accent.base}";
+      cmatrix_head_col = "0x01${h accent.bright}";
+      cmatrix_max_codepoint = "0x7B";
+      cmatrix_min_codepoint = "0x21";
+      colormix_col1 = "0x00${h accent.base}";
+      colormix_col2 = "0x00${h secondary.base}";
+      colormix_col3 = "0x20${h tertiary.base}";
+      default_input = "password";
+      # doom_bottom_color = 0x00FFFFFF;
+      # doom_fire_height = 6; # 1-9
+      # doom_fire_spread = 2; # 0-4
+      # doom_middle_color = 0x00C78F17;
+      # doom_top_color = 0x009F2707;
+      # dur_file_path = $CONFIG_DIRECTORY/ly/example.dur;
+      # dur_offset_alignment = center; # Available inputs: topleft, topcenter, topright, centerleft, center, centerright, bottomleft, bottomcenter, bottomright
+      # Dur offset x direction (value is added to the current position determined by alignment, negatives are supported)
+      # dur_x_offset = 0;
+      # dur_y_offset = 0; # Dur offset y direction (value is added to the current position determined by alignment, negatives are supported)
+      # edge_margin = 0; # Set margin to the edges of the DM (useful for curved monitors)
+      error_bg = "0x00${h negative.darker}";
+      error_fg = "0x01${h negative.base}";
+      fg = "0x00${h foreground}";
+      full_color = true;
+      # gameoflife_entropy_interval = 20; # None
+      # gameoflife_fg = "0x00${h accent.base}";
+      # gameoflife_frame_delay = 6;
+      # gameoflife_initial_density = 0.4;
+      # # hibernate_cmd = null;
+      # # hibernate_key = F4;
+      hide_borders = false; # Remove main box borders
+      hide_keyboard_locks = false; # Remove keyboard lock states from the top right corner
+      hide_key_hints = false; # Remove power management command hints
+      hide_version_string = true;
+      # initial_info_text = "Login to ${hyper.host}";
+      # input_len = 35;
+      lang = "de";
+      save = true; # Save the current desktop and login as defaults, and load them on startup
+      # numlock = false;
+      # text_in_center = true; # Center the session name.
+      # vi_default_mode = "normal";
+      # vi_mode = true;
+      # xinitrc = null;
+      # xsessions = null;
+    };
+  };
 
-  # environment.systemPackages = with pkgs; [
-  #   cmatrix    
-  # ];
+  environment.systemPackages = with pkgs; [
+    cmatrix    
+  ];
 }

system-modules/tuda.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }@all: with all;
-{
+{ pkgs, ... }@all: with all; {
   environment.etc = {
     "ssl/certs/tuda-eduroam-root.crt".source = "${pkgs.cacert.unbundled}/etc/ssl/certs/T-TeleSec_GlobalRoot_Class_2:1.crt";
   };
@@ -10,4 +9,23 @@
       path = "/etc/NetworkManager/system-connections/eduroam.nmconnection";
     };
   };
+  environment.systemPackages = with pkgs; [
+    openconnect
+    networkmanager-openconnect
+  ];
+  networking.openconnect = {
+    package = pkgs.openconnect;
+    interfaces = {
+      openconnect0 = {
+        autoStart = false;
+        certificate = "/home/nx2/tuda-rootcert.crt";
+        # extraOptions = { compression = "stateless"; no-dtls = true; no-http-keepalive = true; };
+        gateway = "vpn.hrz.tu-darmstadt.de";
+        # passwordFile = "/var/lib/secrets/openconnect-passwd";
+        # privateKey = "/var/lib/secrets/openconnect_private_key.pem";
+        protocol = "anyconnect";
+        user = secrets.email.tuda.tuid;
+      };
+    };
+  };
 }