Merge pull request 'test_launcher_minecraft' (#5) from test_launcher_minecraft into main

Reviewed-on: #5

.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

@@ -1,5 +1,6 @@
 {
   lib,
+  pkgs,
   username,
   host,
   config,
@@ -18,6 +19,7 @@ in
       enable = true;
       xwayland.enable = true;
       systemd.enable = true;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
       extraConfig = let
         modifier = "SUPER";
       in
@@ -95,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
@@ -212,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": 1745403023,
+        "lastModified": 1746769778,
-        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
+        "narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "ad6e313dabf7e4da2765be6b36688db85b29ff5f",
+        "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": 1745752599,
+        "lastModified": 1747800214,
-        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
+        "narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
+        "rev": "54be6f6687f510002f7a1e6c3583278d989f3833",
         "type": "gitlab"
       },
       "original": {
@@ -144,7 +144,6 @@
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
-          "nur",
           "nixpkgs"
         ]
       },
@@ -162,27 +161,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": [
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -250,16 +228,16 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1732369855,
+        "lastModified": 1744584021,
-        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
+        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
+        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
         "type": "github"
       },
       "original": {
         "owner": "GNOME",
-        "ref": "47.2",
+        "ref": "48.1",
         "repo": "gnome-shell",
         "type": "github"
       }
@@ -271,11 +249,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745894335,
+        "lastModified": 1747875884,
-        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
+        "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
+        "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b",
         "type": "github"
       },
       "original": {
@@ -287,11 +265,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745930157,
+        "lastModified": 1747744144,
-        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
         "type": "github"
       },
       "original": {
@@ -303,7 +281,10 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
         "nixpkgs": [
           "stylix",
           "nixpkgs"
@@ -311,11 +292,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1745459908,
+        "lastModified": 1746056780,
-        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
+        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
+        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
         "type": "github"
       },
       "original": {
@@ -341,7 +322,7 @@
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
         "home-manager": [
@@ -359,11 +340,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1745962538,
+        "lastModified": 1747904607,
-        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
+        "narHash": "sha256-2JWxCVAb8qnssrn/4FeIgs+Gk0VZuAfDsF+rUBE7cZU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
+        "rev": "230705d5fb6c308402579b17e0261e9f15de6f46",
         "type": "github"
       },
       "original": {
@@ -407,17 +388,16 @@
     "tinted-kitty": {
       "flake": false,
       "locked": {
-        "lastModified": 1716423189,
+        "lastModified": 1735730497,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
         "owner": "tinted-theming",
         "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
         "type": "github"
       },
       "original": {
         "owner": "tinted-theming",
         "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
         "type": "github"
       }
     },

hosts/garand-laptop/config/boot.nix

@@ -18,6 +18,7 @@
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
+    initrd.systemd.dbus.enable = true;
     # Make /tmp a tmpfs
     tmp = {
       useTmpfs = false;

hosts/garand-laptop/config/nixpkgs.nix

@@ -25,6 +25,11 @@
   nixpkgs.config = {
     allowUnfree = true;
     pulseaudio = true;
+    # packageOverrides = pkgs: {
+    #   ulauncher = pkgs.ulauncher.override {
+    #     autoStart = true;
+    #   };
+    # };
   };
 
   # Extra Portal Configuration
@@ -34,12 +39,19 @@
     wlr.enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal
+      pkgs.xdg-desktop-portal-hyprland
     ];
+    config = {
+      common = {
+        default = [
+          "gtk"
+          "hyprland"
+        ];
+      };
+    };
     configPackages = [
       pkgs.xdg-desktop-portal-gtk
       pkgs.xdg-desktop-portal-hyprland
-      pkgs.xdg-desktop-portal
     ];
   };
 

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/programs.nix

@@ -69,6 +69,11 @@
         };
       };
     };
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
+    };
     dconf.enable = true;
     seahorse.enable = true;
     fuse.userAllowOther = true;

hosts/garand-laptop/home/misc.nix

@@ -1,10 +1,31 @@
-{...}: {
+{pkgs, ...}: {
   # Create XDG Dirs
   xdg = {
+    enable = true;
     userDirs = {
       enable = true;
       createDirectories = true;
     };
+    portal = {
+      enable = true;
+      xdgOpenUsePortal = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-gtk
+        pkgs.xdg-desktop-portal-hyprland
+      ];
+      config = {
+        common = {
+          default = [
+            "gtk"
+            "hyprland"
+          ];
+        };
+      };
+      configPackages = [
+        pkgs.xdg-desktop-portal-gtk
+        pkgs.xdg-desktop-portal-hyprland
+      ];
+    };
   };
 
   dconf.settings = {

hosts/garand-laptop/home/programs.librewolf.nix

@@ -59,6 +59,7 @@
               "garand's-search" = {
                 definedAliases = ["@g"];
                 urls = [{template = "https://search.garandplg.com/search?q={searchTerms}";}];
+                suggestUrl = "https://search.garandplg.com/autocompleter?q={searchTerms}";
               };
               "youtube" = {
                 definedAliases = ["@yt"];

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";
@@ -86,6 +85,7 @@ in {
         ll = "eza -lh --icons --grid --group-directories-first";
         la = "eza -lah --icons --grid --group-directories-first";
         ssh-server = "ssh garand_plg@192.168.1.156 -p 556 -i ~/.ssh/hp-t640-homeserver";
+        scp-to-server = "function scp-to-server() { scp -i ~/.ssh/hp-t640-homeserver -P 556 $1 garand_plg@192.168.1.156:$2; }; scp-to-server";
         fc = "fortune | cowsay";
         terminal = "cat /home/garand_plg/Documents/terminal.txt";
         e-terminal = "nano /home/garand_plg/Documents/terminal.txt";

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";
 }

scripts/list-hypr-bindings.nix

@@ -69,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" \

scripts/web-search.nix

@@ -1,43 +1,43 @@
 {pkgs}:
 pkgs.writeShellScriptBin "web-search" ''
-   declare -A URLS
+  declare -A URLS
 
-   URLS=(
+  URLS=(
-     ["🌎 Search"]="https://search.garandplg.com/search?q="
+    ["🌎 Search"]="https://search.garandplg.com/search?q="
-     ["❄️  Unstable Packages"]="https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query="
+    ["❄️  Unstable Packages"]="https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query="
-     ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
+    ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
-     ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
+    ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
-     ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
+    ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
-     ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
+    ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
-   )
+  )
 
-   # List for rofi
+  # List for rofi
-   gen_list() {
+  gen_list() {
-     for i in "''${!URLS[@]}"
+    for i in "''${!URLS[@]}"
-     do
+    do
-       echo "$i"
+      echo "$i"
-     done
+    done
-   }
+  }
 
-   main() {
+  main() {
-     # Pass the list to rofi
+    # Pass the list to rofi
-     platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
+    platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
 
-     if [[ -n "$platform" ]]; then
+    if [[ -n "$platform" ]]; then
-       query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
+      query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
 
-       if [[ -n "$query" ]]; then
+      if [[ -n "$query" ]]; then
-  url=''${URLS[$platform]}$query
+        url=''${URLS[$platform]}$query
-  xdg-open "$url"
+        xdg-open "$url"
-       else
+      else
-  exit
+        exit
-       fi
+      fi
-     else
+    else
-       exit
+      exit
-     fi
+    fi
-   }
+  }
 
-   main
+  main
 
-   exit 0
+  exit 0
 ''