feat(nix): reorganize file structure

nix/hypr/hyprland.conf → nix/home-manager/desktop/hypr/hyprland.conf

@@ -1,15 +1,4 @@
 
-########################################################################################
-AUTOGENERATED HYPR CONFIG.
-PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
-OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-########################################################################################
-
-#
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-#
-
 autogenerated = 0 # remove this line to remove the warning
 
 # See https://wiki.hyprland.org/Configuring/Monitors/

nix/home-manager/desktop/mako.nix

@@ -0,0 +1,33 @@
+{ pkgs , ...
+}:{
+  services.mako = {
+    enable = true;
+    defaultTimeout = 5000;
+    font = "FiraCode Nerd Font 10";
+    layer = "overlay";
+    anchor = "top-right";
+    maxIconSize = 32;
+    icons = true;
+    iconPath = "${pkgs.papirus-icon-theme}/share/icons/Papirus-Dark";
+    borderRadius = 5;
+    margin = "5";
+    extraConfig = ''
+      group-by=app-name
+      background-color=#FFFFFFee
+      text-color=#000000cc
+      border-color=#00000033
+      border-size=1
+      progress-color=source #07b5efee
+
+      [urgency=low]
+      border-color=#394b70
+
+      [urgency=normal]
+      border-color=#00000033
+
+      [urgency=high]
+      border-color=#ff757f
+      default-timeout=0
+    '';
+  };
+}

nix/home-manager/desktop/rofi.nix

@@ -0,0 +1,31 @@
+{ ...
+}:{
+  programs.rofi = {
+    enable = true;
+    extraConfig = {
+      combi-hide-mode-prefix = true;
+      combi-modi = "window,drun,calc";
+      disable-history = false;
+      display-Network = " 󰤨  Network";
+      display-drun = "   Apps ";
+      display-run = "   Run ";
+      display-window = " 﩯  Window";
+      drun-display-format = "{icon} {name}";
+      hide-scrollbar = true;
+      icon-theme = "Fluent";
+      location = 0;
+      modi = "run,drun,window";
+      show-icons = true;
+      sidebar-mode = true;
+      sorting-method = "fzf";
+      sort = true;
+      terminal = "kitty";
+      font = "FiraCode Nerd Font Regular 12";
+      kb-accept-custom = "Control+Return";
+      kb-cancel = "Escape,Control+g,Control+bracketleft,Control+space";
+      kb-row-select = "Control+Super+space";
+      matching = "fuzzy";
+    };
+    theme = ./rofi/catppuccin-frappe.rasi;
+  };
+}

nix/home-manager/desktop/swaylock.nix

@@ -0,0 +1,46 @@
+{ pkgs , ...
+}:{
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+    settings = {
+      #image = "$HOME/.config/wall";
+      color = "000000ff";
+      font-size = "24";
+      indicator-idle-visible = true;
+      clock = true;
+      timestr = "%H:%M";
+      datestr = "%A, %d %B";
+
+      indicator = true;
+      indicator-radius = "100";
+      indicator-thickness = "10";
+
+      effect-blur = "30x2";
+      effect-vignette = "0.5:0.5";
+
+      text-color = "cdd6f4";
+      text-clear-color = "11111b";
+      text-ver-color = "11111b";
+      text-wrong-color = "11111b";
+
+      ring-color = "1e1e2e";
+      key-hl-color = "f5c2e7";
+      line-color = "f5c2e7";
+      inside-color = "00000088";
+      separator-color = "00000000";
+
+      inside-clear-color = "f2cdcd88";
+      line-clear-color = "f2cdcd";
+      ring-clear-color = "f2cdcd";
+
+      inside-ver-color = "89dceb88";
+      line-ver-color = "89dceb";
+      ring-ver-color = "89dceb";
+
+      inside-wrong-color = "f38ba888";
+      line-wrong-color = "f38ba8";
+      ring-wrong-color = "f38ba8";
+    };
+  };
+}

nix/home-manager/waybar.nix → nix/home-manager/desktop/waybar.nix

