aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/desktop/hjem/programs/firefox.nix37
-rw-r--r--modules/desktop/nixos/programs/blackbox.nix2
-rw-r--r--modules/desktop/nixos/programs/firefox.nix6
-rw-r--r--modules/desktop/options.nix1
-rw-r--r--modules/services/nixos/selfhost/default.nix6
-rw-r--r--modules/terminal/hjem/programs/broot.nix29
-rw-r--r--modules/terminal/hjem/programs/tmux.nix31
-rw-r--r--modules/terminal/options.nix1
8 files changed, 52 insertions, 61 deletions
diff --git a/modules/desktop/hjem/programs/firefox.nix b/modules/desktop/hjem/programs/firefox.nix
index cb0794f..b5ea433 100644
--- a/modules/desktop/hjem/programs/firefox.nix
+++ b/modules/desktop/hjem/programs/firefox.nix
@@ -27,23 +27,30 @@ in
};
};
- ".mozilla/firefox/collin/chrome/userChrome.css".text = mkCssHacks [
- # Tabs
- "hide_tabs_with_one_tab"
- "tabs_on_bottom_v2"
- "tab_close_button_always_on_hover"
- "tabs_fill_available_width"
+ ".mozilla/firefox/collin/chrome/userChrome.css".text = mkCssHacks (
+ # (lib.optional (cfg.theme == "adwaita") "window_control_placeholder_support") ++
+ [
+ # Tabs
+ (
+ if cfg.theme == "catppuccin"
+ then "hide_tabs_with_one_tab"
+ else "hide_tabs_with_one_tab_w_window_controls"
+ )
+ "tabs_on_bottom_v2"
+ "tab_close_button_always_on_hover"
+ "tabs_fill_available_width"
- # Icons!
- "iconized_main_menu"
- "iconized_menubar_items"
- "iconized_places_context_menu"
- "iconized_tabs_context_menu"
- "icon_only_context_menu_text_controls"
+ # Icons!
+ "iconized_main_menu"
+ "iconized_menubar_items"
+ "iconized_places_context_menu"
+ "iconized_tabs_context_menu"
+ "icon_only_context_menu_text_controls"
- # Other
- "compact_extensions_panel"
- ];
+ # Other
+ "compact_extensions_panel"
+ ]
+ );
};
packages = [pkgs.firefox];
diff --git a/modules/desktop/nixos/programs/blackbox.nix b/modules/desktop/nixos/programs/blackbox.nix
index 37567b5..9cff44a 100644
--- a/modules/desktop/nixos/programs/blackbox.nix
+++ b/modules/desktop/nixos/programs/blackbox.nix
@@ -20,6 +20,8 @@ in
show-scrollbars = false;
terminal-padding = lib.gvariant.mkTuple (builtins.map lib.gvariant.mkInt16 [10 10 10 10]);
+ font = "Iosevka Nerd Font 12";
+
floating-controls = false;
show-headerbar = true;
};
diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix
index 5dcfec2..c8edca1 100644
--- a/modules/desktop/nixos/programs/firefox.nix
+++ b/modules/desktop/nixos/programs/firefox.nix
@@ -27,7 +27,11 @@ in
};
in {
"toolkit.legacyUserProfileCustomizations.stylesheets" = opt true;
- "browser.tabs.inTitlebar" = opt 0;
+ "browser.tabs.inTitlebar" = opt (
+ if cfg.theme == "catppuccin"
+ then 0
+ else 1
+ );
"browser.tabs.hoverPreview.enabled" = opt 0;
"browser.theme.content-theme" = opt 0;
diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix
index 5820cc6..741f79b 100644
--- a/modules/desktop/options.nix
+++ b/modules/desktop/options.nix
@@ -119,6 +119,7 @@ in {
foot = mkProgramOption "foot";
blackbox.enable = mkEnableOption "blackbox";
+ alacritty.enable = mkEnableOption "alacritty";
research.enable = mkEnableOption "zathura, Xournal++, Zotero, Zotero Connector";
};
diff --git a/modules/services/nixos/selfhost/default.nix b/modules/services/nixos/selfhost/default.nix
index 03dbe4f..d3b884a 100644
--- a/modules/services/nixos/selfhost/default.nix
+++ b/modules/services/nixos/selfhost/default.nix
@@ -1,5 +1,11 @@
{
+ lib,
+ config,
+ ...
+}: {
imports = [
./navidrome.nix
];
+
+ qt.style = lib.optionalAttrs (config.collinux.theme == "adwaita") {name = "adwaita-dark";};
}
diff --git a/modules/terminal/hjem/programs/broot.nix b/modules/terminal/hjem/programs/broot.nix
index 72098f8..2907a85 100644
--- a/modules/terminal/hjem/programs/broot.nix
+++ b/modules/terminal/hjem/programs/broot.nix
@@ -4,21 +4,22 @@
lib,
...
}: let
- cfg = config.collinux.terminal.shells.fish;
+ cfg = config.collinux.terminal.programs.broot;
- conf = {
- skin = catppuccin_skin;
- verbs = [
- {
- name = "open-code";
- key = "enter";
- execution = "$EDITOR +{line} {file}";
- working_dir = "{root}";
- apply_to = "file";
- leave_broot = true;
- }
- ];
- };
+ conf =
+ {
+ verbs = [
+ {
+ name = "open-code";
+ key = "enter";
+ execution = "$EDITOR +{line} {file}";
+ working_dir = "{root}";
+ apply_to = "file";
+ leave_broot = true;
+ }
+ ];
+ }
+ // (lib.optionalAttrs (cfg.theme == "catppuccin") {skin = catppuccin_skin;});
catppuccin_skin = {
input = "rgb(205, 214, 244) none";
diff --git a/modules/terminal/hjem/programs/tmux.nix b/modules/terminal/hjem/programs/tmux.nix
index d6c7cf8..152c443 100644
--- a/modules/terminal/hjem/programs/tmux.nix
+++ b/modules/terminal/hjem/programs/tmux.nix
@@ -28,43 +28,12 @@ in {
}
else {};
- scripts.switch_to_utility =
- # bash
- ''
- # if utility session doesn't exist, create it
- if ! tmux has-session -t "utility"; then
- tmux new-session -ds "utility" -c "$HOME"
- fi
-
- if [ -z "$TMUX" ]; then
- # we're not in tmux
- tmux attach-session -t "utility"
- else
- tmux switch -t "utility"
- fi
-
- # if cmus window doesn't exist, create it
- if ! tmux list-windows -t "utility" -F "#{window_name}" | grep -qx "utility_cmus"; then
- tmux new-window -t "utility" -n "utility_cmus" "cmus"
- fi
-
- # if bluetuith window doesn't exist, create it
- if ! tmux list-windows -t "utility" -F "#{window_name}" | grep -qx "utility_bluetuith"; then
- tmux new-window -t "utility" -n "utility_bluetuith" "bluetuith"
- fi
- '';
-
keys.leader = [
{
name = "Lazygit";
key = "C-g";
exec = "display-popup -E -w 80% -h 80% -x C -y C -d '#{?@default-path,#{@default-path},#{pane_current_path}}' ${lib.getExe pkgs.lazygit}";
}
- {
- name = "Utility";
- key = "C-u";
- exec = "display-popup -w 80% -h 80% -x C -y C 'TMUX= ~/.config/tmux/scripts/switch_to_utility.sh'";
- }
];
confs."main" = ''
set -g mouse on
diff --git a/modules/terminal/options.nix b/modules/terminal/options.nix
index d4c4a1b..e55ab1b 100644
--- a/modules/terminal/options.nix
+++ b/modules/terminal/options.nix
@@ -62,6 +62,7 @@ in {
fzf = mkProgramOption "fzf fuzzy finder";
bat = mkProgramOption "bat cat replacement";
eza = mkProgramOption "eza ls replacement";
+ broot = mkProgramOption "broot";
};
};
};