Squash merge modularization into main

modules/fonts/default.nix

@@ -0,0 +1,4 @@
+_: {
+  # home = ./home.nix;
+  nixos = ./nixos.nix;
+}

modules/fonts/nixos.nix

@@ -0,0 +1,38 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+let
+  cfg = config.modules.fonts;
+in
+{
+  options.modules.fonts = {
+    enable = lib.mkEnableOption "fonts";
+  };
+  config.fonts = lib.mkIf cfg.enable {
+    enableDefaultPackages = true;
+    packages =
+      with pkgs;
+      [
+        nerd-fonts.jetbrains-mono
+        material-design-icons
+        material-symbols
+        googlesans-code
+        nerd-fonts.caskaydia-cove
+        nerd-fonts.noto
+        noto-fonts-cjk-sans
+        noto-fonts-cjk-serif
+      ]
+      ++ [
+        (inputs.font-patcher.lib.patchFont {
+          font = "${pkgs.googlesans-code}/share/fonts/googlesans-code/GoogleSansCode[wght].ttf";
+          name = "Google Sans Code Nerd Font";
+          inherit system;
+        })
+      ];
+    fontDir.enable = true;
+  };
+}

modules/hyprland/home.nix

@@ -28,6 +28,7 @@ in
   ];
   options.modules.Hyprland = {
     enable = lib.mkEnableOption "Hyprland";
+    suspend-on-hibernate = lib.mkEnableOption "soh";
   };
   # TODO, split this into its own module;
   config = lib.mkIf cfg.enable {
@@ -44,22 +45,8 @@ in
       wlogout = {
         enable = true;
       };
-      foot = {
-        enable = true;
-        settings = {
-          main = {
-            term = "xterm-256color";
-
-            font = "Google Sans Code Nerd Font:size=11";
-          };
-
-          mouse = {
-            hide-when-typing = "yes";
-          };
-        };
-      };
     };
-    systemd.user.services."hyprland_suspend" = {
+    systemd.user.services."hyprland_suspend" = lib.mkIf cfg.suspend-on-hibernate {
       Unit = {
         Description = "Suspend hyprland";
         Before = [

modules/hyprland/runner.nix

@@ -1,15 +1,20 @@
 { inputs, pkgs, ... }:
 {
   home.packages = [
-    pkgs.walker
+    pkgs.hyprlauncher
   ];
-  systemd.user.services.walker-deamon = {
+  wayland.windowManager.hyprland.settings = {
+    bind = [
+      "$mainMod, R, exec, hyprlauncher"
+    ];
+  };
+  systemd.user.services.hyprlauncher-deamon = {
     Install = {
       WantedBy = [ "hyprland-session.target" ];
     };
     Service = {
       ExecStart = "${pkgs.writeShellScript "watch-store" ''
-        walker --gapplication-service
+        hyprlauncher -d 
       ''}";
     };
   };

modules/hyprland/screenshot.nix

@@ -8,5 +8,6 @@ in
     wayfreeze
     grim
     slurp
+    killall
   ];
 }

modules/hyprland/settings.nix

@@ -11,13 +11,6 @@
     hyprcursor.enable = true;
   };
   wayland.windowManager.hyprland.settings = {
-    monitor = [
-      "HDMI-A-1, 1920x1080@60, 0x0, 1"
-      "DP-3, 1920x1080@144, 1920x0, 1"
-    ];
-    exec-once = [
-      "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
-    ];
     env = [
       "XCURSOR_THEME,BreezeX-RosePine-Linux"
       "XCURSOR_SIZE,24"
@@ -47,7 +40,10 @@
       };
 
       blur = {
-        enabled = false;
+        enabled = true;
+        passes = 1;
+        new_optimizations = true;
+        ignore_opacity = false;
       };
     };
     animations = {
@@ -92,11 +88,6 @@
       enable_anr_dialog = false;
       vfr = true;
     };
-    input = {
-      kb_layout = "gb";
-      follow_mouse = 2;
-      sensitivity = -0.5;
-    };
     "$mainMod" = "SUPER";
     bind = [
       "$mainMod, Q, exec, foot"
@@ -104,7 +95,6 @@
       "$mainMod, M, exit"
       "$mainMod, E, exec, $fileManager"
       "$mainMod, V, togglefloating,"
-      "$mainMod, R, exec, walker"
       "$mainMod, P, pseudo, # dwindle"
       "$mainMod, J, togglesplit, # dwindle"
       "$mainMod, left, movefocus, l"
@@ -141,9 +131,6 @@
       "$mainMod, mouse:272, movewindow"
       "$mainMod, mouse:273, resizewindow"
     ];
-    workspace = [
-      "name:2, monitor:DP-3"
-    ];
     windowrule = [
       "match:class .*, suppress_event maximize"
       "match:class ^(gamescope)$, workspace 5"

modules/kitty/default.nix

@@ -0,0 +1,4 @@
+_: {
+  nixos = ./nixos.nix;
+  home = ./home.nix;
+}

modules/kitty/home.nix

@@ -0,0 +1,46 @@
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  home,
+  system,
+  ...
+}:
+let
+  cfg = config.modules.kitty;
+in
+{
+  options.modules.kitty = {
+    enable = lib.mkEnableOption "kitty configuration module";
+  };
+  config = lib.mkIf cfg.enable {
+    programs.kitty = {
+      enable = true;
+      font = {
+        name = "Google Sans Code Nerd Font";
+        size = 11;
+      };
+      settings = {
+        sync_to_monitor = "yes";
+        background_opacity = 0.6;
+        cursor_trail = 1;
+        ### Blur is handled in hyprland config ###
+        # enable_background_blur = "true";
+        # background_blur = 1;
+      };
+    };
+    ## i could use picom but i just used hyprland blur lol
+    # services.picom = {
+    #   # for cool gpu accelerated kitty effiect like blurred bg
+    #   enable = true;
+    #   backend = "glx";
+    #   activeOpacity = 0.5;
+    # };
+    wayland.windowManager.hyprland.settings = {
+      bind = [
+        "$mainMod, q, exec, kitty"
+      ];
+    };
+  };
+}

modules/kitty/nixos.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  home,
+  system,
+  ...
+}:
+let
+  cfg = config.modules.kitty;
+in
+{
+  options.modules.kitty = {
+    enable = lib.mkEnableOption "kitty configuration module";
+  };
+  config = lib.mkIf cfg.enable {
+  };
+}

modules/nixvim/home.nix

@@ -39,6 +39,7 @@ in
     plugins = {
       todo-comments.enable = true;
       lsp-status.enable = true;
+      transparent.enable = true;
       lsp = {
         enable = true;
         servers = {

modules/obs/home.nix

@@ -11,6 +11,7 @@ in
 {
   options.modules.obs = {
     enable = lib.mkEnableOption "obs";
+    autostart = lib.mkEnableOption "autostart with reply";
   };
   config = lib.mkIf cfg.enable {
     programs = {
@@ -49,7 +50,7 @@ in
           			''}";
       };
     };
-    systemd.user.services.obs-autostart = lib.mkIf cfg.enable {
+    systemd.user.services.obs-autostart = lib.mkIf cfg.autostart {
       Unit = {
         Description = "OBS daemon";
         After = [ "hyprland-session.target" ];