Merge branch 'main' of github.com:KaitoTLex/KaitoianOS

flake.nix

@@ -92,6 +92,7 @@
                   {
                     wayland.windowManager.hyprland.settings.monitor = [
                       "eDP-1,1920x1200@120,0x0,1"
+                      "DP-1, 1920x1080@75.03,3840, transform, 1"
                       "HDMI-A-1,1920x1080@165,1920x0,1"
                     ];
                     programs.git.signing = {

hosts/kuroko/configuration.nix

@@ -110,7 +110,9 @@
     LC_TELEPHONE = "en_US.UTF-8";
     LC_TIME = "en_US.UTF-8";
   };
-
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+  ];
   services.keyd = {
     enable = true;
     keyboards.default = {
@@ -148,6 +150,10 @@
 
     };
   };
+  #Asus Specific Packages
+  services.asusd.enable = true;
+  programs.rog-control-center.enable = true;
+
   #System specific packages to install
   environment.systemPackages = with pkgs; [
     # nvtop
@@ -155,6 +161,9 @@
     davinci-resolve
     wacomtablet
     obs-studio
+    asusctl
+    supergfxctl
+    thinkfan
   ];
 
   # List services that you want to enable:

hosts/kurokoNightly/configuration.nix

@@ -161,16 +161,16 @@
         events = [ "key" ];
         command = "pamixer -d 5";
       }
-      {
+      # {
-        keys = [ 237 ];
+      #   keys = [ 237 ];
-        events = [ "key" ];
+      #   events = [ "key" ];
-        command = "brightnessctl -d asus::kbd_backlight set 1-";
+      #   command = "${pkgs.brightnessctl} -d asus::kbd_backlight set 1-";
-      }
+      # }
-      {
+      # {
-        keys = [ 238 ];
+      #   keys = [ 238 ];
-        events = [ "key" ];
+      #   events = [ "key" ];
-        command = "brightnessctl -d asus::kbd_backlight set +1";
+      #   command = "${pkgs.brightnessctl} -d asus::kbd_backlight set +1";
-      }
+      # }
       #{ keys = [  ]; events = [ "key" ]; command = "brightnessctl -d amdgpu_bl2 set +10%"; }
       #{ keys = [  ]; events = [ "key" ]; command = "brightnessctl -d amdgpu_bl2 set +10%"; }
 

hosts/shiroko/configuration.nix

@@ -36,6 +36,9 @@
     enable = true;
     dockerCompat = true;
   };
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+  ];
   boot = {
     # Bootloader.
     loader.systemd-boot.enable = true;

modules/wm/default.nix

@@ -4,7 +4,9 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --asterisks --remember";
+        command = ''
+          ${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --remember --asterisks --greeting "Welcome, generation $(readlink /nix/var/nix/profiles/system | grep -o '[0-9]*'). Access is restricted to authorized personnel only." 
+        '';
         # --remember tuigreet --time --cmd Hyprland --remember --asterisks --greeting 'Access granted for those who don't touch grass'
         user = "greeter";
       };

users/kaitotlex/desktop-environment/hyprland/binds.nix

@@ -81,6 +81,10 @@ in
     bindel = [
       ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"
       ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%+"
+      ",XF86KbdBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl -d asus::kbd_backlight set 1-"
+      ",XF86KbdBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl -d asus::kbd_backlight set 1-"
+      ",XF86Launch1, exec, ${pkgs.supergfxctl}/bin/supergfxctl --mode Hybrid"
+      ",XF86Launch4, exec, ${pkgs.supergfxctl}/bin/supergfxctl --mode Integrated"
       ",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5"
       ",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5"
     ];

users/kaitotlex/desktop-environment/hyprland/default.nix

@@ -114,7 +114,7 @@ in
             natural_scroll = true;
             disable_while_typing = true;
             clickfinger_behavior = true;
-            tap-to-click = false;
+            tap-to-click = true;
             scroll_factor = 0.15;
           };
 

users/kaitotlex/desktop-environment/waybar/default.nix

@@ -70,7 +70,7 @@ in
             "clock"
           ];
           clock = {
-            format = " {:%a, %d %b, %I:%M %p}";
+            format = " {:%a, %D, %T}";
             tooltip = "true";
             tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
             format-alt = " {:%d/%m}";

users/kaitotlex/home.nix

@@ -23,6 +23,9 @@
     # here is some command line tools I use frequently
     # feel free to add your own or remove some of them
     #gfortran1
+    nheko
+    openvpn
+    tor-browser
     bambu-studio
     gimp3
     openssl
@@ -228,7 +231,7 @@
   programs.git = {
     enable = true;
     userName = "KaitoTLex";
-    userEmail = "wlin@kaitotlex.systems";
+    userEmail = "renl@kaitotlex.systems";
   };
 
   programs.neovim.defaultEditor = true;