.gitignore

@@ -1 +1,2 @@
-git-diff.txt
+git-diff.txt
+packages/result

config/fastfetch/default.nix

@@ -10,16 +10,16 @@
         };
       };
 
-      logo = {
+      # logo = {
-        source = ./nixos.png;
+      #   source = ./nixos.png;
-        type = "kitty-direct";
+      #   type = "kitty-direct";
-        height = 15;
+      #   height = 15;
-        width = 30;
+      #   width = 30;
-        padding = {
+      #   padding = {
-          top = 3;
+      #     top = 3;
-          left = 3;
+      #     left = 3;
-        };
+      #   };
-      };
+      # };
 
       modules = [
         "break"

config/hyprland.nix

@@ -97,6 +97,7 @@ in
             windowrulev2 = opacity 0.9 0.7, class:^(chrome-dbipeoijaciefjfbfdkpfncmlbfinpge-Default)$
             windowrulev2 = opacity 0.9 0.7, class:^(Bitwarden)$
             windowrulev2 = opacity 0.9 0.7, class:^(chrome-akpamiohjfcnimfljfndmaldlcfphjmp-Default)$
+            windowrulev2 = opacity 0.9 0.7, class:^(dev.warp.Warp)$
             gestures {
               workspace_swipe = true
               workspace_swipe_fingers = 3
@@ -194,7 +195,6 @@ in
             bind = ${modifier},SPACE,togglespecialworkspace
             bind = ${modifier},Return,exec,${terminal}
             bind = ${modifier}SHIFT,Return,exec,rofi-launcher
-            bind = ${modifier}ALT,SPACE,exec,ulauncher-toggle
             bind = ${modifier}ALT,W,exec,wallsetter
             bind = ${modifier}SHIFT,S,exec,screenshootin
             bind = ${modifier},E,exec,emopicker9000
@@ -215,7 +215,8 @@ in
             bind = ${modifier},I,exec,dex-instagram
             bind = ${modifier},R,exec,dex-portainer
             bind = ${modifier},U,exec,dex-mastodon
-            bind = ${modifier},Y,exec,dex-dailydev
+            bind = ${modifier},Y,exec,freetube
+            bind = ${modifier}SHIFT,Y,exec,dex-dailydev
             bind = ${modifier},V,exec,codium
             bind = ${modifier},O,exec,onlyoffice-desktopeditors
             bind = ${modifier}SHIFT,O,exec,obs

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746268454,
+        "lastModified": 1746769778,
-        "narHash": "sha256-cUrVjYzFn1zzR6m2hc02CdjlSPIADtAVo+7BE7qq0ZA=",
+        "narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "3ffbee11df46921c9a60f118d3450a7e460f7b13",
+        "rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1745523430,
+        "lastModified": 1746562888,
-        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1746417810,
+        "lastModified": 1747195422,
-        "narHash": "sha256-VhghpfFdvGiDeh6HqFhQncnLx4IrtFy4VWdCQvOwccI=",
+        "narHash": "sha256-tr4ATmqPQ+9LtFtfTLfugSXcsXcow8T6PJvidCeAnwg=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "14c779b4ff24742307127970549ac9a51de3f98a",
+        "rev": "7f04c28c17c2c84404e4cdf9e7d371a7f65becc9",
         "type": "gitlab"
       },
       "original": {
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746413188,
+        "lastModified": 1747225851,
-        "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
+        "narHash": "sha256-4IbmZrNOdXP143kZEUzxBS5SqyxUlaSHLgdpeJfP2ZU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
+        "rev": "6bf057fc8326e83bda05a669fc08d106547679fb",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746328495,
+        "lastModified": 1746904237,
-        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
+        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
+        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
         "type": "github"
       },
       "original": {
@@ -359,11 +359,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1746469524,
+        "lastModified": 1747248043,
-        "narHash": "sha256-uwFQebWXtMsRBmzKOYa6jjs7PDnfSuwyrqPK6yzqamU=",
+        "narHash": "sha256-uEEhchsf9l2u7JJk04GZIMRIkuCeJFPSAuTMByqYfIQ=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "45aa0e849282dba5979e7bb3d0f6676bbd9dc130",
+        "rev": "98444a942a85072baf12c4a1c4cd5ef9531c8ab0",
         "type": "github"
       },
       "original": {

hosts/garand-laptop/config/nixpkgs.nix

@@ -61,4 +61,10 @@
       ZANEYOS = "true";
     };
   };
+
+  nixpkgs.overlays = [
+    (self: super: {
+      crystal-launcher = super.callPackage ../../../packages/crystal-launcher.nix {};
+    })
+  ];
 }

hosts/garand-laptop/config/nixpkgs/clients.nix

@@ -12,5 +12,6 @@
     docker-client
     anki-bin
     onlyoffice-bin
+    freetube
   ];
 }

hosts/garand-laptop/config/nixpkgs/fundamentals.nix

@@ -1,6 +1,7 @@
 # Fundamentalne programy dla systemu
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
+    warp-terminal
     wget
     killall
     eza

hosts/garand-laptop/config/nixpkgs/gaming.nix

@@ -5,5 +5,6 @@
     wineWowPackages.waylandFull # wine64
     lutris
     space-cadet-pinball
