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`.
2025-05-05 20:32:50 +02:00
17 changed files with 168 additions and 134 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-git-diff.txt
-packages/result
+git-diff.txt
--- a/config/fastfetch/default.nix
+++ b/config/fastfetch/default.nix
@@ -10,16 +10,16 @@
        };
      };

-      # logo = {
-      #   source = ./nixos.png;
-      #   type = "kitty-direct";
-      #   height = 15;
-      #   width = 30;
-      #   padding = {
-      #     top = 3;
-      #     left = 3;
-      #   };
-      # };
+      logo = {
+        source = ./nixos.png;
+        type = "kitty-direct";
+        height = 15;
+        width = 30;
+        padding = {
+          top = 3;
+          left = 3;
+        };
+      };

      modules = [
        "break"
--- a/config/garand-grub-theme/jablon.png
+++ b/config/garand-grub-theme/jablon.png
--- a/config/garand-grub-theme/theme.txt
+++ b/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"
+}
--- a/config/hyprland.nix
+++ b/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
@@ -97,7 +95,6 @@ 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
@@ -215,8 +212,7 @@ in
            bind = ${modifier},I,exec,dex-instagram
            bind = ${modifier},R,exec,dex-portainer
            bind = ${modifier},U,exec,dex-mastodon
-            bind = ${modifier},Y,exec,freetube
-            bind = ${modifier}SHIFT,Y,exec,dex-dailydev
+            bind = ${modifier},Y,exec,dex-dailydev
            bind = ${modifier},V,exec,codium
            bind = ${modifier},O,exec,onlyoffice-desktopeditors
            bind = ${modifier}SHIFT,O,exec,obs
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1746769778,
-        "narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=",
+        "lastModified": 1745403023,
+        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
        "owner": "AdnanHodzic",
        "repo": "auto-cpufreq",
-        "rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad",
+        "rev": "ad6e313dabf7e4da2765be6b36688db85b29ff5f",
        "type": "github"
      },
      "original": {
@@ -25,11 +25,11 @@
        "fromYaml": "fromYaml"
      },
      "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "lastModified": 1745523430,
+        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
        "owner": "SenchoPens",
        "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1747800214,
-        "narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=",
+        "lastModified": 1745752599,
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "54be6f6687f510002f7a1e6c3583278d989f3833",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
        "type": "gitlab"
      },
      "original": {
@@ -144,6 +144,7 @@
      "inputs": {
        "nixpkgs-lib": [
          "stylix",
+          "nur",
          "nixpkgs"
        ]
      },
@@ -161,6 +162,27 @@
        "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": {
@@ -228,16 +250,16 @@
    "gnome-shell": {
      "flake": false,
      "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "lastModified": 1732369855,
+        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
        "type": "github"
      },
      "original": {
        "owner": "GNOME",
-        "ref": "48.1",
+        "ref": "47.2",
        "repo": "gnome-shell",
        "type": "github"
      }
@@ -249,11 +271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1747875884,
-        "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=",
+        "lastModified": 1745894335,
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
        "type": "github"
      },
      "original": {
@@ -265,11 +287,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1747744144,
-        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
        "type": "github"
      },
      "original": {
@@ -281,10 +303,7 @@
    },
    "nur": {
      "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
+        "flake-parts": "flake-parts",
        "nixpkgs": [
          "stylix",
          "nixpkgs"
@@ -292,11 +311,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1746056780,
-        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
+        "lastModified": 1745459908,
+        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
+        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
        "type": "github"
      },
      "original": {
@@ -322,7 +341,7 @@
        "base16-vim": "base16-vim",
        "firefox-gnome-theme": "firefox-gnome-theme",
        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
+        "flake-utils": "flake-utils",
        "git-hooks": "git-hooks",
        "gnome-shell": "gnome-shell",
        "home-manager": [
@@ -340,11 +359,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1747904607,
-        "narHash": "sha256-2JWxCVAb8qnssrn/4FeIgs+Gk0VZuAfDsF+rUBE7cZU=",
+        "lastModified": 1745962538,
+        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "230705d5fb6c308402579b17e0261e9f15de6f46",
+        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
        "type": "github"
      },
      "original": {
@@ -388,16 +407,17 @@
    "tinted-kitty": {
      "flake": false,
      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
+        "lastModified": 1716423189,
+        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
        "owner": "tinted-theming",
        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
+        "rev": "eb39e141db14baef052893285df9f266df041ff8",
        "type": "github"
      },
      "original": {
        "owner": "tinted-theming",
        "repo": "tinted-kitty",
+        "rev": "eb39e141db14baef052893285df9f266df041ff8",
        "type": "github"
      }
    },
--- a/hosts/garand-laptop/config/boot.nix
+++ b/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;
--- a/hosts/garand-laptop/config/nixpkgs.nix
+++ b/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
    ];
  };

--- a/hosts/garand-laptop/config/nixpkgs/clients.nix
+++ b/hosts/garand-laptop/config/nixpkgs/clients.nix
@@ -12,6 +12,5 @@
    docker-client
    anki-bin
    onlyoffice-bin
-    freetube
  ];
 }
--- a/hosts/garand-laptop/config/nixpkgs/fundamentals.nix
+++ b/hosts/garand-laptop/config/nixpkgs/fundamentals.nix
@@ -1,7 +1,6 @@
 # Fundamentalne programy dla systemu
 {pkgs, ...}: {
  environment.systemPackages = with pkgs; [
-    warp-terminal
    wget
    killall
    eza
--- a/hosts/garand-laptop/config/programs.nix
+++ b/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;
--- a/hosts/garand-laptop/home/misc.nix
+++ b/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 = {
--- a/hosts/garand-laptop/home/programs.librewolf.nix
+++ b/hosts/garand-laptop/home/programs.librewolf.nix
@@ -59,7 +59,6 @@
              "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"];
--- a/hosts/garand-laptop/home/programs.nix
+++ b/hosts/garand-laptop/home/programs.nix
@@ -60,6 +60,7 @@ in {
        if [ -f $HOME/.bashrc-personal ]; then
          source $HOME/.bashrc-personal
        fi
+        fc
      '';
      shellAliases = {
        os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos";
@@ -85,7 +86,6 @@ 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";
--- a/hosts/garand-laptop/variables.nix
+++ b/hosts/garand-laptop/variables.nix
@@ -1,12 +1,16 @@
 {
+  # Git Configuration ( For Pulling Software Repos )
  gitUsername = "GarandPLG";
  gitEmail = "garandplg@garandplg.com";

+  # Hyprland Settings
  extraMonitorSettings = "";

+  # Waybar Settings
  clock24h = true;

-  browser = "librewolf";
-  terminal = "warp-terminal";
+  # Program Options
+  browser = "librewolf"; # Set Default Browser (google-chrome-stable for google-chrome)
+  terminal = "kitty"; # Set Default System Terminal
  keyboardLayout = "pl";
 }
--- a/scripts/list-hypr-bindings.nix
+++ b/scripts/list-hypr-bindings.nix
@@ -69,8 +69,7 @@ in
    " + I" "Uruchom Instagram" "dex-instagram" \
    " + R" "Uruchom Portainer" "dex-portainer" \
    " + U" "Uruchom Mastodon" "dex-mastodon" \
-    " + Y" "Uruchom FreeTube" "freetube" \
-    " + SHIFT + Y" "Uruchom Daily.dev" "dex-dailydev" \
+    " + Y" "Uruchom Daily.dev" "dex-dailydev" \
    " + V" "Uruchom Visual Studio Codium" "codium" \
    " + O" "Uruchom ONLYOFFICE" "onlyoffice-desktopeditors" \
    " + SHIFT + O" "Uruchom OBS" "obs" \
--- a/scripts/web-search.nix
+++ b/scripts/web-search.nix
@@ -1,43 +1,43 @@
 {pkgs}:
 pkgs.writeShellScriptBin "web-search" ''
-  declare -A URLS
+   declare -A URLS

-  URLS=(
-    ["🌎 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="
-    ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
-    ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
-    ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
-    ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
-  )
+   URLS=(
+     ["🌎 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="
+     ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
+     ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
+     ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
+     ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
+   )

-  # List for rofi
-  gen_list() {
-    for i in "''${!URLS[@]}"
-    do
-      echo "$i"
-    done
-  }
+   # List for rofi
+   gen_list() {
+     for i in "''${!URLS[@]}"
+     do
+       echo "$i"
+     done
+   }

-  main() {
-    # Pass the list to rofi
-    platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
+   main() {
+     # Pass the list to rofi
+     platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )

-    if [[ -n "$platform" ]]; then
-      query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
+     if [[ -n "$platform" ]]; then
+       query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )

-      if [[ -n "$query" ]]; then
-        url=''${URLS[$platform]}$query
-        xdg-open "$url"
-      else
-        exit
-      fi
-    else
-      exit
-    fi
-  }
+       if [[ -n "$query" ]]; then
+  url=''${URLS[$platform]}$query
+  xdg-open "$url"
+       else
+  exit
+       fi
+     else
+       exit
+     fi
+   }

-  main
+   main

-  exit 0
+   exit 0
 ''