From 814c4fde23b320e53a3366c84ac0ad9ac9c1d1fb Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 16 Aug 2025 20:24:46 +0200 Subject: [PATCH] Update nix, add grub themes --- README.org | 3 + flake.lock | 197 +++++++++++------- flake.nix | 3 + machines/fujin/main/default.nix | 9 + .../dotfiles/.config/Code/User/settings.json | 3 +- 5 files changed, 133 insertions(+), 82 deletions(-) diff --git a/README.org b/README.org index 6b7f894..f20b653 100644 --- a/README.org +++ b/README.org @@ -71,6 +71,7 @@ This guide documents methods for installing NixOS on a Proxmox virtual machine a - [[#generating-hardware-configuration][Generating Hardware Configuration]] - [[#todos][TODOs]] - [[#inspiration][Inspiration]] +- [[#links][Links]] * Fujin Installation (Bare Metal) ** Boot Drive Installation @@ -490,3 +491,5 @@ nix run github:nix-community/nixos-anywhere -- \ * Inspiration The configuration and structure of this setup were inspired by the following repository: - [[https://github.com/notthebee/nix-config][notthebee/nix-config]] +* Links +- [[https://github.com/Jacksaur/Gorgeous-GRUB][grub-themes]] diff --git a/flake.lock b/flake.lock index 25cde1b..b1491b6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1752743471, - "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=", + "lastModified": 1753216019, + "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506", + "rev": "be166e11d86ba4186db93e10c54a141058bdce49", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753554171, - "narHash": "sha256-pYkP9F7J1Dx3oQH+ZeoDSVNF+4rfRUJDxR05hA+0Skk=", + "lastModified": 1755285561, + "narHash": "sha256-s/w7XXGeaOhYgyasIcvgN70bzChdzj39oEcJlciQirw=", "owner": "9001", "repo": "copyparty", - "rev": "48705a74c6d6c8c1dd7595deaf4e2af65c0adcb0", + "rev": "a4649d1e71308f3b663e95f1a26762f63d9d5a81", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1754971456, + "narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1754015942, - "narHash": "sha256-a1rKs50GWP8RUI8bFXuhXPxeUgOvYiNxsk4Jf7cdzCw=", + "lastModified": 1755278563, + "narHash": "sha256-c6+8it5/lU5Ed/yCe9cFDL2WwDzUy2LQinIOPxEwuuc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b7b0edd24abbdd05fde75c80d59001c9fd9b5598", + "rev": "c605ab6f57a308ab7d8cc1c29ca9ca63d9a11edf", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1753479839, - "narHash": "sha256-E/rPVh7vyPMJUFl2NAew+zibNGfVbANr8BP8nLRbLkQ=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b9bf983db4d064764084cd6748efb1ab8297d1e", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1752149140, - "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=", + "lastModified": 1754305013, + "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a", + "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d", "type": "github" }, "original": { @@ -418,11 +418,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1754039866, - "narHash": "sha256-5emAMxu7WCX4CBMvd+0/6zBO78uyJOezD3AK4NNGcTA=", + "lastModified": 1755277479, + "narHash": "sha256-LrXtv1RIEds93j+OiSEvYFVX4fcGk2vrEzva19oxvco=", "ref": "refs/heads/main", - "rev": "314a0ea441e33122836965c50d4c5bcf9acd0cdd", - "revCount": 6331, + "rev": "edc473e8b0c14e768445422080af9978d132bff6", + "revCount": 6365, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1754049221, - "narHash": "sha256-GJsWeim2z+0taA6UgtjF1DnOuTMVzyl35d69W/lZLtM=", + "lastModified": 1755183521, + "narHash": "sha256-wrP8TM2lb2x0+PyTc7Uc3yfVBeIlYW7+hFeG14N9Cr8=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "827a1815b8189c2ac611847352ec000b01f24a2b", + "rev": "c1ddebb423acc7c88653c04de5ddafee64dac89a", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1750371812, - "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", + "lastModified": 1753819801, + "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", + "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1750371198, - "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "lastModified": 1753622892, + "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1753800567, - "narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=", + "lastModified": 1754481650, + "narHash": "sha256-6u6HdEFJh5gY6VfyMQbhP7zDdVcqOrCDTkbiHJmAtMI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7", + "rev": "df6b8820c4a0835d83d0c7c7be86fbc555f1f7fd", "type": "github" }, "original": { @@ -633,6 +633,24 @@ "type": "github" } }, + "minegrub-theme": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1752413064, + "narHash": "sha256-bcWxBAAvf5hp0TmMbYrwU4SlBxc5sB/T2VsIBdX1gDk=", + "owner": "Lxtharia", + "repo": "minegrub-theme", + "rev": "040b163268be6e7cf743ba990177525dc47ed944", + "type": "github" + }, + "original": { + "owner": "Lxtharia", + "repo": "minegrub-theme", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1693833173, @@ -655,11 +673,11 @@ ] }, "locked": { - "lastModified": 1753702960, - "narHash": "sha256-g8N9NSrZs7EE6EpKroIa8rYQ/t+qTKjLoVBHHt6qNhg=", + "lastModified": 1754920202, + "narHash": "sha256-vox1kgkaIsBkI7/0v4OnysrL0xHQx9dGZI21mFVy5vw=", "owner": "Mic92", "repo": "nix-ld", - "rev": "bc1a7a1b88589bfd26846fc5341fe44fc73b3fbd", + "rev": "a3c6824efb42dc6f7fa2905db99cbf59a5015c68", "type": "github" }, "original": { @@ -706,11 +724,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -753,11 +771,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -769,11 +787,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1689850295, + "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1755078291, + "narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", "type": "github" }, "original": { @@ -783,7 +817,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -797,7 +831,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1752480373, "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", @@ -848,11 +882,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", "type": "github" }, "original": { @@ -869,10 +903,11 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", + "minegrub-theme": "minegrub-theme", "nix-ld": "nix-ld", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "sops-nix": "sops-nix", "split-monitor-workspaces": "split-monitor-workspaces", "stylix": "stylix", @@ -889,11 +924,11 @@ ] }, "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", + "lastModified": 1754988908, + "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", + "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "type": "github" }, "original": { @@ -910,11 +945,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1753640179, - "narHash": "sha256-YUVgvLabR6zA4eVK7rxMCLYORm9whKBhCtiCWDwTE5U=", + "lastModified": 1754251374, + "narHash": "sha256-Xxf4et5DyR+rH5l6n0X2bMfXe2vXxb8Uem+RHQTDeng=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "a19762220d0851fe7eccde37db3a254f0b0640cb", + "rev": "2e9a45331d876d0a027d743002c0751e53f52609", "type": "github" }, "original": { @@ -944,11 +979,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1753978157, - "narHash": "sha256-sVy8hb71VawSOIsLv/hMGzpvbbWszdP9aSKI5Drbt6Q=", + "lastModified": 1755211397, + "narHash": "sha256-kw6iLWUj6+fiEpuc8ntrIzJ2gdS36wIcRINbKU0AIbA=", "owner": "nix-community", "repo": "stylix", - "rev": "ded4f29a023e0f14506ec16b0e32d129e56341cc", + "rev": "928ca832d22ab3167b49dc5f4d52ff5d26b0b52a", "type": "github" }, "original": { @@ -1085,11 +1120,11 @@ }, "unstable": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -1106,11 +1141,11 @@ ] }, "locked": { - "lastModified": 1753983724, - "narHash": "sha256-2vlAOJv4lBrE+P1uOGhZ1symyjXTRdn/mz0tZ6faQcg=", + "lastModified": 1755229570, + "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", "owner": "nix-community", "repo": "home-manager", - "rev": "7035020a507ed616e2b20c61491ae3eaa8e5462c", + "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", "type": "github" }, "original": { @@ -1123,7 +1158,7 @@ "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1753541826, @@ -1167,11 +1202,11 @@ ] }, "locked": { - "lastModified": 1751300244, - "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", + "lastModified": 1753633878, + "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", + "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", "type": "github" }, "original": { @@ -1183,14 +1218,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1753933355, - "narHash": "sha256-4QxMcKS6oc+cG8efwwAin4M+YOokBak1dVS8u5P3b5M=", + "lastModified": 1755270614, + "narHash": "sha256-36e1E3Pd9H+S6A7Jc/B5UCix6ug0j7CeArNVI5Or5A8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fa795a139a8c92b140bc21f11f61da1c97ad5b1d", + "rev": "3693c0279079f6f304216333d27e823d4d048e8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 048a526..369ed96 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,8 @@ }; zen-browser.url = "github:0xc000022070/zen-browser-flake"; + + minegrub-theme.url = "github:Lxtharia/minegrub-theme"; }; outputs = { @@ -195,6 +197,7 @@ inputs.vscode-server.nixosModules.default inputs.stylix.nixosModules.stylix inputs.nix-ld.nixosModules.nix-ld + inputs.minegrub-theme.nixosModules.default ./modules ] # Extra modules diff --git a/machines/fujin/main/default.nix b/machines/fujin/main/default.nix index 363262a..6bb7ec6 100644 --- a/machines/fujin/main/default.nix +++ b/machines/fujin/main/default.nix @@ -37,6 +37,15 @@ }; }; + boot.loader.grub = { + minegrub-theme = { + enable = true; + splash = "100% Flakes!"; + background = "background_options/1.8 - [Classic Minecraft].png"; + boot-options-count = 10; + }; + }; + networking = { nameservers = [ "192.168.1.2" # PyHole diff --git a/machines/fujin/main/dotfiles/.config/Code/User/settings.json b/machines/fujin/main/dotfiles/.config/Code/User/settings.json index 54aa896..28d7876 100644 --- a/machines/fujin/main/dotfiles/.config/Code/User/settings.json +++ b/machines/fujin/main/dotfiles/.config/Code/User/settings.json @@ -18,5 +18,6 @@ "database-client.autoSync": true, "git.confirmSync": false, "java.jdt.ls.java.home": "/home/fujin/jdk/openjdk21", - "java.configuration.detectJdksAtStart": false + "java.configuration.detectJdksAtStart": false, + "workbench.colorTheme": "Visual Studio Dark" }