From 35af4bab99da94845ebd6e9b2efae6a544d39b35 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Fri, 22 May 2026 10:23:58 -0500 Subject: LOTS OF TEMP STUFF --- modules/desktop/hjem/programs/firefox.nix | 8 +------- modules/desktop/hjem/programs/foot.nix | 3 +-- modules/desktop/hjem/wm/sway.nix | 9 +++++++-- modules/desktop/nixos/fonts.nix | 2 +- modules/desktop/nixos/programs/firefox.nix | 19 +++++++------------ modules/desktop/options.nix | 12 ++---------- 6 files changed, 19 insertions(+), 34 deletions(-) (limited to 'modules/desktop') diff --git a/modules/desktop/hjem/programs/firefox.nix b/modules/desktop/hjem/programs/firefox.nix index cf9c532..6198afb 100644 --- a/modules/desktop/hjem/programs/firefox.nix +++ b/modules/desktop/hjem/programs/firefox.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, inputs, @@ -44,18 +43,13 @@ in "${profileDir}/chrome/userChrome.css".text = mkCssHacks [ # Tabs - ( - if cfg.theme == "catppuccin" - then "hide_tabs_with_one_tab" - else "hide_tabs_with_one_tab_w_window_controls" - ) + "hide_tabs_with_one_tab" "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" diff --git a/modules/desktop/hjem/programs/foot.nix b/modules/desktop/hjem/programs/foot.nix index d10db24..a28a269 100644 --- a/modules/desktop/hjem/programs/foot.nix +++ b/modules/desktop/hjem/programs/foot.nix @@ -9,8 +9,7 @@ settings = { main = { font = "Iosevka Nerd Font:size=12"; - # shell = "${pkgs.fish}/bin/fish"; - shell = "${pkgs.fish}/bin/fish -c 'br'"; + shell = "fish -c '${pkgs.broot}/bin/broot'"; }; # key-bindings.spawn-terminal = "Control+Return"; diff --git a/modules/desktop/hjem/wm/sway.nix b/modules/desktop/hjem/wm/sway.nix index 441670b..33ea869 100644 --- a/modules/desktop/hjem/wm/sway.nix +++ b/modules/desktop/hjem/wm/sway.nix @@ -35,12 +35,15 @@ pkgs.sway ]; text = '' - selection=$(printf '%s\n' logout suspend reboot shutdown | fuzzel --dmenu --prompt "power: ") + selection=$(printf '%s\n' logout hibernate suspend reboot shutdown | fuzzel --dmenu --prompt "power: ") case "$selection" in logout) swaymsg exit ;; + hibernate) + systemctl hibernate + ;; suspend) systemctl suspend ;; @@ -61,6 +64,8 @@ ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP GTK_USE_PORTAL NIXOS_OZONE_WL MOZ_ENABLE_WAYLAND } + seat seat0 xcursor_theme ${config.collinux.desktop.gtk.cursor_data.name} + # target title bg text indicator border client.focused #${base07} #${base00} #${base05} #${base06} #${base13} client.focused_inactive #${base03} #${base00} #${base05} #${base06} #${base03} @@ -107,8 +112,8 @@ Mod4+Return exec foot Mod4+Space exec fuzzel - Mod4+Escape exec '${powerMenu}/bin/power-menu' Mod4+b exec firefox + Mod4+Escape exec '${powerMenu}/bin/power-menu' Mod4+k exec '${batteryNotify}/bin/battery-notify' Mod4+w exec '${pkgs.iwmenu}/bin/iwmenu -l fuzzel -i font -s 2' Mod4+e exec '${pkgs.bzmenu}/bin/bzmenu -l fuzzel -i font -s 2' diff --git a/modules/desktop/nixos/fonts.nix b/modules/desktop/nixos/fonts.nix index 5ac17ec..d2e8ba9 100644 --- a/modules/desktop/nixos/fonts.nix +++ b/modules/desktop/nixos/fonts.nix @@ -2,6 +2,6 @@ fonts = { enableDefaultPackages = false; fontconfig.enable = true; - packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot or ghostty) + packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex pkgs.liberation_ttf]; # for terminal (blackbox or foot or ghostty) }; } diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix index 61e7b7d..9e2b8ca 100644 --- a/modules/desktop/nixos/programs/firefox.nix +++ b/modules/desktop/nixos/programs/firefox.nix @@ -25,6 +25,8 @@ in NewTabPage = false; + SearchEngines.Default = "DuckDuckGo"; + Preferences = let opt = Value: { inherit Value; @@ -32,12 +34,9 @@ in }; in { "toolkit.legacyUserProfileCustomizations.stylesheets" = opt true; - "browser.tabs.inTitlebar" = opt ( - if cfg.theme == "catppuccin" - then 0 - else 1 - ); + "browser.tabs.inTitlebar" = opt 0; "browser.tabs.hoverPreview.enabled" = opt 0; + "browser.profiles.enabled" = opt false; "browser.theme.content-theme" = opt 0; "browser.theme.toolbar-theme" = opt 0; @@ -99,7 +98,6 @@ in "datareporting.policy.dataSubmissionPolicyBypassNotification" = opt true; "browser.startup.homepage" = opt "about:blank"; - "cookiebanners.ui.desktop.enabled" = opt false; "browser.compactmode.show" = opt true; "browser.uidensity" = opt 1; @@ -107,9 +105,6 @@ in # get that AI out of my browser "browser.ml.chat.enabled" = opt false; "browser.ml.enable" = opt false; - - # use system pki certificates - "security.enterprise_roots.enabled" = opt true; }; ExtensionSettings = let @@ -130,10 +125,10 @@ in // (lib.optionalAttrs (cfg.theme == "adwaita") { "{f1128560-8b23-46c1-aa6f-fb3e79f23cf3}" = ext "gnome-adwaita-gtk4-dark"; }) - // (lib.optionalAttrs (cfg.extensions.zotero.enable) { - "zotero@chnm.gmu.edu" = { + // (lib.optionalAttrs (cfg.extensions.foxyproxy.enable) { + "foxyproxy@eric.h.jung" = { installation_mode = "force_installed"; - install_url = "https://download.zotero.org/connector/firefox/release/Zotero_Connector-5.0.181.xpi"; + install_url = "https://addons.mozilla.org/firefox/downloads/latest/foxyproxy-standard/latest.xpi"; }; }); }; diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix index 3e20643..9a601fe 100644 --- a/modules/desktop/options.nix +++ b/modules/desktop/options.nix @@ -133,16 +133,8 @@ in { programs = { firefox = { enable = mkEnableOption "firefox"; - profileName = mkOption { - type = types.str; - default = config.collinux.user.name; - internal = true; - }; theme = mkThemeOption "firefox"; - extensions.zotero.enable = mkOption { - description = "install Zotero Connector for Firefox"; - default = config.collinux.desktop.programs.research.enable; - }; + extensions.foxyproxy.enable = mkEnableOption "install FoxyProxy extension"; }; foot = mkProgramOption "foot"; @@ -150,7 +142,7 @@ in { ghostty.enable = mkEnableOption "ghostty"; alacritty.enable = mkEnableOption "alacritty"; - research.enable = mkEnableOption "zathura, Xournal++, Zotero"; + research.enable = mkEnableOption "zathura, Xournal++"; }; }; }; -- cgit v1.3.1