+    crystal-launcher
   ];
 }

hosts/garand-laptop/config/nixpkgs/tools.nix

@@ -13,7 +13,5 @@
     # lazygit
     docker-slim
     dex
-    ulauncher
-    wmctrl
   ];
 }

hosts/garand-laptop/home/programs.nix

@@ -60,7 +60,6 @@ in {
         if [ -f $HOME/.bashrc-personal ]; then
           source $HOME/.bashrc-personal
         fi
-        fc
       '';
       shellAliases = {
         os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos";

hosts/garand-laptop/variables.nix

@@ -1,16 +1,12 @@
 {
-  # Git Configuration ( For Pulling Software Repos )
   gitUsername = "GarandPLG";
   gitEmail = "garandplg@garandplg.com";
 
-  # Hyprland Settings
   extraMonitorSettings = "";
 
-  # Waybar Settings
   clock24h = true;
 
-  # Program Options
+  browser = "librewolf";
-  browser = "librewolf"; # Set Default Browser (google-chrome-stable for google-chrome)
+  terminal = "warp-terminal";
-  terminal = "kitty"; # Set Default System Terminal
   keyboardLayout = "pl";
 }

packages/crystal-launcher.nix

@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  makeWrapper,
+  bash,
+  curl,
+  wget,
+  xorg,
+  host,
+}:
+stdenv.mkDerivation {
+  pname = "crystal-launcher";
+  version = "1.0.0"; # możesz zaktualizować wersję, jeśli ją znasz
+
+  src = fetchurl {
+    url = "https://launcher.crystal-launcher.net/linux/launcher.tar.xz";
+    sha256 = "sha256-NkngV1nH5oYP7wRUAuDylRkne0Q65FmHn0mnlibjV0c="; # uzupełnij po pierwszym uruchomieniu - Nix podpowie prawidłowy hash
+  };
+
+  icon = fetchurl {
+    url = "https://launcher.crystal-launcher.net/linux/icon.png";
+    sha256 = "sha256-IU9PEut3LSzpRXI6t7Emsfs+eMAJ9BMtaw+Y6iJwqww="; # uzupełnij po pierwszym uruchomieniu - Nix podpowie prawidłowy hash
+  };
+
+  nativeBuildInputs = [makeWrapper];
+  buildInputs = [bash wget curl xorg.xrdb];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/applications
+    mkdir -p $out/share/crystal-launcher/pybootstrap
+
+    # Rozpakuj archiwum
+    tar -xf $src -C $out/share/crystal-launcher/pybootstrap
+
+    # Skopiuj ikonę
+    cp $icon $out/share/crystal-launcher/pybootstrap/icon.png
+
+    # Utwórz skrypt uruchamiający
+    cat > $out/bin/crystal-launcher << EOF
+    #!/bin/sh
+
+    # manjaro fix
+    xrdb -load /dev/null
+    xrdb -query
+
+    cd $out/share/crystal-launcher && ./pybootstrap/launcher
+    EOF
+
+    chmod +x $out/bin/crystal-launcher
+
+    # Utwórz plik .desktop
+    cat > $out/share/applications/CrystalLauncher.desktop << EOF
+    [Desktop Entry]
+    Name=Crystal Launcher
+    GenericName=CrystalLauncher
+    Comment=A Minecraft modpack launcher
+    Exec=$out/bin/crystal-launcher
+    Icon=$out/share/crystal-launcher/pybootstrap/icon.png
+    Terminal=false
+    Type=Application
+    Categories=Game;
+    EOF
+  '';
+
+  meta = with lib; {
+    description = "A Minecraft modpack launcher";
+    homepage = "https://launcher.crystal-launcher.net/";
+    license = licenses.unfree; # dostosuj do właściwej licencji
+    platforms = platforms.linux;
+    maintainers = with maintainers; [
+      host
+    ];
+  };
+}

scripts/list-hypr-bindings.nix

@@ -49,7 +49,6 @@ in
     " + Prawy przycisk myszy" "Zmień rozmiar okna" "resizewindow" \
     " + ENTER" "Otwórz terminal" "${terminal}" \
     " + SHIFT + ENTER" "Uruchom launcher aplikacji" "rofi-launcher" \
-    " + ALT + SPACE" "Uruchom Ulauncher" "ulauncher-toggle" \
     " + ALT + W" "Zmień tapetę" "wallsetter" \
     " + SHIFT + S" "Zrób zrzut ekranu" "screenshootin" \
     " + E" "Uruchom selektor emotikon" "emopicker9000" \
@@ -70,7 +69,8 @@ in
     " + I" "Uruchom Instagram" "dex-instagram" \
     " + R" "Uruchom Portainer" "dex-portainer" \
     " + U" "Uruchom Mastodon" "dex-mastodon" \
-    " + Y" "Uruchom Daily.dev" "dex-dailydev" \
+    " + Y" "Uruchom FreeTube" "freetube" \
+    " + SHIFT + Y" "Uruchom Daily.dev" "dex-dailydev" \
     " + V" "Uruchom Visual Studio Codium" "codium" \
     " + O" "Uruchom ONLYOFFICE" "onlyoffice-desktopeditors" \
     " + SHIFT + O" "Uruchom OBS" "obs" \