diff --git a/home/firefox.nix b/home/firefox.nix index 655b95f7..9d16849b 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -1,4 +1,4 @@ -{arkenfox, ...}: { +{ pkgs, arkenfox, ...}: { imports = [arkenfox.hmModules.arkenfox]; home.file.".mozilla/firefox/ChatGPT/chrome/userChrome.css".text = '' @@ -9,17 +9,55 @@ programs.firefox = { enable = true; + # nativeMessagingHosts = with pkgs; [ + # tridactyl-native + # ]; + policies = { + Homepage = { + URL = "https://duckduckgo.com"; + StartPage = "homepage"; + }; + DisablePocket = true; DisableFirefoxAccounts = true; DisableAccounts = true; + DisableFormHistory = true; + OfferToSaveLogins = false; + PasswordManagerEnabled = false; + + DisablePrivateBrowsing = true; + DisableSetDesktopBackground = true; + DisableTelemetry = true; DisableFirefoxScreenshots = true; - OverrideFirstRunPage = ""; - OverridePostUpdatePage = ""; + + OverrideFirstRunPage = "https://duckduckgo.com"; + OverridePostUpdatePage = "https://duckduckgo.com"; + NewTabPage = false; + DontCheckDefaultBrowser = true; DisplayBookmarksToolbar = "never"; + SearchBar = "unified"; - DownloadDirectory = "/home/spectre/inbox"; + SearchSuggestEnabled = false; + DownloadDirectory = "/home/lilith/sync/inbox"; + + SanitizeOnShutdown = true; + + Containers = { + "Default" = [ + { + name = "Personal"; + icon = "circle"; + color = "pink"; + } + { + name = "Work"; + icon = "briefcase"; + color = "green"; + } + ]; + }; ExtensionSettings = { # uBlock Origin: @@ -43,6 +81,15 @@ installation_mode = "force_installed"; }; }; + + SearchEngines = { + Default = "DuckDuckGo"; + }; + + Preferences = { + "browser.newtab.extensionControlled" = false; + "browser.translations.neverTranslateLanguages" = true; + }; }; arkenfox.enable = true; diff --git a/home/gpg.nix b/home/gpg.nix index e0c4b58f..dff4961a 100644 --- a/home/gpg.nix +++ b/home/gpg.nix @@ -7,8 +7,5 @@ services.gpg-agent = { enable = true; pinentryPackage = pkgs.pinentry-gtk2; - enableSshSupport = true; - sshKeys = []; - enableExtraSocket = true; }; } diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 182decf1..4ed03b63 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -37,9 +37,9 @@ ]; workspace = [ - "special:keepass,gapsout:25" - "special:magic,gapsout:25" - "special:chatgpt,gapsout:25" + "special:keepass,gapsout:45" + "special:magic,gapsout:45" + "special:chatgpt,gapsout:45" ]; input = { @@ -108,7 +108,7 @@ bind = [ "$mainMod, Q, exec, $terminal" "$mainMod, C, killactive," - "$mainMod, backspace, exec, hyprlock," + "$mainMod, backspace, exec, hyprlock" "$mainMod, E, exec, $fileManager" "$mainMod, O, togglefloating," "$mainMod, R, exec, rofi -show drun" diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix index 968f9f98..1957341d 100644 --- a/home/hyprland/hyprlock.nix +++ b/home/hyprland/hyprlock.nix @@ -26,7 +26,7 @@ inner_color = "rgb(91, 96, 120)"; outer_color = "rgb(24, 25, 38)"; outline_thickness = 5; - placeholder_text = '\'Password...'\'; + placeholder_text = ''Password...''; shadow_passes = 2; } ]; diff --git a/home/rofi.nix b/home/rofi.nix index 7cb68358..900a6c1b 100644 --- a/home/rofi.nix +++ b/home/rofi.nix @@ -1,6 +1,114 @@ -{pkgs, ...}: { +{pkgs, config, stylix,...}: { programs.rofi = { enable = true; package = pkgs.rofi-wayland; + + theme = let + inherit (config.lib.formats.rasi) mkLiteral; + in { + "*" = with config.lib.stylix.colors; { + bg0 = mkLiteral "#${base00}"; + bg1 = mkLiteral "#${base01}"; + bg2 = mkLiteral "#${base02}"; + bg3 = mkLiteral "#${base03}"; + fg0 = mkLiteral "#${base08}"; + fg1 = mkLiteral "#${base09}"; + fg2 = mkLiteral "#${base0A}"; + fg3 = mkLiteral "#${base0B}"; + + font = config.stylix.fonts.sansSerif.name; + + background-color = mkLiteral "transparent"; + text-color = mkLiteral "@fg0"; + + margin = mkLiteral "0px"; + padding = mkLiteral "0px"; + spacing = mkLiteral "0px"; + }; + + window = { + location = mkLiteral "center"; + width = mkLiteral "33%"; + height = mkLiteral "33%"; + border-radius = mkLiteral "24px"; + + background-color = mkLiteral "@bg0"; + }; + + mainbox = { + padding = mkLiteral "12px"; + }; + + inputbar = { + background-color = mkLiteral "@bg1"; + border-color = mkLiteral "@bg3"; + + border = mkLiteral "2px"; + border-radius = mkLiteral "16px"; + + padding = mkLiteral "8px 16px"; + spacing = mkLiteral "8px"; + children = map mkLiteral[ "prompt" "entry" ]; + }; + + prompt = { + text-color = mkLiteral "@fg2"; + }; + + entry = { + placeholder = "Search"; + placeholder-color = mkLiteral "@fg3"; + }; + + message = { + margin = mkLiteral "12px 0 0"; + border-radius = mkLiteral "16px"; + border-color = mkLiteral "@bg2"; + background-color = mkLiteral "@bg2"; + }; + + textbox = { + padding = mkLiteral "8px 24px"; + }; + + listview = { + background-color = mkLiteral "transparent"; + + margin = mkLiteral "12px 0 0"; + lines = mkLiteral "8"; + columns = mkLiteral "1"; + + fixed-height = mkLiteral "false"; + }; + + element = { + padding = mkLiteral "8px 16px"; + spacing = mkLiteral "8px"; + border-radius = mkLiteral "16px"; + }; + + "element normal active" = { + text-color = mkLiteral "@bg3"; + }; + + "element selected normal" = { + background-color = mkLiteral "@bg3"; + text-color = mkLiteral "@bg1"; + }; + + "element selected active" = { + background-color = mkLiteral "@bg3"; + text-color = mkLiteral "@bg1"; + }; + + "element-icon" = { + size = mkLiteral "1em"; + vertical-align = mkLiteral "0.5"; + }; + + "element-text" = { + text-color = mkLiteral "inherit"; + }; + }; }; } diff --git a/home/stylix.nix b/home/stylix.nix index ea8f50d4..b1c60773 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -1,2 +1,3 @@ -{...}: { +{stylix, ...}: { + stylix.targets.rofi.enable = false; } diff --git a/system/common.nix b/system/common.nix index a0b4a70f..1c59a26c 100644 --- a/system/common.nix +++ b/system/common.nix @@ -17,6 +17,7 @@ du-dust ranger ripgrep + papirus-icon-theme sops wget wireguard-tools diff --git a/system/env.nix b/system/env.nix index 293161be..a942bb1b 100644 --- a/system/env.nix +++ b/system/env.nix @@ -2,6 +2,6 @@ environment.variables = { EDITOR = "hx"; VISUAL = "hx"; - FLAKE = "${conf.home}/nixos"; + FLAKE = conf.home + /nixos; }; } diff --git a/system/fonts.nix b/system/fonts.nix index 6bedb43c..bbb66151 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -1,5 +1,7 @@ {pkgs, ...}: { fonts.packages = with pkgs; [ (nerdfonts.override {fonts = ["JetBrainsMono"];}) + + twemoji-color-font ]; } diff --git a/system/stylix.nix b/system/stylix.nix index cbd9eb98..494365fc 100644 --- a/system/stylix.nix +++ b/system/stylix.nix @@ -1,6 +1,32 @@ -{stylix, ...}: { +{stylix, pkgs, config, ...}: { imports = [stylix.nixosModules.stylix]; - stylix.image = ../wallpapers/default.png; - stylix.polarity = "dark"; + stylix = { + image = ../wallpapers/default.png; + polarity = "dark"; + + opacity = { + terminal = 0.8; + popups = 0.8; + }; + + fonts = { + # monospace = { + # package = pkgs.jetbrains-mono; + # name = "JetBrainsMono"; + # }; + + emoji = { + package = pkgs.twemoji-color-font; + name = "Twemoji"; + }; + + sizes = { applications = 14; desktop = 12; popups = 12; terminal = 14; }; + }; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata theme"; + }; + }; } diff --git a/wallpapers/default.jpg b/wallpapers/default.jpg new file mode 100644 index 00000000..513d51f5 Binary files /dev/null and b/wallpapers/default.jpg differ diff --git a/wallpapers/default.png b/wallpapers/default.png index 2a9aea2c..513d51f5 100644 Binary files a/wallpapers/default.png and b/wallpapers/default.png differ