update?

removed electron overlay
update + changes idk
2025-01-15 18:09:19 +03:00 · 2024-12-13 21:25:17 +03:00 · 2024-12-13 21:08:00 +03:00 · 2024-12-02 13:07:38 +03:00 · 2024-11-16 13:35:31 +03:00 · 2024-11-15 15:19:14 +03:00
33 changed files with 737 additions and 937 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 result
 flake.lock.bk
+sops
--- a/flake.lock
+++ b/flake.lock
@ -4,17 +4,16 @@
      "inputs": {
        "flake-parts": "flake-parts",
        "haskell-flake": "haskell-flake",
-        "hercules-ci-effects": "hercules-ci-effects",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1729444465,
-        "narHash": "sha256-+lCi3cQlFNGAGKaVeUNhTeR40zvMy9JX4hp1JA0dLwE=",
+        "lastModified": 1733918465,
+        "narHash": "sha256-hSuGa8Hh67EHr2x812Ay6WFyFT2BGKn+zk+FJWeKXPg=",
        "owner": "hercules-ci",
        "repo": "arion",
-        "rev": "94d092fffd5cfd4f09b8988aca1b857a9d37c4d6",
+        "rev": "f01c95c10f9d4f04bb08d97b3233b530b180f12e",
        "type": "github"
      },
      "original": {
@ -28,11 +27,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1729588208,
-        "narHash": "sha256-PNONdMd+sG7JWzNIDerX7oVZXL8FTVlSAZ1BmUo2HjE=",
+        "lastModified": 1736711425,
+        "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "4be2aadf13b67ffbb993deb73adff77c46b728fc",
+        "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07",
        "type": "github"
      },
      "original": {
@ -44,11 +43,11 @@
    "dotfiles": {
      "flake": false,
      "locked": {
-        "lastModified": 1729772180,
-        "narHash": "sha256-vDLn6/3DxyWFUKdrijmsaW4cuJhjRWCkSA8QlLzW1No=",
+        "lastModified": 1732720152,
+        "narHash": "sha256-8/XX4SqEskwL5w31pQBKxWVlckWMB4X70vXuaKg48W8=",
        "ref": "refs/heads/main",
-        "rev": "8240f7d218f9a93aca818e770da838bc9f628a98",
-        "revCount": 31,
+        "rev": "c1e41c894627eb73ef7cc6cf401c93caacbfac32",
+        "revCount": 60,
        "type": "git",
        "url": "https://github.com/nomadics9/dotfiles.git"
      },
@ -65,11 +64,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
        "type": "github"
      },
      "original": {
@ -78,27 +77,6 @@
        "type": "github"
      }
    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "arion",
-          "hercules-ci-effects",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-parts",
-        "type": "indirect"
-      }
-    },
    "haskell-flake": {
      "locked": {
        "lastModified": 1675296942,
@ -115,28 +93,6 @@
        "type": "github"
      }
    },
-    "hercules-ci-effects": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
-          "arion",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719226092,
-        "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -144,11 +100,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729551526,
-        "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
+        "lastModified": 1736508663,
+        "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
+        "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
        "type": "github"
      },
      "original": {
@ -159,11 +115,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1725194671,
-        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
+        "lastModified": 1736241350,
+        "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
+        "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f",
        "type": "github"
      },
      "original": {
@ -189,29 +145,13 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1729357638,
-        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1729413321,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "lastModified": 1736701207,
+        "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
        "type": "github"
      },
      "original": {
@ -236,15 +176,14 @@
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        ]
      },
      "locked": {
-        "lastModified": 1729587807,
-        "narHash": "sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM+enIFoveNTCz4=",
+        "lastModified": 1736515725,
+        "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "26642e8f193f547e72d38cd4c0c4e45b49236d27",
+        "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -4,6 +4,9 @@
  '';

  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
+
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
@ -18,9 +21,6 @@
    };
    disko.url = "github:nix-community/disko";

-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
-
    dotfiles = {
      url = "git+https://github.com/nomadics9/dotfiles.git";
      flake = false;
--- a/home/features/cli/default.nix
+++ b/home/features/cli/default.nix
@ -3,12 +3,16 @@
    ./zsh.nix
    ./fzf.nix
    ./neofetch.nix
+    ./nushell.nix
+    ./fish.nix
  ];

  # Starship
  programs.starship = {
    enable = true;
    enableZshIntegration = true;
+    enableNushellIntegration = true;
+    enableFishIntegration = true;
  };

  programs.bat = { enable = true; };
@ -21,6 +25,7 @@
    tldr
    zip
    exiftool
+    chafa
    nvtopPackages.full
  ];
 }
--- a/home/features/cli/fish.nix
+++ b/home/features/cli/fish.nix
@ -0,0 +1,28 @@
+{ config
+, lib
+, ...
+}:
+with lib; let
+  cfg = config.features.cli.fish;
+in
+{
+  options.features.cli.fish.enable = mkEnableOption "enable extended fish configuration";
+
+  config = mkIf cfg.enable {
+    programs.fish = {
+      enable = true;
+
+      shellAliases = {
+        rebuild = "sudo nixos-rebuild switch";
+        dotfilesu = "nix flake lock --update-input dotfiles";
+        cleanold = "sudo nix-collect-garbage --delete-old";
+        cleanboot = "sudo /run/current-system/bin/switch-to-configuration boot";
+      };
+      functions = {
+        fish_greeting = ''
+          chafa --align=Center ~/sync/0nmd/logo.webp --scale=0.8 -f symbols --symbols w
+        '';
+      };
+    };
+  };
+}
--- a/home/features/cli/fzf.nix
+++ b/home/features/cli/fzf.nix
@ -29,7 +29,7 @@ in
      };
      defaultOptions = [
        "--preview='bat --color=always -n {}'"
-        "--bind 'ctrl-/:toggle-preview'"
+        "--bind 'ctrl-p:toggle-preview'"
      ];
      defaultCommand = "fd --type f --exclude .git --follow --hidden";
      changeDirWidgetCommand = "fd --type d --exclude .git --follow --hidden";
--- a/home/features/cli/neofetch.nix
+++ b/home/features/cli/neofetch.nix
@ -5,7 +5,7 @@
 }:
 with lib; let
  cfg = config.features.cli.neofetch;
-  neofetchConfig = ''
+  neofetchConfig = /*bash*/ ''
    print_info() {
        info "\033[1;32m ╭─󱄅 " distro   # cl2 (green)
        info "\033[1;32m ├─" kernel     # cl2 (green)
@ -95,8 +95,8 @@ with lib; let
    memory_display="on"
    battery_display="on"
    disk_display="on"
-    image_backend="kitty"
-    image_source="${config.home.homeDirectory}/nixcfg/assets/logo.png"
+    image_backend="chafa"
+    image_source="${config.home.homeDirectory}/dev/nixnix/nixcfg/assets/logo.png"
    ascii_distro="off"
    ascii="off"
    ascii_colors=(distro)
@ -118,7 +118,7 @@ in
  options.features.cli.neofetch.enable = mkEnableOption "enable neofetch";

  config = mkIf cfg.enable {
-    home.packages = with pkgs; [ neofetch ];
+    home.packages = with pkgs; [ neofetch imagemagick ];
    home.file.".config/neofetch/config.conf".text = lib.mkForce neofetchConfig;
  };
 }
--- a/home/features/cli/nushell.nix
+++ b/home/features/cli/nushell.nix
@ -0,0 +1,24 @@
+{ config
+, lib
+, ...
+}:
+with lib; let
+  cfg = config.features.cli.nushell;
+in
+{
+  options.features.cli.nushell.enable = mkEnableOption "enable extended nushell configuration";
+
+  config = mkIf cfg.enable {
+    programs.nushell = {
+      enable = true;
+
+      shellAliases = {
+        rebuild = "sudo nixos-rebuild switch";
+        dotfilesu = "nix flake lock --update-input dotfiles";
+        cleanold = "sudo nix-collect-garbage --delete-old";
+        cleanboot = "sudo /run/current-system/bin/switch-to-configuration boot";
+
+      };
+    };
+  };
+}
--- a/home/features/cli/zsh.nix
+++ b/home/features/cli/zsh.nix
@ -23,17 +23,18 @@ in
      # '';

      shellAliases = {
-        switchhypr = "sudo nixos-rebuild switch --flake .";
+        rebuild = "sudo nixos-rebuild switch";
        dotfilesu = "nix flake lock --update-input dotfiles";
-        switchuhypr = "nix flake lock --update-input dotfiles && sudo nixos-rebuild switch --flake .";
-        clean = "sudo nix-collect-garbage -d";
        cleanold = "sudo nix-collect-garbage --delete-old";
        cleanboot = "sudo /run/current-system/bin/switch-to-configuration boot";
-        nvim = "kitty @ set-spacing padding=0 && /run/current-system/sw/bin/nvim";
+        # nvim = "kitty @ set-spacing padding=0 && /run/current-system/sw/bin/nvim";
+        # nvim = "alacritty --config-file ~/.config/alacritty/alacritty_nvim.toml -e nvim";
+
      };
-      initExtraFirst = "
-    unsetopt beep
-    ";
+      initExtraFirst = ''
+        unsetopt beep
+        path+=('/home/nomad/.local/bin')
+      '';
      autosuggestion.enable = true;
      syntaxHighlighting.enable = true;
      #  zplug = {
