Zamiana systemd-boot na GRUB z własnym motywem

- Wyłączono `systemd-boot`, włączono `grub` z obsługą EFI.
- Dodano własny motyw GRUB z grafiką `jablon.png` i plikiem `theme.txt`.
- Motyw zawiera spersonalizowane kolory, czcionki i układ menu GRUB-a.
- Dodano dodatkowy wpis menu GRUB-a zatytułowany „Mój system”.
- Motyw kompilowany jest jako niestandardowe źródło w `pkgs.stdenv.mkDerivation`.

config/garand-grub-theme/theme.txt

@@ -0,0 +1,33 @@
+# GRUB2 gfxmenu theme
+desktop-image: "jablon.png"
+title-text: ""
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
++ boot_menu {
+  left = 15%
+  top = 30%
+  width = 70%
+  height = 40%
+  item_font = "DejaVu Sans Regular 12"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 32
+  icon_height = 32
+  item_height = 24
+  item_spacing = 12
+  selected_item_pixmap_style = "select_*.png"
+}
+
++ label {
+  top = 82%
+  left = 15%
+  width = 70%
+  align = "center"
+  text = "Użyj strzałek do wyboru pozycji menu i Enter aby potwierdzić."
+  color = "#ffffff"
+  font = "DejaVu Sans Bold 10"
+}

config/hyprland.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   username,
   host,
   config,
@@ -19,7 +18,6 @@ in
       enable = true;
       xwayland.enable = true;
       systemd.enable = true;
-      portalPackage = pkgs.xdg-desktop-portal-hyprland;
       extraConfig = let
         modifier = "SUPER";
       in
@@ -194,7 +192,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

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746268454,
+        "lastModified": 1745403023,
-        "narHash": "sha256-cUrVjYzFn1zzR6m2hc02CdjlSPIADtAVo+7BE7qq0ZA=",
+        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "3ffbee11df46921c9a60f118d3450a7e460f7b13",
+        "rev": "ad6e313dabf7e4da2765be6b36688db85b29ff5f",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1746417810,
+        "lastModified": 1745752599,
-        "narHash": "sha256-VhghpfFdvGiDeh6HqFhQncnLx4IrtFy4VWdCQvOwccI=",
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "14c779b4ff24742307127970549ac9a51de3f98a",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
         "type": "gitlab"
       },
       "original": {
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746413188,
+        "lastModified": 1745894335,
-        "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746328495,
+        "lastModified": 1745930157,
-        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1746056780,
+        "lastModified": 1745459908,
-        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
+        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
+        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
         "type": "github"
       },
       "original": {
@@ -359,11 +359,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1746469524,
+        "lastModified": 1745962538,
-        "narHash": "sha256-uwFQebWXtMsRBmzKOYa6jjs7PDnfSuwyrqPK6yzqamU=",
+        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "45aa0e849282dba5979e7bb3d0f6676bbd9dc130",
+        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
         "type": "github"
       },
       "original": {

hosts/garand-laptop/config/boot.nix

@@ -15,10 +15,34 @@
     };
     # Bootloader.
     loader = {
-      systemd-boot.enable = true;
+      systemd-boot.enable = false;
       efi.canTouchEfiVariables = true;
+
+      grub = {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+        theme = pkgs.stdenv.mkDerivation {
+          name = "garand-grub-theme";
+          src = ../../../config/garand-grub-theme;
+
+          buildPhase = ''
+            mkdir -p $out/grub/themes/garand-grub-theme
+            cp -r * $out/grub/themes/garand-grub-theme/
+          '';
+
+          installPhase = "true";
+        };
+
+        extraEntries = ''
+          menuentry "Mój system" {
+            # konfiguracja wpisu menu
+          }
+        '';
+
+        gfxmodeEfi = "1920x1080";
+      };
     };
-    initrd.systemd.dbus.enable = true;
     # Make /tmp a tmpfs
     tmp = {
       useTmpfs = false;

hosts/garand-laptop/config/nixpkgs.nix

@@ -25,11 +25,6 @@
   nixpkgs.config = {
     allowUnfree = true;
     pulseaudio = true;
-    # packageOverrides = pkgs: {
-    #   ulauncher = pkgs.ulauncher.override {
-    #     autoStart = true;
-    #   };
-    # };
   };
 
   # Extra Portal Configuration
@@ -39,19 +34,12 @@
     wlr.enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal
     ];
-    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/tools.nix

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

hosts/garand-laptop/config/programs.nix

@@ -69,11 +69,6 @@
         };
       };
     };
-    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,31 +1,10 @@
-{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 = {

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" \

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
 ''