@@ -1,20 +1,12 @@
-{ inputs
-, pkgs
+{ pkgs
 , ...
 }:
 let
   hyprctl = "${pkgs.hyprland}/bin/hyprctl";
 in
 {
-  home.packages = [
-    pkgs.networkmanagerapplet # For nm-applet icons
-  ];
-
-  programs.wlogout.enable = true;
-
   programs.waybar = {
     enable = true;
-
     package = pkgs.waybar;
 
     systemd = {
@@ -145,6 +137,5 @@ in
           };
         };
       };
-        # @import "${configHome}/colors.css";
   };
 }

nix/home-manager/home.nix

@@ -8,12 +8,15 @@
     # inputs.nix-colors.homeManagerModule
 
     # You can also split up your configuration and import pieces of it here:
-    ./waybar.nix
+    ./desktop/mako.nix
+    ./desktop/swaylock.nix
+    ./desktop/waybar.nix
   ];
 
   nixpkgs = {
     # You can add overlays here
     overlays = [
+
       # If you want to use overlays exported from other flakes:
       # neovim-nightly-overlay.overlays.default
 
@@ -50,96 +53,15 @@
     k9s
     kubectl
     neofetch
+    networkmanagerapplet 
+    papirus-icon-theme
     ripgrep
-    wl-clipboard
     swayidle
+    wl-clipboard
   ];
 
-  # Enable home-manager and git
-  #programs.git.enable = true;
-
-  # programs.firefox = {
-  #   enable = true;
-  #   package = pkgs.firefox-bin;
-  # };
-  programs.swaylock = {
-    enable = true;
-    package = pkgs.swaylock-effects;
-    settings = {
-      #image = "$HOME/.config/wall";
-      color = "000000ff";
-      font-size = "24";
-      indicator-idle-visible = true;
-      clock = true;
-      timestr = "%H:%M";
-      datestr = "%A, %d %B";
-
-      indicator = true;
-      indicator-radius = "100";
-      indicator-thickness = "10";
-
-      effect-blur = "30x2";
-      effect-vignette = "0.5:0.5";
-
-      text-color = "cdd6f4";
-      text-clear-color = "11111b";
-      text-ver-color = "11111b";
-      text-wrong-color = "11111b";
-
-      ring-color = "1e1e2e";
-      key-hl-color = "f5c2e7";
-      line-color = "f5c2e7";
-      inside-color = "00000088";
-      separator-color = "00000000";
-
-      inside-clear-color = "f2cdcd88";
-      line-clear-color = "f2cdcd";
-      ring-clear-color = "f2cdcd";
-
-      inside-ver-color = "89dceb88";
-      line-ver-color = "89dceb";
-      ring-ver-color = "89dceb";
-
-      inside-wrong-color = "f38ba888";
-      line-wrong-color = "f38ba8";
-      ring-wrong-color = "f38ba8";
-    };
-  };
-
-  programs.rofi = {
-    enable = true;
-    extraConfig = {
-      combi-hide-mode-prefix = true;
-      combi-modi = "window,drun,calc";
-      disable-history = false;
-      display-Network = " 󰤨  Network";
-      display-drun = "   Apps ";
-      display-run = "   Run ";
-      display-window = " 﩯  Window";
-      drun-display-format = "{icon} {name}";
-      hide-scrollbar = true;
-      icon-theme = "Fluent";
-      location = 0;
-      modi = "run,drun,window";
-      show-icons = true;
-      sidebar-mode = true;
-      sorting-method = "fzf";
-      sort = true;
-      terminal = "kitty";
-      font = "FiraCode Nerd Font Regular 12";
-      kb-accept-custom = "Control+Return";
-      kb-cancel = "Escape,Control+g,Control+bracketleft,Control+space";
-      kb-row-select = "Control+Super+space";
-      matching = "fuzzy";
-    };
-    theme = ./rofi/catppuccin-frappe.rasi;
-  };
-
-  services.mako = {
-    enable = true;
-  };
+  programs.wlogout.enable = true;
 
-
   services.copyq = {
     enable = true;
   };