--- a/home/features/desktop/fonts.nix
+++ b/home/features/desktop/fonts.nix
@ -14,7 +14,8 @@ in
    home.packages = with pkgs; [
      fira-code
      fira-code-symbols
-      fira-code-nerdfont
+      nerd-fonts.fira-code
+      nerd-fonts.jetbrains-mono
      font-manager
      font-awesome_5
      font-awesome
--- a/home/features/desktop/hyprland.nix
+++ b/home/features/desktop/hyprland.nix
@ -36,14 +36,14 @@ in
          "XCURSOR_SIZE,24"
          "NIXOS_OZONE_WL,1"
          "GTK_THEME,Nightfox-Dark"
+          "QT_AUTO_SCREEN_SCALE_FACTOR,1"
+          "ELECTRON_EXTRA_FLAGS,--force-device-scale-factor=1.5"
        ];

        input = {
          kb_layout = "us,ara";
          kb_options = "grp:alt_shift_toggle";
          kb_variant = "qwerty_digits";
-          #kb_model = "pc105";
-          #kb_rules = "evdev";
          follow_mouse = 1;

          touchpad = {
@ -52,26 +52,28 @@ in
            tap-to-click = 1;
          };

-          sensitivity = 0.1;
+          sensitivity = 0.25;
        };

        general = {
-          gaps_in = 5;
+          gaps_in = 3;
          gaps_out = 5;
-          border_size = 1;
-          "col.active_border" = "rgba(02BEF5ee) rgba(02BEF5ee) 45deg";
+          border_size = 2;
+          "col.active_border" = "rgba(5faaffee) rgba(5faaffee) 45deg";
          "col.inactive_border" = "rgba(595959aa)";
          layout = "dwindle";
        };

        decoration = {
-          "col.shadow" = "rgba(1E202966)";
-          drop_shadow = true;
-          shadow_range = 60;
-          shadow_offset = "1 2";
-          shadow_render_power = 3;
-          shadow_scale = 0.97;
          rounding = 8;
+          shadow = {
+            enabled = true;
+            color = "rgba(1E202966)";
+            range = 60;
+            offset = "1 2";
+            render_power = 3;
+            scale = 0.97;
+          };
          blur = {
            enabled = true;
            size = 3;
@ -121,12 +123,9 @@ in
          "float, confirmreset"
          "float, title:Open File" # decrease screen brightness
          "float, title:branchdialog"
-          "float, Lxappearance"
-          "float, Wofi"
+          "float, Rofi"
          "float, Calculator"
-          "rounding 10, Wofi"
-          "float, dunst"
-          "animation none,Wofi"
+          "float, mako"
          "float,viewnior"
          "float,feh"
          "float, pavucontrol-qt"
@ -135,7 +134,7 @@ in
          "fullscreen, wlogout"
          "float, title:wlogout"
          "fullscreen, title:wlogout"
-          "idleinhibit focus, mpv"
+          "idleinhibit focus, vlc"
          "idleinhibit fullscreen, firefox"
          "float, title:^(Media viewer)$"
          "float, title:^(Volume Control)$"
@ -151,8 +150,6 @@ in

        bind = [
          "$mainMod, Escape, exec, wlogout -p layer-shell"
-          "$mainMod, R, exec, wofi --show drun --allow-images"
-          "$mainMod, P, exec, wofi-pass"
          "$mainMod, mouse_down, workspace, e+1"
          "$mainMod, mouse_up, workspace, e-1"

@ -175,14 +172,14 @@ in
          "$mainMod SHIFT, k, movewindow, u"
          "$mainMod SHIFT, j, movewindow, d"

-          "$mainMod SHIFT, t, exec, kitty --start-as=fullscreen -o 'font_size=18' --title all_is_kitty"
-          "ALT, RETURN, exec, kitty --title fly_is_kitty"
-          "$mainMod, RETURN, exec, kitty --title kitty_term"
+          "$mainMod SHIFT, t, exec, alacritty --start-as=fullscreen -o 'font_size=18' --title all_is_kitty"
+          "ALT, RETURN, exec, alacritty --title fly_is_kitty"
+          "$mainMod, RETURN, exec, alacritty"

          "$mainMod, C, killactive"
          "$mainMod SHIFT, Q, exit"
          "$mainMod, E, exec, nautilus"
-          #"$mainMod, R, exec, rofi -show drun -show-icons"
+          "$mainMod, R, exec, ~/.config/rofi/launchers/type-6/launcher.sh"
          #"$mainMod, P, pseudo"


@ -191,13 +188,13 @@ in

          # Screen shot
          "$mainMod, S, exec, hyprctl keyword animation 'fadeOut,0,0,default'; grimshot --notify copy active; hyprctl keyword animation 'fadeOut,1,4,default'"
-          "$mainMod SHIFT, S, exec, grimshot savecopy area - | swappy -f - -o ~/Photos/screenshot-$(date +'%d-%m-%Y_%H:%M').png"
+          "$mainMod SHIFT, S, exec, grimshot savecopy area - | swappy -f - -o ~/Photos/screenshots/screenshot-$(date +'%d-%m-%Y_%H%M').png"

          # Screen recorder
-          "$mainMod SHIFT, R, exec, wf-recorder & dunstify -a 'Recordering Started' -i -u -A '^C ,stop' -t 0 -i ~/icons/rec-button.png"
+          "$mainMod SHIFT, R, exec, wf-recorder -a -f ~/Video/recording.mkv & notify-send 'Recordering Started' -i -u -A '^C ,stop' -t 0 -i ~/icons/rec-button.png"

          # Emoji selector
-          "$mainMod SHIFT, E, exec, wofi-emoji"
+          "$mainMod SHIFT, E, exec, rofimoji"


          # Change HZ
--- a/home/features/desktop/wayland.nix
+++ b/home/features/desktop/wayland.nix
@ -19,14 +19,14 @@ in
          layer = "top";
          modules-left = [ "custom/launcher" "custom/wg" "cpu" "memory" "custom/weather" "hyprland/workspaces" ];
          modules-center = [ "mpris" ];
-          modules-right = [ "network" "pulseaudio" "backlight" "battery" "clock" "tray" "hyprland/language" "custom/wallpaper" "idle_inhibitor" "custom/refresh-rate" ];
+          modules-right = [ "network" "pulseaudio" "backlight" "battery" "tray" "hyprland/language" "custom/wallpaper" "idle_inhibitor" "custom/refresh-rate" "clock" ];

          "hyprland/workspaces" = {
            format = "{name}";
            all-outputs = true;
            on-click = "activate";
            format-icons = {
-              active = " 󱎴";
+              active = "󱎴";
              default = "󰍹";
            };
            persistent-workspaces = {
@ -41,17 +41,17 @@ in
              "9" = [ ];
            };
          };
+
          "hyprland/language" = {
-            format = "{short}";
+            format = "{}";
+            format-ar = "🇰🇼 ";
+            format-en = "🇬🇧 ";
          };

-          "hyprland/window" = {
-            max-length = 200;
-            separate-outputs = true;
-          };
          "tray" = {
            spacing = 10;
          };
+
          "clock" = {
            format = "{:%H:%M}";
            format-alt = "{:%b %d %Y}";
@ -60,21 +60,17 @@ in

          "cpu" = {
            interval = 10;
-            format = "  {}%";
+            format = "🤖 {}%";
            max-length = 10;
-            on-click = "";
          };
+
          "memory" = {
            interval = 30;
            format = "🧠 {}%";
            format-alt = "🧠 {used:0.1f}GB";
            max-length = 10;
          };
-          "temperature" = {
-            interval = 10;
-            format = " {temperatureC}°C";
-            max-length = 10;
-          };
+
          "backlight" = {
            device = "intel_backlight";
            format = "{icon}";
@ -86,6 +82,7 @@ in
            smooth-scrolling-threshold = "2400";
            tooltip-format = "Brightness {percent}%";
          };
+
          "network" = {
            format-wifi = "<small>{bandwidthDownBytes}</small> {icon}";
            min-length = 10;
@ -94,7 +91,7 @@ in
            format-disconnected = "󰤭";
            tooltip-format = "{essid}";
            interval = 1;
-            on-click = "~/.config/hypr/scripts/wofi-wifi.sh";
+            on-click = "~/.config/hypr/scripts/rofi-wifi.sh";
            format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
          };

@ -105,17 +102,6 @@ in
            on-click = "~/.config/hypr/scripts/wg-toggle.sh";
          };

-          "bluetooth" = {
-            format = "{icon}";
-            format-alt = "bluetooth: {status}";
-            interval = 30;
-            format-icons = {
-              enabled = "";
-              disabled = "󰂲";
-            };
-            tooltip-format = "{status}";
-          };
-
          "pulseaudio" = {
            format = "{icon}";
            format-muted = "󰖁";
@ -134,8 +120,8 @@ in
            adapter = "ADP0";
            interval = 60;
            states = {
-              warning = 20;
-              critical = 15;
+              warning = 15;
+              critical = 7;
            };
            max-length = 20;
            format = "{icon}";
@ -145,8 +131,9 @@ in
            format-plugged = "󰚥";
            format-notcharging = "󰚥";
            format-full = "󰂄";
-
-            format-alt = "<small>{capacity}%</small> ";
+            format-alt = "<small>{capacity}%</small>";
+            format-alt-warning = "<small>{capacity}%</small>";
+            format-critical-alt = "<small>{capacity}%</small>";
            format-icons = [ "󱊡" "󱊢" "󱊣" ];
          };

@ -190,7 +177,7 @@ in

          "custom/launcher" = {
            format = "󱄅";
-            on-click = "wofi --show drun --allow-images";
+            on-click = "rofi -show drun";
          };

          "custom/wallpaper" = {
@ -199,386 +186,143 @@ in
          };
        };
      };
-      style = '' 
-                  * {
-            /* `otf-font-awesome` is required to be installed for icons */
-            font-family: Material Design Icons, JetBrainsMono Nerd Font, Iosevka Nerd Font ;
-            font-size: 14px;
-            border: none;
-            border-radius: 0;
-            min-height: 0;
+
+
+      style = /*css*/ '' 
+  
+        * {
+          font-family: JetBrains Mono, JetBrainsMono Nerd Font, Material Design Icons;
+          font-size: 17px; 
+          border: none;
+          border-radius: 0;
+          min-height: 0;
+        }
+
+        window#waybar {
+          background-color: rgba(26, 27, 38, 0.5);          
+          color: #ffffff;
+          transition-property: background-color;
+          transition-duration: 0.5s;
+        }
+
+        /* General styling for individual modules */
+        #clock,
+        #temperature,
+        #mpris,
+        #cpu,
+        #memory,
+        #tray,
+        #workspaces,
+        #custom-launcher,
+        #custom-weather,
+        #custom-wg {
+          background-color: #222034;
+          font-size: 14px;
+          color: #8a909e;
+          padding: 3px 8px;
+          border-radius: 8px;
+          margin: 8px 2px;
+        }
+
+        /* Styling for Network, Pulseaudio, Backlight, and Battery group */
+        #network,
+        #pulseaudio,
+        #backlight,
+        #battery {
+          background-color: #222034;
+          font-size: 20px;
+          padding: 3px 8px;
+          margin: 8px 0px;
+        }
+
+        /* Module-specific colors for Network, Pulseaudio, Backlight, Battery */
+        #network, #pulseaudio { color: #5796E0; }
+        #backlight { color: #ecd3a0; }
+        #battery { 
+        color: #8fbcbb;
+        padding-right: 14px
+        }
+
+        /* Battery state-specific colors */
+        #battery.warning { color: #ecd3a0; }
+        #battery.critical:not(.charging) { color: #fb958b; }
+
+        /* Pulseaudio mute state */
+        #pulseaudio.muted { color: #fb958b; }
+
+        /* Styling for Language, Custom Wallpaper, Idle Inhibitor, Custom Refresh Rate group */
+        #language,
+        #custom-refresh-rate,
+        #custom-wallpaper,
+        #idle_inhibitor {
+          background-color: #222034;
+          color: #8a909e;
+          padding: 3px 4px;
+          margin: 8px 0px;
+        }
+
+        /* Rounded corners for specific group elements */
+        #language { border-radius: 8px 0 0 8px; }
+        #custom-refresh-rate { border-radius: 0 8px 8px 0; }
+        #network { border-radius: 8px 0 0 8px; }
+        #battery { border-radius: 0 8px 8px 0; }
+
+        /* Temperature, CPU, and Memory colors */
+        #temperature { color: #5796E0; }
+        #cpu { color: #fb958b; }
+        #memory { color: #a1c999; }
+
+        /* Workspaces active button styling */
+        #workspaces button {
+          color: #5796E0;
+          border-radius: 8px;
+          box-shadow: inset 0 -3px transparent;
+          padding: 3px 4px;
+          transition: all 0.5s cubic-bezier(0.55, -0.68, 0.48, 1.68);
+        }
+        #workspaces button.active {
+          color: #ecd3a0;
+          font-weight: bold;
+          border-radius: 8px;
+          transition: all 0.5s cubic-bezier(0.55, -0.68, 0.48, 1.68);
+        }
+
+        #idle_inhibitor.activated {
+          background-color: #ecf0f1;
+          color: #2d3436;
+          border-radius: 8px;
+        }
+
+        /* Custom launcher */
+        #custom-launcher {
+          color: #5796E0;
+          font-size: 22px;
+          padding-right: 14px;
+        }
+
+        /* Tooltip styling */
+        tooltip {
+          border-radius: 15px;
+          padding: 15px;
+          background-color: #222034;
+        }
+        tooltip label {
+          padding: 5px;
+          font-size: 14px;
          }

