From d04d3634a742032775e4789c66cd133e5e608772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20M=C3=BChl?= Date: Tue, 26 Aug 2025 12:04:44 +0200 Subject: [PATCH] Remove grub2-themes --- flake.lock | 21 ------------------- flake.nix | 4 ---- .../christopher@cobalt/config/hausgold.nix | 10 ++------- .../christopher@cobalt/config/wayland.nix | 3 +-- .../christopher@cobalt/misc/browser.nix | 1 - .../christopher@cobalt/misc/everything.nix | 3 ++- modules/home/common/terminal/default.nix | 3 +-- packages/scripts/open-url/open-url | 19 ++++++++++------- packages/scripts/tofi-hg/tofi-hg | 3 +-- systems/x86_64-linux/cobalt/default.nix | 15 +++---------- systems/x86_64-linux/cobalt/hardware.nix | 2 +- 11 files changed, 23 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index b75a5b6..4e2fcff 100644 --- a/flake.lock +++ b/flake.lock @@ -329,26 +329,6 @@ "type": "github" } }, - "grub2-themes": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734412921, - "narHash": "sha256-JeMqc7lLowKn6klrCcOkcOg38yNqF7MPbN4Elh6Xvq0=", - "owner": "vinceliuice", - "repo": "grub2-themes", - "rev": "f6ab2438e124f60a340a526543e498e5e33b3c53", - "type": "github" - }, - "original": { - "owner": "vinceliuice", - "repo": "grub2-themes", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -878,7 +858,6 @@ "darwin": "darwin_2", "disko": "disko", "docker-compose-1": "docker-compose-1", - "grub2-themes": "grub2-themes", "home-manager": "home-manager_2", "hypridle": "hypridle", "hyprland": "hyprland", diff --git a/flake.nix b/flake.nix index 5974eb1..3697e5e 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,6 @@ # Add modules only to specific hosts systems.hosts = with inputs; { cobalt.modules = [ - grub2-themes.nixosModules.default disko.nixosModules.default ]; mercury.modules = [ @@ -103,8 +102,5 @@ }; docker-compose-1.url = github:nixos/nixpkgs/b0f0b5c6c021ebafbd322899aa9a54b87d75a313; - - grub2-themes.url = github:vinceliuice/grub2-themes; - grub2-themes.inputs.nixpkgs.follows = "nixpkgs"; }; } diff --git a/homes/x86_64-linux/christopher@cobalt/config/hausgold.nix b/homes/x86_64-linux/christopher@cobalt/config/hausgold.nix index 94db026..ee77dcf 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/hausgold.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/hausgold.nix @@ -2,18 +2,12 @@ pkgs, inputs, ... -}: let - #ruby = pkgs."ruby-2.5"; - #bundler = pkgs.bundler.override { inherit ruby; }; -in { +}: { home.packages = with pkgs; [ # docker has to be installed globally because we have to enable virtualization inputs.docker-compose-1.legacyPackages."x86_64-linux".docker-compose - # Ruby environment - # bundler - # ruby - bundix + ruby_3_2 # Dev environment specifics libxcrypt # maklerportal-frontend-test-suite diff --git a/homes/x86_64-linux/christopher@cobalt/config/wayland.nix b/homes/x86_64-linux/christopher@cobalt/config/wayland.nix index f97b0b0..7ee5930 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/wayland.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/wayland.nix @@ -169,8 +169,7 @@ in { windowrule = float, title:DevTools - # Should fix broken blur in Vivaldi - windowrule=noblur,class:^()$,title:^()$ + windowrule=nofocus,class:^jetbrains-(?!toolbox),floating:1,title:^win\d+$ # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER diff --git a/homes/x86_64-linux/christopher@cobalt/misc/browser.nix b/homes/x86_64-linux/christopher@cobalt/misc/browser.nix index da0b560..cd7ca5e 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/browser.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/browser.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { home.packages = with pkgs; [ firefox - vivaldi ]; xdg.mimeApps = { diff --git a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix index fbbf370..dfd2ba2 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix @@ -3,6 +3,7 @@ home.packages = with pkgs; [ gnupg unzip + dua # Interactively view disk space usage tldr # Quick man-page replacement hyperfine # Terminal benchmarks numbat # Scientific calculations @@ -16,7 +17,7 @@ bottom # System resource monitor # GUI - # obsidian # Note taking + vcv-rack # Audio synthesizer/eurorack simulator vlc # Video player todoist-electron # Todo application logseq # Knowledge Base diff --git a/modules/home/common/terminal/default.nix b/modules/home/common/terminal/default.nix index ba8579a..d116705 100644 --- a/modules/home/common/terminal/default.nix +++ b/modules/home/common/terminal/default.nix @@ -17,8 +17,7 @@ in { LESSKEY = "${conf}/less/lesskey"; DIRENV_LOG_FORMAT = ""; - # BROWSER = "firefox"; - BROWSER = "vivaldi"; + BROWSER = "firefox"; TERMINAL = "kitty"; EDITOR = "hx"; TERM = "xterm-color"; diff --git a/packages/scripts/open-url/open-url b/packages/scripts/open-url/open-url index d756caf..46776d3 100755 --- a/packages/scripts/open-url/open-url +++ b/packages/scripts/open-url/open-url @@ -1,12 +1,19 @@ #!/usr/bin/env bash +# Function to open the default browser with a specified profile +open_browser() { + local profile="$1" + shift + firefox -P "$profile" "$@" +} + # Go up the parent chain of this process to determine if the link was clicked on -# in Slack. If so, open the `Work` profile on firefox. +# in Slack. If so, open the `Work` profile in the browser. parent=$PPID while [ "$parent" -ne 1 ]; do cmd=$(ps -o comm= -p "$parent") if [[ "$cmd" == "slack" ]]; then - firefox -P 'Work' "$@" + open_browser "Work" "$@" exit 0 fi parent=$(ps -o ppid= -p "$parent" | tail -n 1 | awk '{print $1}') @@ -14,10 +21,8 @@ done if [[ $1 == "https://github.com/hausgold"* ]]; then # Also use the `Work` profile for hausgold Github links - # firefox -P 'Work' "$@" - nohup vivaldi --profile-directory="Work" "$@" & + open_browser "Work" "$@" else - # Otherwise just use the default profile of Firefox directly - # firefox "$@" - nohup vivaldi --profile-directory="Default" "$@" & + # Otherwise just use the default profile + open_browser "Default" "$@" fi diff --git a/packages/scripts/tofi-hg/tofi-hg b/packages/scripts/tofi-hg/tofi-hg index d6aa338..3b9c8ed 100755 --- a/packages/scripts/tofi-hg/tofi-hg +++ b/packages/scripts/tofi-hg/tofi-hg @@ -6,6 +6,5 @@ BASE_URI="https://github.com/hausgold/" REPO=$(< "$HOME/.gh/hausgold-repos" tofi) if [[ -n $REPO ]]; then - # firefox -P 'Work' "$BASE_URI$REPO" - nohup vivaldi --profile-directory="Work" "$BASE_URI$REPO" & + open-url "$BASE_URI$REPO" fi diff --git a/systems/x86_64-linux/cobalt/default.nix b/systems/x86_64-linux/cobalt/default.nix index c1c4b94..be6acb1 100644 --- a/systems/x86_64-linux/cobalt/default.nix +++ b/systems/x86_64-linux/cobalt/default.nix @@ -90,9 +90,9 @@ with lib._elements; { homeassistant-shutdown.enable = true; - # pulseaudio.enable = true; - # pulseaudio.support32Bit = true; - pipewire.enable = lib.mkForce true; + pulseaudio.enable = true; + pulseaudio.support32Bit = true; + pipewire.enable = lib.mkForce false; # Automatic mounting of removable media udisks2.enable = true; @@ -206,15 +206,6 @@ with lib._elements; { enable = true; device = "nodev"; efiSupport = true; - gfxmodeEfi = lib.mkForce "3840x1080,auto"; - gfxmodeBios = lib.mkForce "3840x1080,auto"; - }; - grub2-theme = { - enable = true; - icon = "white"; - theme = "tela"; - screen = "ultrawide2k"; - # resolution = "3840x1080"; }; }; } diff --git a/systems/x86_64-linux/cobalt/hardware.nix b/systems/x86_64-linux/cobalt/hardware.nix index 1be511f..8fb269a 100644 --- a/systems/x86_64-linux/cobalt/hardware.nix +++ b/systems/x86_64-linux/cobalt/hardware.nix @@ -45,7 +45,7 @@ type = sftp host = 10.3.0.1 port = 7319 - user = christopher-sftp + user = christopher key_file = /home/christopher/.ssh/id_ethnuc '';