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`.
Zaktualizuj zależności i zastąp ms-python przez kylin-python
2025-05-05 20:32:50 +02:00 · 2025-04-30 00:34:59 +02:00 · 2025-04-24 01:32:50 +02:00
6 changed files with 96 additions and 42 deletions
--- 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/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744578060,
-        "narHash": "sha256-ApX5u3aXtmthemPSnZls/oxvqpNR7C9t4Ut57MTvces=",
+        "lastModified": 1745403023,
+        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
        "owner": "AdnanHodzic",
        "repo": "auto-cpufreq",
-        "rev": "b6493edc7033beac216b8836af4994e56c6682f4",
+        "rev": "ad6e313dabf7e4da2765be6b36688db85b29ff5f",
        "type": "github"
      },
      "original": {
@@ -25,11 +25,11 @@
        "fromYaml": "fromYaml"
      },
      "locked": {
-        "lastModified": 1732200724,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
+        "lastModified": 1745523430,
+        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
        "owner": "SenchoPens",
        "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
+        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1744914542,
-        "narHash": "sha256-Q6EKVSHbtWqndGWHw5E+dAN4ds5p+SD5Gyiy3KGN8DM=",
+        "lastModified": 1745752599,
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "30303c2b08c30085a784abf5c1823bd62dd8d9d7",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
        "type": "gitlab"
      },
      "original": {
@@ -112,11 +112,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1743774811,
-        "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
+        "lastModified": 1744642301,
+        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
+        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
        "type": "github"
      },
      "original": {
@@ -271,11 +271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744919155,
-        "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=",
+        "lastModified": 1745894335,
+        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70",
+        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
        "type": "github"
      },
      "original": {
@@ -287,11 +287,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
        "type": "github"
      },
      "original": {
@@ -311,11 +311,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1743884191,
-        "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=",
+        "lastModified": 1745459908,
+        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c",
+        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
        "type": "github"
      },
      "original": {
@@ -359,11 +359,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1744910471,
-        "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=",
+        "lastModified": 1745962538,
+        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51",
+        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
        "type": "github"
      },
      "original": {
@@ -424,11 +424,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1742851696,
-        "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=",
+        "lastModified": 1744974599,
+        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77",
+        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
        "type": "github"
      },
      "original": {
@@ -440,11 +440,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1743296873,
-        "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
+        "lastModified": 1745111349,
+        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
+        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
        "type": "github"
      },
      "original": {
--- a/hosts/garand-laptop/config/boot.nix
+++ b/hosts/garand-laptop/config/boot.nix
@@ -15,8 +15,33 @@
    };
    # 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";
+      };
    };
    # Make /tmp a tmpfs
    tmp = {
--- a/hosts/garand-laptop/config/nixpkgs/codium.nix
+++ b/hosts/garand-laptop/config/nixpkgs/codium.nix
@@ -23,10 +23,6 @@
            jnoortheen.nix-ide
            mechatroner.rainbow-csv
            ms-azuretools.vscode-docker
-            ms-python.debugpy
-            ms-python.flake8
-            ms-python.python
-            ms-python.vscode-pylance
            njpwerner.autodocstring
            octref.vetur
            oderwat.indent-rainbow
@@ -74,12 +70,6 @@
              version = "0.1.0";
              hash = "sha256-Aj87mxOGer24O24/4/bGQqgLpgoBvfwOCKQyJ8NLplU=";
            }
-            {
-              name = "vscode-python-envs";
-              publisher = "ms-python";
-              version = "0.3.11081010";
-              hash = "sha256-Vs9Rkz/DAhNcC9e8fI8mlD8TljsFdU8+z7ztNkZozz0=";
-            }
            {
              name = "one-dark-pro-monokai-darker";
              publisher = "eserozvataf";
@@ -236,6 +226,12 @@
              version = "0.0.2";
              hash = "sha256-OXHUwynWm4RqJYjcv5qXt5DyjFDxtNjZFNpnd22gUgg=";
            }
+            {
+              name = "kylin-python";
+              publisher = "kylinideteam";
+              version = "0.4.2";
+              hash = "sha256-LhOsIvECrxLCnRjUVffS4G4fFsdP70iP/twoNoto354=";
+            }
          ];
      })
    ];
--- a/hosts/garand-laptop/home/programs.nix
+++ b/hosts/garand-laptop/home/programs.nix
@@ -89,7 +89,7 @@ in {
        fc = "fortune | cowsay";
        terminal = "cat /home/garand_plg/Documents/terminal.txt";
        e-terminal = "nano /home/garand_plg/Documents/terminal.txt";
-        mkgidf = "git diff > git-diff.txt";
+        mkgidf = "git add --intent-to-add . && git diff > git-diff.txt";
        ".." = "cd ..";
        kys = "shutdown now";
        pasjans = "ttysolitaire -p 10 --no-background-color";