-          window#waybar {
-            background-color: rgba(26, 27, 38, 0.5);
-            color: #ffffff;
-            transition-property: background-color;
-            transition-duration: 0.5s;
-          }
-
-          window#waybar.hidden {
-            opacity: 0.1;
-          }
-
-          #window {
-            color: #64727d;
-          }
-
-          #clock,
-          #temperature,
-          #mpris, 
-          #cpu,
-          #memory,
-          #custom-media,
-          #tray,
-          #mode,
-          #custom-lock,
-          #workspaces,
-          #custom-launcher,
-          #custom-spotify,
-          #custom-weather,
-          #custom-wg,
-          #custom-weather.severe,
-          #custom-weather.sunnyDay,
-          #custom-weather.clearNight,
-          #custom-weather.cloudyFoggyDay,
-          #custom-weather.cloudyFoggyNight,
-          #custom-weather.rainyDay,
-          #custom-weather.rainyNight,
-          #custom-weather.showyIcyDay,
-          #custom-weather.snowyIcyNight,
-          #custom-weather.default {
-            color: #e5e5e5;
-            border-radius: 6px;
-            padding: 2px 10px;
-            background-color: #252733;
-            border-radius: 8px;
-            font-size: 14px;
-
-            margin-left: 4px;
-            margin-right: 4px;
-
-            margin-top: 8.5px;
-            margin-bottom: 8.5px;
-          }
-          #temperature{
-            color: #7a95c9;
-          }
-          #cpu {
-            color: #fb958b;
-          }
-
-          #memory {
-            color: #a1c999;
-          }
-
-          #workspaces button {
-            color: #7a95c9;
-            box-shadow: inset 0 -3px transparent;
-
-            padding-right: 3px;
-            padding-left: 4px;
-
-            margin-left: 0.1em;
-            margin-right: 0em;
-            transition: all 0.5s cubic-bezier(0.55, -0.68, 0.48, 1.68);
-          }
-
-          #workspaces button.active {
-            color: #ecd3a0;
-            padding-left: 1px;
-            padding-right: 5px;
-            font-family: Iosevka Nerd Font;
-            font-weight: bold;
-            font-size: 12px;
-            margin-left: 0em;
-            margin-right: 0em;
-            transition: all 0.5s cubic-bezier(0.55, -0.68, 0.48, 1.68);
-          }
-
-          /* If workspaces is the leftmost module, omit left margin */
-          .modules-left > widget:first-child > #workspaces {
-            margin-left: 0;
-          }
-
-          /* If workspaces is the rightmost module, omit right margin */
-          .modules-right > widget:last-child > #workspaces {
-            margin-right: 0;
-          }
-
-          #custom-launcher {
-            margin-left: 12px;
-
-            padding-right: 18px;
-            padding-left: 14px;
-
-            font-size: 22px;
-
-            color: #7a95c9;
-
-            margin-top: 8.5px;
-            margin-bottom: 8.5px;
-          }
-          #bluetooth,
-          #backlight,
-          #battery,
-          #pulseaudio,
-          #network {
-            background-color: #252733;
-            padding: 0em 2em;
-
-            font-size: 14px;
-
-            padding-left: 7.5px;
-            padding-right: 7.5px;
-
-            padding-top: 3px;
-            padding-bottom: 3px;
-
-            margin-top: 7px;
-            margin-bottom: 7px;
-            
-            font-size: 20px;
-          }
-
-          #pulseaudio {
-            color: #81A1C1;
-            padding-left: 9px;
-            font-size: 22px;
-          }
-
-          #pulseaudio.muted {
-            color: #fb958b;
-            padding-left: 9px;
-            font-size: 22px;
-          }
-
-          #backlight {
-            color: #ecd3a0;
-            padding-right: 5px;
-            padding-left: 8px;
-            font-size: 21.2px;
-          }
-
-          #network {
-            padding-left: 0.2em;
-            color: #5E81AC;
-            border-radius: 8px 0px 0px 8px;
-            padding-left: 14px;
-            padding-right: 14px;
-            font-size: 20px;
-          }
-
-          #network.disconnected {
-            color: #fb958b;
-          }
-
-          #bluetooth {
-            padding-left: 0.2em;
-            color: #5E81AC;
-            border-radius: 8px 0px 0px 8px;
-            padding-left: 14px;
-            padding-right: 14px;
-            font-size: 20px;
-          }
-
-          #bluetooth.disconnected {
-            color: #fb958b;
-          }
-
-
-          #battery {
-            color: #8fbcbb;
-            border-radius: 0px 8px 8px 0px;
-            padding-right: 12px;
-            padding-left: 12px;
-            font-size: 22px;
-          }
-
-          #battery.critical,
-          #battery.warning,
-          #battery.full,
-          #battery.plugged {
-            color: #8fbcbb;
-            padding-left: 12px;
-            padding-right: 12px;
-            font-size: 22px;
-          }
-
-          #battery.charging { 
-            font-size: 18px;
-            padding-right: 12px;
-            padding-left: 12px;
-          }
-
-          #battery.full,
-          #battery.plugged {
-            font-size: 22.5px;
-            padding-right: 12px;
-          }
-
-          @keyframes blink {
-            to {
-              background-color: rgba(30, 34, 42, 0.5);
-              color: #abb2bf;
-            }
-          }
-
-          #battery.warning {
-            color: #ecd3a0;
-          }
-
-          #battery.critical:not(.charging) {
-            color: #fb958b;
-          }
-
-          #custom-lock {
-            color: #ecd3a0;
-            padding: 0 15px 0 15px;
-            margin-left: 7px;
-            margin-top: 7px;
-            margin-bottom: 7px;
-          }
-          #clock {
-            color: #8a909e;
-            font-family: Iosevka Nerd Font;
-            font-weight: bold;
-            margin-top: 7px;
-            margin-bottom: 7px;
-          }
-        
-          #language,
-          #custom-refresh-rate,
-          #custom-wallpaper,
-          #idle_inhibitor {
-            background-color: #252733;
-    color: #8a909e;
-    font-family: JetBrains Mono Nerd Font;
-    font-weight: bold;
-    font-size: 17px;
-    padding: 0 7px; /* Adjust padding here */
-    margin-top: 7px;
-    margin-bottom: 7px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-}
-
-#language {
-    border-radius: 8px 0 0 8px; /* Rounded on the left */
-}
-
-#custom-refresh-rate {
-    border-radius: 0 8px 8px 0; /* Rounded on the right */
-    margin-right: 12px;
-}
-
-#custom-wallpaper,
-#idle_inhibitor {
-    /* No border-radius here to avoid separation */
-    padding-left: 7px;
-    padding-right: 7px;
-}
-
-/* Remove additional borders/margins that might cause separation */
-#idle_inhibitor,
-#custom-wallpaper {
-    margin-left: 0; /* Reset margin */
-    margin-right: 0; /* Reset margin */
-    margin-top: 7px; /* Reset margin */
-    margin-bottom: 7px; /* Reset margin */
-}
-
-          tooltip {
-            font-family: Iosevka Nerd Font;
-            border-radius: 15px;
-            padding: 15px;
-            background-color: #1f232b;
-          }
-
-          tooltip label {
-            font-family: Iosevka Nerd Font;
-            padding: 5px;
-          }
-
-          label:focus {
-            background-color: #1f232b;
-          }
-
-          #tray {
-            margin-right: 8px;
-            margin-top: 7px;
-            margin-bottom: 7px;
-            font-size: 30px;
-
-          }
-
-          #tray > .passive {
-            -gtk-icon-effect: dim;
-          }
-
-          #tray > .needs-attention {
-            -gtk-icon-effect: highlight;
-            background-color: #eb4d4b;
-          }
-
-          #idle_inhibitor.activated {
-            background-color: #ecf0f1;
-            color: #2d3436;
-            border-radius: 8px
-          }
-          #mpris,
-          #custom-spotify {
-            color: #abb2bf;
-          }
-
-          #custom-weather {
-            font-family: Iosevka Nerd Font;
-            font-size: 14px;
-            color: #8a909e;
-          }
-
-          #custom-weather.severe {
-            color: #eb937d;
-          }
-
-          #custom-weather.sunnyDay {
-            color: #c2ca76;
-          }
-
-          #custom-weather.clearNight {
-            color: #cad3f5;
-          }
-
-          #custom-weather.cloudyFoggyDay,
-          #custom-weather.cloudyFoggyNight {
-            color: #c2ddda;
-          }
-
-          #custom-weather.rainyDay,
-          #custom-weather.rainyNight {
-            color: #5aaca5;
-          }
-
-          #custom-weather.showyIcyDay,
-          #custom-weather.snowyIcyNight {
-            color: #d6e7e5;
-          }
-
-          #custom-weather.default {
-            color: #dbd9d8;
-          }
-    '';
+  '';
    };

    home.packages = with pkgs; [
-      wofi
-      wofi-emoji
      dbus
      sway-contrib.grimshot
      hyprlock
      hypridle
      hyprpaper
      hyprpicker
+      rofi-wayland
+      rofimoji
      qt6.qtwayland
      kdePackages.qt6ct
      slurp
@ -597,10 +341,11 @@ in
      brightnessctl
      pamixer
      pavucontrol # Volume control
-      dunst # Notifications
      jellyfin-ffmpeg # Multimedia libs
      viewnior # Image viewr
+      mako # Notifications
      libcanberra-gtk3 # Notification sound
+      libnotify # notify-send

      # Gnome Stuff
      gtk-engine-murrine
@ -615,3 +360,4 @@ in
    ];
  };
 }
