From b09a445939aac60cc5110ede817c08c08b4f8490 Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Mon, 29 Apr 2024 14:24:28 +0200 Subject: [PATCH] Change grub theme --- docs/history.md | 2 +- flake.lock | 81 +++++++++++++++++++------------- flake.nix | 8 +--- home/features/neovim/default.nix | 15 ++---- hosts/nixos/tethys/boot.nix | 14 +++--- 5 files changed, 64 insertions(+), 56 deletions(-) diff --git a/docs/history.md b/docs/history.md index 05e7b1f..84d14e2 100644 --- a/docs/history.md +++ b/docs/history.md @@ -5,7 +5,7 @@ This file tells the story of my setup throughout it's history. This document is ## 2024-04-29 - sunny field vibes -- land of the lustrous [Diamond (Land of the Lustrous) wallpaper](https://wallhaven.cc/w/vmk2e3) +- [Diamond (Land of the Lustrous) wallpaper](https://wallhaven.cc/w/vmk2e3) - [catppuccin-latte](https://github.com/catppuccin/base16) colors - apps on display: [Yazi](https://github.com/sxyazi/yazi), [Cmatrix](https://github.com/abishekvashok/cmatrix), [Neovim](https://neovim.io/), [Anyrun](https://github.com/catppuccin/base16) diff --git a/flake.lock b/flake.lock index f49a767..5aee0a5 100644 --- a/flake.lock +++ b/flake.lock @@ -328,6 +328,27 @@ "type": "github" } }, + "darkmatter-grub-theme": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1683347392, + "narHash": "sha256-snW+8pJvBQ1B11FmUf6kSgARZW5OvW9uXgxA2VrlzcQ=", + "owner": "VandalByte", + "repo": "darkmatter-grub-theme", + "rev": "efe1abbde0aa9410217247d415ff734583af9711", + "type": "gitlab" + }, + "original": { + "owner": "VandalByte", + "repo": "darkmatter-grub-theme", + "type": "gitlab" + } + }, "dekking": { "flake": false, "locked": { @@ -502,11 +523,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -532,6 +553,22 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1673956053, @@ -547,7 +584,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -563,7 +600,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1673956053, @@ -934,26 +971,6 @@ "type": "github" } }, - "grub2-themes": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708174123, - "narHash": "sha256-h1m4PaeKXVXTJcAg0urnHHnXZKpIA159ZZ/XBOQXyZo=", - "owner": "vinceliuice", - "repo": "grub2-themes", - "rev": "eda1b86dd8e991ea0c03090ff60b4c0b63799489", - "type": "github" - }, - "original": { - "owner": "vinceliuice", - "repo": "grub2-themes", - "type": "github" - } - }, "haskell-dependency-graph-nix": { "inputs": { "nixpkgs": [ @@ -1317,7 +1334,7 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_3", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", @@ -1737,7 +1754,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": "nixpkgs_3", @@ -1759,7 +1776,7 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_6", "gitignore": "gitignore_2", "nixpkgs": "nixpkgs_12", @@ -1781,7 +1798,7 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_7", "gitignore": "gitignore_3", "nixpkgs": "nixpkgs_13", @@ -1822,7 +1839,7 @@ }, "purescript-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "miros", "nixpkgs" @@ -1902,9 +1919,9 @@ "inputs": { "anyrun": "anyrun", "catppuccin-base16": "catppuccin-base16", + "darkmatter-grub-theme": "darkmatter-grub-theme", "disko": "disko", "firefox-addons": "firefox-addons", - "grub2-themes": "grub2-themes", "home-manager": "home-manager", "impermanence": "impermanence", "intray": "intray", @@ -2157,7 +2174,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "gnome-shell": "gnome-shell", "home-manager": "home-manager_4", "nixpkgs": "nixpkgs_14" diff --git a/flake.nix b/flake.nix index d5147e5..6f910bc 100644 --- a/flake.nix +++ b/flake.nix @@ -64,20 +64,16 @@ spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; # }}} # {{{ Theming - # Grub2 themes - grub2-themes.url = "github:vinceliuice/grub2-themes"; - grub2-themes.inputs.nixpkgs.follows = "nixpkgs"; + darkmatter-grub-theme.url = gitlab:VandalByte/darkmatter-grub-theme; + darkmatter-grub-theme.inputs.nixpkgs.follows = "nixpkgs"; - # Stylix stylix.url = "github:danth/stylix/a33d88cf8f75446f166f2ff4f810a389feed2d56"; # stylix.inputs.nixpkgs.follows = "nixpkgs"; # stylix.inputs.home-manager.follows = "home-manager"; - # Catpuccin base16 color schemes catppuccin-base16.url = "github:catppuccin/base16"; catppuccin-base16.flake = false; - # Rosepine base16 color schemes rosepine-base16.url = "github:edunfelt/base16-rose-pine-scheme"; rosepine-base16.flake = false; # }}} diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix index f219028..b69c530 100644 --- a/home/features/neovim/default.nix +++ b/home/features/neovim/default.nix @@ -510,17 +510,10 @@ let cond = blacklist "vscode"; event = "VeryLazy"; - config = true; - init = thunk /* lua */ '' - vim.ui.select = function(...) - require("lazy").load({ plugins = { "dressing.nvim" } }) - return vim.ui.select(...) - end - vim.ui.input = function(...) - require("lazy").load({ plugins = { "dressing.nvim" } }) - return vim.ui.input(...) - end - ''; + opts = { + select.backend = [ "nui" "builtin" "telescope" ]; + input.insert_only = false; + }; }; # }}} # }}} diff --git a/hosts/nixos/tethys/boot.nix b/hosts/nixos/tethys/boot.nix index d7f2cc5..4f61302 100644 --- a/hosts/nixos/tethys/boot.nix +++ b/hosts/nixos/tethys/boot.nix @@ -1,10 +1,5 @@ { inputs, ... }: { - imports = [ inputs.grub2-themes.nixosModules.default ]; - - # Defined [here](https://github.com/vinceliuice/grub2-themes/blob/master/flake.nix#L11) - boot.loader.grub2-theme = { - enable = true; - }; + imports = [ inputs.darkmatter-grub-theme.nixosModule ]; # See [the wiki page](https://nixos.wiki/wiki/Dual_Booting_NixOS_and_Windows) boot.loader = { @@ -33,6 +28,13 @@ chainloader /EFI/Microsoft/Boot/bootmgfw.efi } ''; + + darkmatter-theme = { + enable = true; + style = "nixos"; + icon = "color"; + resolution = "1080p"; + }; }; }; }