From 1ab27e7fe74ebf40bcb48e447540b35fbae9f064 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 9 Jun 2023 16:01:50 -0400 Subject: [PATCH] variables: Add defaultBrowser --- modules/git/default.nix | 6 ++++-- modules/hyprland/default.nix | 6 ++++-- modules/kitty/default.nix | 6 ++++-- src/variables.nix | 1 + 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/git/default.nix b/modules/git/default.nix index f9f82ceb..dbd42770 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -1,4 +1,6 @@ -{pkgs, ...}: { +{pkgs, ...}: let + VARIABLES = import ../../src/variables.nix; +in { environment.systemPackages = with pkgs; [tig git]; home-manager.sharedModules = [ @@ -22,7 +24,7 @@ quotePath = false; }; - web.browser = "librewolf"; + web.browser = VARIABLES.defaultBrowser; push.default = "simple"; branch.autosetuprebase = "always"; init.defaultBranch = "master"; diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index b04c6ea1..13ecb21c 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -1,4 +1,6 @@ -{pkgs, ...}: { +{pkgs, ...}: let + VARIABLES = import ../../src/variables.nix; +in { programs.hyprland.enable = true; services.udisks2 = { enable = true; @@ -19,7 +21,7 @@ { xdg.configFile."hypr/hyprland.conf".text = '' env=XCURSOR_SIZE,24 - env=BROWSER,librewolf + env=BROWSER,${VARIABLES.defaultBrowser} env=GTK_IM_MODULE,fcitx env=QT_IM_MODULE,fcitx env=XMODIFIERS,@im=fcitx diff --git a/modules/kitty/default.nix b/modules/kitty/default.nix index 32d4b134..53a5c7c8 100644 --- a/modules/kitty/default.nix +++ b/modules/kitty/default.nix @@ -1,4 +1,6 @@ -{ +let + VARIABLES = import ../../src/variables.nix; +in { home-manager.sharedModules = [ { programs.kitty = { @@ -9,7 +11,7 @@ close_on_child_death = true; cursor_blink_interval = 0; - open_url_with = "librewolf"; + open_url_with = VARIABLES.defaultBrowser; wayland_titlebar_color = "background"; allow_remote_control = true; diff --git a/src/variables.nix b/src/variables.nix index 0a2e29b2..3b82b058 100644 --- a/src/variables.nix +++ b/src/variables.nix @@ -7,4 +7,5 @@ defaultLocale = "ja_JP.UTF-8"; supportedLocales = ["ja_JP.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8"]; username = "user"; + defaultBrowser = "librewolf"; }