+
--- a/home/features/desktop/xdg.nix
+++ b/home/features/desktop/xdg.nix
@ -11,7 +11,7 @@ in

  config = mkIf cfg.enable {

-    home.file.".config/user-dirs.dirs".text = ''
+    home.file.".config/user-dirs.dirs".text = /*bash*/ ''
      XDG_DESKTOP_DIR="$HOME/Desktop"
      XDG_DOWNLOAD_DIR="$HOME/Downloads"
      XDG_PUBLICSHARE_DIR="$HOME/Public"
--- a/home/features/themes/qt.nix
+++ b/home/features/themes/qt.nix
@ -14,7 +14,7 @@ in
      enable = true;
      platformTheme.name = "adwaita";
      style = {
-        name = "Adwaita-dark";
+        name = "adwaita-dark";
      };
    };

--- a/home/nomad/dotfiles/bat.nix
+++ b/home/nomad/dotfiles/bat.nix
@ -1,5 +1,5 @@
 {
-  home.file.".config/bat/config".text = ''
+  home.file.".config/bat/config".text = /*bash*/ ''
    --theme="Dracula"

    # Show line numbers, Git modifications and file header (but no grid)
--- a/home/nomad/dotfiles/default.nix
+++ b/home/nomad/dotfiles/default.nix
@ -1,11 +1,13 @@
 { inputs, pkgs, ... }: {
  imports = [
    ./bat.nix
-    ./dunst.nix
+    ./kitty.nix
+    ./rofi.nix
+    ./nvim.nix
  ];

-  home.file.".config/nvim" = {
-    source = "${inputs.dotfiles}/nvim";
+  home.file.".config/mako" = {
+    source = "${inputs.dotfiles}/mako";
    recursive = true;
  };

--- a/home/nomad/dotfiles/dunst.nix
+++ b/home/nomad/dotfiles/dunst.nix
@ -1,208 +0,0 @@
-{
-  home.file.".config/dunst/dunstrc".text = ''
-        [global]
-
-        # --- Display --- #
-
-        # The monitor to be displayed to
-        monitor = 0
-
-        # Follow monitor with mouse
-        follow = mouse
-
-        width = 300
-        # height = 260
-        origin = top-right
-        offset = 10x1
-
-
-        progress_bar = true
-        progress_bar_height = 14
-        progress_bar_frame_width = 1
-        progress_bar_min_width = 150
-        progress_bar_max_width = 300
-        progress_bar_corner_radius = 5
-
-
-        # Show how many messages are hidden
-        indicate_hidden = yes
-
-        # Shrink window if it's smaller than the width.
-        shrink = no
-
-        # The transparency of the window.
-        transparency = 1
-
-        # Draw a line between multiple notifications
-        separator_height = 6
-
-        separator_color = "#272f57"
-
-        # Set notification padding
-        padding = 16
-        horizontal_padding = 16
-
-        # Disable frame (border)
-        frame_width = 0
-
-        # Sort messages by urgency.
-        sort = no
-
-        # Disable idle time
-        idle_threshold = 0
-
-   
-        # --- Text --- #
-
-        # Set the font
-        # font = "Noto Sans 11"
-        font = "JetBrainsMono 11"
-
-        # Set line height to font height
-        line_height = 0
-
-        # Reference for markup and formatting:
-        #  <b>bold</b>
-        #  <i>italic</i>
-        #  <s>strikethrough</s>
-        #  <u>underline</u>
-        #  <https://developer.gnome.org/pango/stable/pango-Markup.html>.
-        #  %a appname
-        #  %s summary
-        #  %b body
-        #  %i iconname (including its path)
-        #  %I iconname (without its path)
-        #  %p progress value if set ([  0%] to [100%]) or nothing
-        #  %n progress value if set without any extra characters
-        #  %% Literal %
-
-        markup = full
-        format = "<b>%a</b>\n%b\n%s"
-
-        # Left align the text
-        alignment = left
-
-        # Vertical alignment of message text and icon.
-        vertical_alignment = center
-
-        # Show age of message if message is old
-        show_age_threshold = 120
-
-        # Wrap text if it doesn't fit in geometry
-        word_wrap = yes
-
-        # Where to place ellipses if word wrap is disabled
-        # ellipsize = middle
-
-        # Use newlines '\n' in notifications.
-        ignore_newline = no
-
-        # Don't stack together notifications
-        stack_duplicates = true
-
-        # Hide the count of stacked notifications
-        # hide_duplicate_count = false
-
-        # Display indicators for URLs (U) and actions (A).
-        show_indicators = yes
-
-    
-        # ---- Icons ---- #
-
-        # Align icons left/right/off
-        icon_position = left
-
-        # Scale small icons up to this size, set to 0 to disable.
-        min_icon_size = 50
-
-        # Scale larger icons down to this size, set to 0 to disable
-        max_icon_size = 60
-
-        # Paths to default icons.
-        icon_path = /usr/share/icons/kora/apps/scalable:/usr/share/icons/kora/status/scalable:/usr/share/icons/kora/actions/scalable:/usr/share/icons/kora/emblems/scalable:/usr/share/icons/kora/devices/scalable
- 
-        # --- History --- #
-
-        # Avoid timing out hidden notifications
-        sticky_history = yes
-
-        # Maximum amount of notifications kept in history
-        history_length = 100
-
-
-        # --- Misc/Advanced --- #
-
-        dmenu = /usr/bin/dmenu -p dunst:
-
-        # Browser for opening urls in context menu.
-        browser = google-chrome-stable -new-tab
-
-        # Always run rule-defined scripts, even if the notification is suppressed
-        always_run_script = false
-
-        # Define the title of the windows spawned by dunst
-        title = Dunst
-
-        # Define the class of the windows spawned by dunst
-        class = Dunst
-
-        # Define the corner radius of the notification window
-        corner_radius = 20
-
-        # Don't gnore the dbus closeNotification message.
-        ignore_dbusclose = false
-
-
-        # --- Legacy --- #
-
-        # Use the Xinerama extension instead of RandR for multi-monitor support.
-        force_xinerama = false
-
-
-        # --- Mouse --- #
-        mouse_left_click = close_current
-        mouse_middle_click = close_all, close_current
-        mouse_right_click = do_action
-
-
-    [experimental]
-        per_monitor_dpi = false
-
-    [urgency_low]
-        background = "#141929fe"
-        highlight = "#6fa6e7"
-        frame_color = "#272f57"
-        foreground = "#dae1f2"
-        timeout = 8
-
-    [urgency_normal]
-        background = "#26292e"
-        highlight = "#5ca1ff"
-
-        frame_color = "#272f57"
-        foreground = "#dae1f2"
-        timeout = 8
-
-    [urgency_critical]
-        background = "#5ca1ffff"
-        highlight = "#fe6c5a"
-        foreground = "#1c2138"
-        frame_color = "#52426e"
-        timeout = 0
-        icon = battery-ac-adapter
-
-    [backlight]
-        appname = "Backlight"
-        highlight = "#fc7b80"
-
-    [music]
-        appname = "Music"
-
-    [volume]
-        summary = "Volume*"
-        highlight = "#cb8cf4"
-
-    [battery]
-        appname = "Power Warning"
-  '';
-}
--- a/home/nomad/dotfiles/kitty.nix
+++ b/home/nomad/dotfiles/kitty.nix
@ -0,0 +1,97 @@
+{
+  home.file.".config/kitty/kitty.conf".text = /*bash*/ ''
+    linux_display_server wayland
+    wayland_titlebar_color background
+    allow_remote_control yes
+    enable_audio_bell no
+
+    font_family JetBrainsMono Nerd Font
+    bold_font        auto
+    italic_font      auto
+    bold_italic_font auto
+
+    font_size 14
+    background_opacity 0.9
+
+    # window settings
+    initial_window_width 95c
+    initial_window_height 35c
+    window_padding_width 20
+    confirm_os_window_close 0
+
+    # Upstream colors {{{
+
+    # Special
+    background #14151e 
+    foreground #98b0d3 
+
+    # Black
+    color0 #151720
+    color8 #4f5572 
+
+    # Red
+    color1 #dd6777
+    color9 #e26c7c
+
+    # Green
+    color2  #90ceaa
+    color10 #95d3af
+
+    # Yellow
+    color3  #ecd3a0
+    color11 #f1d8a5
+
+    # Blue
+    color4  #86aaec
+    color12 #8baff1
+
+    # Magenta
+    color5  #c296eb
+    color13 #c79bf0
+
+    # Cyan
+    color6  #93cee9
+    color14 #98d3ee
+
+    # White
+    color7  #cbced3
+    color15 #d0d3d8
+
+    # Cursor
+    cursor #cbced3
+    cursor_text_color #a5b6cf
+
+    # Selection highlight
+    selection_foreground #a5b6cf
+    selection_background #1c1e27
+
+
+    # The color for highlighting URLs on mouse-over
+    # url_color #9ece6a
+    url color #5de4c7
+
+    # Window borders
+    active_border_color #3d59a1
+    inactive_border_color #101014
+    bell_border_color #fffac2
+
+    # Tab bar
+    tab_bar_style fade
+    tab_fade 1
+    active_tab_foreground   #3d59a1
+    active_tab_background   #16161e
+    active_tab_font_style   bold
+    inactive_tab_foreground #787c99
+    inactive_tab_background #16161e
+    inactive_tab_font_style bold
+    tab_bar_background #101014
+
+    # Title bar
+    macos_titlebar_color #16161e
+
+    # {{{ Keybindings
+    map ctrl+t     new_tab_with_cwd
+    map ctrl+t     close_tab
+    # }}
+  '';
+}
--- a/home/nomad/dotfiles/rofi.nix
+++ b/home/nomad/dotfiles/rofi.nix
@ -0,0 +1,7 @@
+{ inputs, ... }:
+{
+  home.file.".config/rofi" = {
+    source = "${inputs.dotfiles}/rofi";
+    recursive = true;
+  };
+}
--- a/home/nomad/unkown.nix
+++ b/home/nomad/unkown.nix
@ -10,7 +10,9 @@

  features = {
    cli = {
-      zsh.enable = true;
+      zsh.enable = false;
+      nushell.enable = false;
+      fish.enable = true;
      fzf.enable = true;
      neofetch.enable = true;
    };
@ -30,36 +32,19 @@

  wayland.windowManager.hyprland = {
    settings = {
-      # device = [
-      #   {
-      #     name = "33a6c9b0";
-      #     kb_layout = "us,ara";
-      #     kb_variant = "qwerty_digits";
-      #     kb_options = "grp:alt_shift_toggle";
-      #   }
-      #   {
-      #     name = "338ebb50"; # xiaomi-wmi-keys
-      #     kb_layout = "us";
-      #     kb_options = ""; # Custom options if needed
-      #   }
-      #   {
-      #     name = "38db2b20";
-      #     sensitivity = 0.5;
-      #   }
-      # ];
      monitor = [
-        "eDP-1,2560x1600@60,0x0,1.25"
-        "DP-2,1920x1080@60,auto,1"
+        "DP-1,highres,auto,1"
+        "eDP-1,2560x1600@60,0x0,1.25,mirror,DP-1"

      ];
      workspace = [
-        "1, monitor:eDP-1, default:true"
-        "2, monitor:eDP-1"
-        "3, monitor:eDP-1"
-        "4, monitor:eDP-1"
-        "5, monitor:eDP-1"
-        "6, monitor:eDP-1"
-        "7, monitor:eDP-1"
+        # "1, monitor:DP-1, default:true"
+        # "2, monitor:DP-1"
+        # "3, monitor:DP-1"
+        # "4, monitor:DP-1"
+        # "5, monitor:DP-1"
+        # "6, monitor:DP-1"
+        # "7, monitor:DP-1"
      ];
    };
  };
--- a/home/nomad/unkown/home.nix
+++ b/home/nomad/unkown/home.nix
@ -7,28 +7,25 @@
 {
  home.username = lib.mkDefault user;
  home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
  home.stateVersion = "24.05"; # Please read the comment before changing.

-  # The home.packages option allows you to install Nix packages into your
-  # environment.
  home.packages = with pkgs; [
    # Essentials
    kitty
+    alacritty
+    tmux
    firefox
    google-chrome
+    age
+    sops
+    networkmanagerapplet
+    nvd
    # Apps
    vlc
    amberol
    webcord
-    bottles
-    cava
+    #bottles
+    #cava
    ryujinx
    mullvad-vpn
    transmission_4-gtk
@ -37,11 +34,17 @@
    syncthing
    qsyncthingtray
    htop
-    nvtopPackages.full
+    openvpn
+    #nvtopPackages.full
    exiftool
    moonlight-qt
    kdePackages.kdeconnect-kde
+    cmatrix
+    #jellyfin-media-player
+    speedtest-go
+    wireguard-tools
    # Dev
+    devbox
    go
    python3
    nim
@ -51,13 +54,18 @@
    bruno
    ripgrep
    zip
-    #zed-fhs
-    # android-studio
-    # android-tools
+    nodejs
+    gcc
+    python312Packages.pip
+    android-studio
+    android-tools
    jre17_minimal
-    # Nvim-Lua
+    # Nvim-Lsps
    lua-language-server
-    cowsay
+    tailwindcss-language-server
+    glow
+    # Hacks
+    responder-patched


    # # Adds the 'hello' command to your environment. It prints a friendly
@ -78,20 +86,7 @@
    # '')
  ];

-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
+  home.file = { };

  # Home Manager can also manage your environment variables through
  # 'home.sessionVariables'. If you don't want to manage your shell through Home
@ -115,6 +110,8 @@
    NIXOS_OZONE_WL = "1";
    MOZ_ENABLE_WAYLAND = "1";
    SDL_VIDEODRIVER = "wayland";
+    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+    ELECTRON_EXTRA_FLAGS = "--force-device-scale-factor=1.5";
    #_JAVA_AWT_WM_NONREPARENTING = "1";
    #MOZ_DRM_DEVICE = "/dev/dri/card0:/dev/dri/card1";
    #WLR_DRM_DEVICES = "/dev/dri/card0:/dev/dri/card1";
--- a/home/nomad/vps.nix
+++ b/home/nomad/vps.nix
@ -8,7 +8,7 @@

  features = {
    cli = {
-      zsh.enable = true;
+      fish.enable = true;
      fzf.enable = true;
      neofetch.enable = true;
    };
--- a/hosts/common/services/nautilus.nix
+++ b/hosts/common/services/nautilus.nix
@ -13,7 +13,7 @@ in
    services.gnome.gnome-keyring.enable = true;
    programs.nautilus-open-any-terminal = {
      enable = true;
-      terminal = "kitty";
+      terminal = "alacritty";
    };
    services.gvfs.enable = true;
    services.tumbler.enable = true;
--- a/hosts/common/users/nomad.nix
+++ b/hosts/common/users/nomad.nix
@ -8,7 +8,7 @@
    ${user} = {
      initialPassword = "4321";
      isNormalUser = true;
-      shell = pkgs.zsh;
+      shell = pkgs.fish;
      description = "${user}";
      extraGroups = [
        "wheel"
@ -23,24 +23,25 @@
        "qemu-libvirtd"
        "docker"
        "key"
+        "wireshark"
      ];
      packages = [ inputs.home-manager.packages.${pkgs.system}.default ];
+
      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqA7j8hk3+k0b04eDxuoUakldqKrP0aatLm+CREjFJe"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqA7j8hk3+k0b04eDxuoUakldqKrP0aatLm+CREjFJe" #SSH, YOU HAVE TO CHANGE THIS OR REMOVE IT
      ];
    };

    root = {
      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqA7j8hk3+k0b04eDxuoUakldqKrP0aatLm+CREjFJe"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqA7j8hk3+k0b04eDxuoUakldqKrP0aatLm+CREjFJe" #SSH, YOU HAVE TO CHANGE THIS OR REMOVE IT
+
      ];
      extraGroups = [ "key" ];
    };
  };

-  # Decrypt the secrets file using sops-nix with age
-
-
+  #Decrypt the secrets file using sops-nix with age
  sops.secrets = {
    DUFS_USERNAME = { };
    DUFS_PASSWORD = { };
@ -49,7 +50,6 @@
    NEXTCLOUD_DB = { };
  };

-
  sops.templates."my-env.env".content = ''
    DUFS_USERNAME = "${config.sops.placeholder.DUFS_USERNAME}"
    DUFS_PASSWORD = "${config.sops.placeholder.DUFS_PASSWORD}"
@ -58,7 +58,13 @@
    NEXTCLOUD_DB = "${config.sops.placeholder.NEXTCLOUD_DB}"
  '';

-  programs.zsh.enable = true;
+  programs.wireshark = {
+    enable = true;
+    package = pkgs.wireshark;
+  };
+
+  # programs.zsh.enable = true;
+  programs.fish.enable = true;
  home-manager.users.${user} =
    import ../../../home/${user}/${config.networking.hostName}.nix;
 }
--- a/hosts/common/vps/audiobookshelf.nix
+++ b/hosts/common/vps/audiobookshelf.nix
@ -0,0 +1,42 @@
+{ config, lib, pkgs, user, ... }:
+with lib;
+
+let
+  audiobookshelfService = {
+    project.name = "audiobookshelf";
+    services = {
+      dashdot = {
+        service = {
+          image = "ghcr.io/advplyr/audiobookshelf:latest";
+          ports = [
+            "13378:80"
+          ];
+          volumes = [
+            "${config.users.users.${user}.home}/dockers/audiobookshelf/audiobooks:/audiobooks"
+            "${config.users.users.${user}.home}/dockers/audiobookshelf/podcasts:/podcasts"
+            "${config.users.users.${user}.home}/dockers/audiobookshelf/config:/config"
+            "${config.users.users.${user}.home}/dockers/audiobookshelf/metadata:/metadata"
+          ];
+          environment = {
+            TZ = "Asia/Kuwait";
+          };
+        };
+      };
+    };
+  };
+in
+{
+  options.vps.audiobookshelf.enable = mkEnableOption "Enable audiobookshelf for VPS";
+
+  config = mkIf config.vps.audiobookshelf.enable {
+    virtualisation.arion = {
+      backend = "docker";
+      projects.audiobookshelf = {
+        serviceName = "audiobookshelf";
+        settings = audiobookshelfService;
+      };
+    };
+  };
+}
+
+
--- a/hosts/common/vps/default.nix
+++ b/hosts/common/vps/default.nix
@ -6,6 +6,7 @@
    ./syncthing.nix
    ./vpn.nix
    ./dashdot.nix
+    ./audiobookshelf.nix
  ];

 }
--- a/hosts/unkown/configuration.nix
+++ b/hosts/unkown/configuration.nix
@ -27,6 +27,15 @@
  common.services.steam.enable = true;
  services.flatpak.enable = true;

+  # Sops secrets Comment this out if you dont need secrets! and configure ur user in hosts/common/users/YOURUSERNAME.nix
+  sops = {
+    age.keyFile = "/etc/nixos/sops/age/keys.txt";
+    defaultSopsFile = ../../secrets/secrets.yaml;
+    defaultSopsFormat = "yaml";
+  };
+
+  #services.samba.enable = true;
+

  #Bootloader
  boot.loader.systemd-boot.enable = true;
@ -37,13 +46,6 @@
  # Ntfs support
  boot.supportedFilesystems = [ "ntfs" ];

-  sops = {
-    age.keyFile = "/etc/nixos/sops/age/keys.txt";
-    defaultSopsFile = ../../secrets/secrets.yaml;
-    defaultSopsFormat = "yaml";
-  };
-
-

  # Enable GDM Login Manager
  services.xserver.enable = true;
@ -64,15 +66,23 @@
  networking.hostName = "${hostname}";
  # Enable networking
  networking.networkmanager.enable = true;
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+  };
+  #Hosts 
+  networking.extraHosts = ''
+    192.168.0.200 rancher.local
+  '';

  # Bluethooth
  hardware.bluetooth.enable = true;
-  # services.blueman.enable = true;
+  services.blueman.enable = true;

  # Enable sound with pipewire.
  # sound.enable = true;
  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = false;
+  security.rtkit.enable = true;
  services.pipewire = {
    enable = true;
    alsa.enable = true;
@ -84,7 +94,10 @@


  # Set your time zone.
-  time.timeZone = "Asia/Kuwait";
+  #time.timeZone = "Asia/Kuwait";
+  services.ntp = {
+    enable = true;
+  };
  # Select internationalisation properties.
  i18n.defaultLocale = "en_US.UTF-8";
  i18n.extraLocaleSettings = {
@ -103,7 +116,7 @@
  services.xserver = {
    exportConfiguration = true; # link /usr/share/X11/ properly
    xkb.layout = "us,ara";
-    xkb.options = "grp:alt_shift_toggle";
+    xkb.options = "grp:alt_shift_toggle,ctrl:swapcaps";
    xkb.variant = "qwerty_digits";
  };

@ -124,6 +137,7 @@
    neovim
    git
    zsh
+    nssmdns
  ];

  #Firewall
@ -133,6 +147,7 @@
  # networking.firewall.allowedUDPPortRanges = [ { from = 32768; to = 60999; } ];
  # Or disable the firewall altogether.
  networking.firewall.enable = false;
+  networking.nftables.enable = false;


  # Before changing this value read the documentation for this option
--- a/hosts/unkown/hardware/nvidia.nix
+++ b/hosts/unkown/hardware/nvidia.nix
@ -74,7 +74,8 @@ in
    virtualisation.docker = {
      enable = true;
      enableOnBoot = true;
-      #enableNvidia = true;
+      enableNvidia = true;
+      extraOptions = ''--data-root=/home/nomad/docker-data'';
    };

    hardware.nvidia-container-toolkit.enable = true;
--- a/hosts/vps/configuration.nix
+++ b/hosts/vps/configuration.nix
@ -17,6 +17,9 @@
    };
  };

+
+  documentation.enable = false;
+
  vps = {
    dufs.enable = true;
    nextcloud.enable = false;
@ -24,6 +27,7 @@
    syncthing.enable = true;
    vpn.enable = true;
    dashdot.enable = true;
+    audiobookshelf.enable = false;
  };

  sops = {
@ -43,51 +47,66 @@

    # Reverse proxy configuration for each domain
    extraConfig = ''
-        (logging) {
-            log {
-              output file /var/log/caddy/{args[0]}.log {
-              roll_size 50mb
-              roll_keep 5
-              roll_keep_for 720h
-              }
+      (logging) {
+          log {
+            output file /var/log/caddy/{args[0]}.log {
+            roll_size 50mb
+            roll_keep 5
+            roll_keep_for 720h
            }
-        }
-
-        fs.nmd.mov {
-          reverse_proxy localhost:5000
-          import logging fs
-        }
-
-        vpn.nmd.mov {
-          reverse_proxy localhost:51821
-          import logging vpn
-        }
-
-        s.nmd.mov {
-          reverse_proxy localhost:8384
-          import logging s
-        }
-
-        drop.nmd.mov {
-          reverse_proxy localhost:3000
-          import logging drop
-        }
-
-        dot.nmd.mov {
-          reverse_proxy localhost:19999
-
-          basic_auth /* {
-            nomad $2a$12$toBh5sfXyxigtHGNY4t8tO7YYQp6i3aZk/O0qd19lgk0LRz5eqDVi
          }
+      }
+
+      fs.nmd.mov {
+        reverse_proxy localhost:5000
+        import logging fs
+      }
+
+      vpn.nmd.mov {
+        reverse_proxy localhost:51821
+        import logging vpn
+      }
+
+      s.nmd.mov {
+        reverse_proxy localhost:8384
+        import logging s
+      }
+
+      drop.nmd.mov {
+        reverse_proxy localhost:3000
+        import logging drop
+      }
+
+      dot.nmd.mov {
+        reverse_proxy localhost:19999
+
+        basic_auth /* {
+          nomad $2a$12$toBh5sfXyxigtHGNY4t8tO7YYQp6i3aZk/O0qd19lgk0LRz5eqDVi
        }
+      }

-        dash.nmd.mov {
-          reverse_proxy localhost:8080
+      dash.nmd.mov {
+        reverse_proxy localhost:8080
+      }
+
+
+        nmd.mov www.nmd.mov {
+        reverse_proxy localhost:3001
+      }
+
+      www.alaskar.dev alaskar.dev {
+        root * /var/www/portofolio
+        file_server
+        try_files {path} {path}.html
+        handle_errors {
+          rewrite * /404.html
+          file_server
        }
+      }


-          nmd.mov {
-            root * /var/www/goaccess
+        log.nmd.mov {
+          root * /var/www/goaccess

            file_server

@ -95,7 +114,7 @@
      reverse_proxy /ws_drop localhost:7891
      reverse_proxy /ws_vpn localhost:7892
      reverse_proxy /ws_sync localhost:7893
-
+ 
          basic_auth /* {
            nomad $2a$12$toBh5sfXyxigtHGNY4t8tO7YYQp6i3aZk/O0qd19lgk0LRz5eqDVi
          }
--- a/install.sh
+++ b/install.sh
@ -4,6 +4,7 @@ GREEN="\e[32m"
 YELLOW="\e[33m"
 BLUE="\e[34m"
 ENDCOLOR="\e[0m"
+
 echo -e " $YELLOW
 _   _  ___  __  __    _    ____    _   _ _____  _____  ____    ___ _   _ ____ _____  _    _     _     _____ ____  
 | \ | |/ _ \|  \/  |  / \  |  _ \  | \ | |_ _\ \/ / _ \/ ___|  |_ _| \ | / ___|_   _|/ \  | |   | |   | ____|  _ \ 
@ -16,100 +17,84 @@ $ENDCOLOR
           $RED TO MAKE SURE EVERYTHING RUNS CORRECTLY $ENDCOLOR $GREEN RUN AS ROOT '"sudo bash install.sh"' $ENDCOLOR 
 "
 echo 
-echo

 # Prompt for username and hostname
 read -p "Enter the new username: " new_user
 read -p "Enter the new hostname: " new_hostname

-# Define the flake file path
+# Define the flake file path and current user
 flake_file="./flake.nix"
-config_file="./hosts/$new_hostname/configuration.nix"  # Specify the correct path for your host's configuration file
+config_file="./hosts/$new_hostname/configuration.nix"
 monitor_config_file="./home/$new_user/$new_hostname.nix"
 current_user=$(logname)

-
+# Check if source files exist
 if [[ ! -f "./hosts/common/users/nomad.nix" && ! -d "./hosts/unkown/" ]]; then
  echo -e "$RED Source files nomad.nix or ./hosts/unkown directory does not exist! $ENDCOLOR"
  exit 1
 fi

+# Function to copy and configure the home.nix file for the user and hostname
+setup_home_configuration() {
+    local user_dir="./home/$new_user/$new_hostname"

+    if [ ! -d "$user_dir" ]; then
+        mkdir -p "$user_dir"
+    fi
+
+    # Copy the home.nix file and update the hostname path inside
+    cp "./home/nomad/unkown/home.nix" "$user_dir/home.nix"
+    cp "./home/nomad/unkown.nix" "./home/$new_user/$new_hostname.nix"
+    cp -r "./home/nomad/dotfiles/" "./home/$new_user/"
+    sed -i "s|unkown|$new_hostname|g" "./home/$new_user/$new_hostname.nix"
+
+    chown -R $current_user:users "./home/$new_user"
+    echo -e "$GREEN Home configuration for $new_user created and updated with hostname $new_hostname! $ENDCOLOR"
+}
+
+# Function to create or overwrite host configuration
+setup_host_configuration() {
+    if [ -d "./hosts/$new_hostname" ]; then
+        read -p "Directory $new_hostname already exists. Overwrite contents? (y/n) " choice
+        if [[ "$choice" != "y" && "$choice" != "yes" ]]; then
+            echo -e "$YELLOW Skipping host configuration for $new_hostname... $ENDCOLOR"
+            return
+        fi
+        echo -e "$YELLOW Overwriting Host configuration for $new_hostname... $ENDCOLOR"
+        rm -r "./hosts/$new_hostname"
+    else
+        echo -e "$YELLOW Creating Host configuration for $new_hostname... $ENDCOLOR"
+    fi

-# Create new host
-if [ -d "./hosts/$new_hostname" ]; then
-  read -p "Directory $new_hostname already exists. Overwrite contents? (y/n) " choice
-  if [[ "$choice" != "y" && "$choice" != "yes" ]]; then
-      echo -e "$YELLOW Skipping.. $ENDCOLOR"
-else
-    echo -e "$YELLOW Overwriting Host configuration for $new_hostname... $ENDCOLOR"
-    rm -r "./hosts/$new_hostname"
    cp -r "./hosts/unkown" "./hosts/$new_hostname"
-    sleep 0.2
    chown -R $current_user:users "./hosts/$new_hostname"
+    rm "./hosts/$new_hostname/hardware-configuration.nix"
+    cp "/etc/nixos/hardware-configuration.nix" "./hosts/${new_hostname}/"
    echo -e "$GREEN Host configuration for $new_hostname created successfully! $ENDCOLOR"
-fi
-else
-    echo -e "$YELLOW Creating Host configuration for $new_hostname... $ENDCOLOR"
-    cp -r "./hosts/unkown" "./hosts/$new_hostname"
-    sleep 0.2
-    echo -e "$YELLOW Copying your hardware configurations $ENDCOLOR" 
-    cp "/etc/nixos/hardware-configuration.nix" "./hosts/unkown/hardware-configuration.nix"
-    chown -R $current_user:users "./hosts/$new_hostname"
-    echo -e "$GREEN Host configuration for $new_hostname created successfully! $ENDCOLOR"
-fi
+}

+# Function to create or overwrite user configuration
+setup_user_configuration() {
+    if [ -f "./hosts/common/users/$new_user.nix" ]; then
+        read -p "File $new_user.nix already exists. Overwrite? (y/n) " choice
+        if [[ "$choice" != "y" && "$choice" != "yes" ]]; then
+            echo -e "$YELLOW Skipping user configuration for $new_user... $ENDCOLOR"
+            return
+        fi
+        echo -e "$YELLOW Overwriting User configuration for $new_user... $ENDCOLOR"
+    else
+        echo -e "$YELLOW Creating User configuration for $new_user... $ENDCOLOR"
+    fi

-# Create user directories
-if [ -f "./hosts/common/users/$new_user.nix" ]; then
-  read -p "File $new_user.nix already exists. Overwrite? (y/n) " choice
-  if [[ "$choice" != "y" && "$choice" != "yes" ]]; then
-      echo -e "$YELLOW Skipping.. $ENDCOLOR"
-else
-    echo -e "$YELLOW Overwriting User configuration for $new_user... $ENDCOLOR"
    cp "./hosts/common/users/nomad.nix" "./hosts/common/users/$new_user.nix"
    chown $current_user:users "./hosts/common/users/$new_user.nix"
    echo -e "$GREEN User configuration for $new_user created successfully! $ENDCOLOR"
-fi
-else
-    echo -e "$YELLOW Creating User configuration for $new_user... $ENDCOLOR"
-    cp "./hosts/common/users/nomad.nix" "./hosts/common/users/$new_user.nix"
-    chown $current_user:users "./hosts/common/users/$new_user.nix"
-    echo -e "$GREEN User configuration for $new_user created successfully! $ENDCOLOR"
-fi
-
-if [ -d "./home/$new_user" ]; then
-  read -p "Directory $new_user already exists. Overwrite contents? (y/n) " choice
-  if [[ "$choice" != "y" && "$choice" != "yes" ]]; then
-      echo -e "$YELLOW Skipping.. $ENDCOLOR"
-else
-    echo -e "$YELLOW Overwriting Home configuration for $new_user... $ENDCOLOR"
-    if [ ! -d "./home/$new_user" ]; then
-    mkdir "./home/$new_user"
-    fi
-    sleep 0.2
-    cp "./home/nomad/home.nix" "./home/$new_user/home.nix"
-    cp "./home/nomad/unkown.nix" "./home/$new_user/$new_hostname.nix"
-    cp -r "./home/nomad/dotfiles/" "./home/$new_user/"
-    chown -R $current_user:users "./home/$new_user"
-    echo -e "$GREEN Home configuration for $new_user created successfully! $ENDCOLOR"
-fi
-else
-    echo -e "$YELLOW Creating Home configuration for $new_user... $ENDCOLOR"
-    if [ ! -d "./home/$new_user" ]; then
-    mkdir "./home/$new_user"
-    fi
-    sleep 0.2
-    cp "./home/nomad/home.nix" "./home/$new_user/home.nix"
-    cp "./home/nomad/unkown.nix" "./home/$new_user/$new_hostname.nix"
-    cp -r "./home/nomad/dotfiles/" "./home/$new_user/"
-    chown -R $current_user:users "./home/$new_user"
-    echo -e "$GREEN Home configuration for $new_user created successfully! $ENDCOLOR"
-fi
-
-
-
+}

+# Call the functions to create configurations
+setup_host_configuration
+setup_user_configuration
+setup_home_configuration

 # Replace the 'user' and 'hostname' values in the flake.nix file
 sed -i "s/user = \".*\";/user = \"$new_user\";/" "$flake_file"
@ -197,7 +182,9 @@ fi
 echo -e "$GREEN Configuration has been updated with your preferences $ENDCOLOR"

 sleep 2
- sudo nixos-rebuild boot --flake .#${new_hostname}
+ git add .
+ nixos-rebuild switch --flake .#unkown
+ home-manager switch -b backup --flake .

 echo -e "$GREEN Reboot after completion your initial password is 4321 $ENDCOLOR"

--- a/overlays/default.nix
+++ b/overlays/default.nix
@ -10,6 +10,74 @@
      # example = prev.example.overrideAttrs (oldAttrs: rec {
      # ...
      # });
+
+      rofimoji = prev.rofimoji.override { rofi = prev.rofi-wayland; };
+
+      # electron = prev.electron.overrideAttrs (oldAttrs: {
+      #   postInstall = ''
+      #     wrapProgram $out/bin/electron \
+      #       --add-flags "--force-device-scale-factor=1.5"
+      #   '';
+      # });
+
+      responder-patched = prev.responder.overrideAttrs (oldAttrs: rec {
+        buildInputs = oldAttrs.buildInputs or [ ] ++ [ prev.openssl prev.coreutils ];
+
+        installPhase = ''
+          runHook preInstall
+
+          mkdir -p $out/bin $out/share/Responder
+          cp -R . $out/share/Responder
+
+          makeWrapper ${prev.python3.interpreter} $out/bin/responder \
+            --set PYTHONPATH "$PYTHONPATH:$out/share/Responder" \
+            --add-flags "$out/share/Responder/Responder.py" \
+            --run "mkdir -p /var/lib/responder"
+
+          substituteInPlace $out/share/Responder/Responder.conf \
+            --replace-quiet "Responder-Session.log" "/var/lib/responder/Responder-Session.log" \
+            --replace-quiet "Poisoners-Session.log" "/var/lib/responder/Poisoners-Session.log" \
+            --replace-quiet "Analyzer-Session.log" "/var/lib/responder/Analyzer-Session.log" \
+            --replace-quiet "Config-Responder.log" "/var/lib/responder/Config-Responder.log" \
+            --replace-quiet "Responder.db" "/var/lib/responder/Responder.db"
+
+          runHook postInstall
+
+          runHook postPatch
+        '';
+
+        postInstall = ''
+          wrapProgram $out/bin/responder \
+            --run "mkdir -p /var/lib/responder/certs && ${prev.openssl}/bin/openssl genrsa -out /var/lib/responder/certs/responder.key 2048 && ${prev.openssl}/bin/openssl req -new -x509 -days 3650 -key /var/lib/responder/certs/responder.key -out /var/lib/responder/certs/responder.crt -subj '/'" \
+            --run "mkdir -p /etc/responder && if [ ! -f /etc/responder/Responder.conf ]; then cp $out/share/Responder/Responder.conf /etc/responder/Responder.conf && chmod +w /etc/responder/Responder.conf; fi"
+        '';
+
+        postPatch = ''
+          if [ -f $out/share/Responder/settings.py ]; then
+            substituteInPlace $out/share/Responder/settings.py \
+              --replace-quiet "self.LogDir = os.path.join(self.ResponderPATH, 'logs')" "self.LogDir = os.path.join('/var/lib/responder', 'logs')" \
+              --replace-quiet "os.path.join(self.ResponderPATH, 'Responder.conf')" "'/etc/responder/Responder.conf'"
+          fi
+
+          if [ -f $out/share/Responder/utils.py ]; then
+            substituteInPlace $out/share/Responder/utils.py \
+              --replace-quiet "logfile = os.path.join(settings.Config.ResponderPATH, 'logs', fname)" "logfile = os.path.join('/var/lib/responder', 'logs', fname)"
+          fi
+
+          if [ -f $out/share/Responder/Responder.py ]; then
+            substituteInPlace $out/share/Responder/Responder.py \
+              --replace-quiet "certs/responder.crt" "/var/lib/responder/certs/responder.crt" \
+              --replace-quiet "certs/responder.key" "/var/lib/responder/certs/responder.key"
+          fi
+
+          if [ -f $out/share/Responder/Responder.conf ]; then
+            substituteInPlace $out/share/Responder/Responder.conf \
+              --replace-quiet "certs/responder.crt" "/var/lib/responder/certs/responder.crt" \
+              --replace-quiet "certs/responder.key" "/var/lib/responder/certs/responder.key"
+          fi
+        '';
+      });
+
    };

  stable-packages = final: _prev: {
@ -19,3 +87,7 @@
    };
  };
 }
+
+
+
+
--- a/update-report.sh
+++ b/update-report.sh
@ -1,3 +1,4 @@
+
 output=$(nix store diff-closures $(ls -d /nix/var/nix/profiles/* | tail -2) | sed -r "s/\x1B\[[0-9;]*[mK]//g")

 # Replace newline characters with spaces for a more horizontal notification
@ -17,9 +18,35 @@ formatted_output=$(echo "$output" | awk '
        size_mib = size_kib / 1024
        size_mib_rounded = (size_mib >= 1) ? sprintf("%.0f", size_mib) "M" : size_kib "KiB"

-        # Create the formatted output line with special characters to make it stand out
-        printf "🔹 %s: %s +%s\n", package, version, size_mib_rounded
+        # Append each entry to the formatted output
+        formatted_output = formatted_output "🔹 " package ": " version " +" size_mib_rounded "\n"
    }
+} END {
+    # Output all entries once processing is complete
+    print formatted_output
 }')
-dunstify -u low -h string:x-dunst-stack-tag:diff -a "💫 Updated Packages" "$formatted_output"
+
+chunk_size=5
+echo "$formatted_output" | awk -v chunk_size="$chunk_size" '
+{
+    lines[++count] = $0
+    if (count % chunk_size == 0) {
+        for (i = 1; i <= count; i++) {
+            printf "%s\n", lines[i]
+        }
+        printf "---\n"
+        count = 0
+    }
+}
+END {
+    if (count > 0) {
+        for (i = 1; i <= count; i++) {
+            printf "%s\n", lines[i]
+        }
+    }
+}' | while IFS= read -r chunk; do
+    if [[ "$chunk" != "---" ]]; then
+        notify-send -u low -h string:x-mako-stack-tag:diff "💫 Updated Packages" "$chunk" -t 0 -u critical
+    fi
+done

--- a/update.sh
+++ b/update.sh
@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+git pull
+sleep 1
+sudo nixos-rebuild switch --flake .#unkown
+
+echo -e "Update Completed!"
+./update-report.sh
Author	SHA1	Message	Date
nomadics9	89ab99cdc7	update?	2025-01-15 18:09:19 +03:00
nomadics9	f2914acae6	removed electron overlay	2024-12-13 21:25:17 +03:00
nomadics9	88eff63ed8	update + changes idk	2024-12-13 21:08:00 +03:00
nomadics9	3a5a841a95	update	2024-12-02 13:07:38 +03:00
nomadics9	80b4e19d65	update	2024-11-16 13:35:31 +03:00
nomadics9	d8d06011b4	update	2024-11-15 15:19:14 +03:00
nomadics9	e781dcc3e6	installer	2024-11-10 20:40:35 +03:00
nomadics9	0683746604	bluetooth gui	2024-11-08 11:09:56 +03:00
nomadics9	c6f1f73d2f	home-manager backup and switch automatically in installer	2024-11-08 10:57:47 +03:00
nomadics9	47d14ddb4e	wf-recorder + lang flags	2024-11-06 19:53:06 +03:00
nomadics9	c4a7b38132	dotfiles lock	2024-11-06 01:27:41 +03:00
nomadics9	4707437c3e	pull build script	2024-11-06 01:06:29 +03:00
nomadics9	d7825e1058	rofi dotfiles	2024-11-05 21:22:41 +03:00
nomadics9	e61480fd63	rofi instead of wofi	2024-11-05 19:48:29 +03:00
nomadics9	fe9e1bdbc8	rofi instead of wofi	2024-11-05 19:45:02 +03:00
nomadics9	1ae049d8ed	update-report script	2024-11-03 01:40:44 +03:00
nomadics9	7f36be9690	kitty config + lock update	2024-11-03 01:34:13 +03:00
nomadics9	411b88d724	code highlights	2024-11-02 21:00:56 +03:00
nomadics9	61228560a8	fix: installer to fetch hardware configurations from /etc/nixos	2024-11-01 14:52:16 +03:00
nomadics9	84ec0729ed	fix: installer to flake boot instead of switch	2024-11-01 14:47:16 +03:00
nomadics9	b3e57ab637	fix: installer aligned with new paths	2024-11-01 14:39:56 +03:00
nomadics9	b85021ea77	fix: installer aligned with new paths	2024-11-01 14:38:27 +03:00
nomadics9	76afa84797	audiobookshelf	2024-10-27 22:41:16 +03:00
nomadics9	140692fc6f	fix	2024-10-26 22:43:35 +03:00
nomadics9	24b3d6c9ce	waybar css code clean	2024-10-26 20:21:56 +03:00
nomadics9	f1ce73ae15	colors	2024-10-26 17:19:01 +03:00
nomadics9	f481ce7db7	mako added + dunst removed - [notification deamons]	2024-10-25 19:40:50 +03:00
nomadics9	d7b60223e1	config	2024-10-24 20:44:25 +03:00
nomadics9	c825d8ccd5	cycles instead of random wallpaper dotfiles update	2024-10-24 18:50:45 +03:00
nomadics9	f2fbb57350	code clean	2024-10-24 16:04:16 +03:00
nomadics9	fccc0c1a8c	Guide comments SOPS	2024-10-24 15:40:54 +03:00