From 57d4f949aacaeeb4b3690bceaa1fadd65c038a9d Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Tue, 15 Apr 2025 18:22:06 +0200 Subject: [PATCH] :bug: Fix build errors. Moved zen styling to hosts and app to shared. Start tailscale in justfile --- .../home-manager/hyprland/default.nix | 1 - .../home-manager/hyprland/settings.nix | 2 +- hosts/thinkpad/home-manager/zen/default.nix | 3 - justfile | 4 + shared/home-manager/zen/chrome/userChrome.css | 113 ------------- .../home-manager/zen/chrome/userContent.css | 158 ------------------ shared/home-manager/zen/chrome/zen-logo.svg | 13 -- shared/home-manager/zen/default.nix | 9 +- 8 files changed, 6 insertions(+), 297 deletions(-) delete mode 100644 shared/home-manager/zen/chrome/userChrome.css delete mode 100644 shared/home-manager/zen/chrome/userContent.css delete mode 100644 shared/home-manager/zen/chrome/zen-logo.svg diff --git a/hosts/thinkpad/home-manager/hyprland/default.nix b/hosts/thinkpad/home-manager/hyprland/default.nix index 9cbe761..5459c8c 100644 --- a/hosts/thinkpad/home-manager/hyprland/default.nix +++ b/hosts/thinkpad/home-manager/hyprland/default.nix @@ -2,7 +2,6 @@ { imports = [ ./hyprpanel.nix - ./hyprpaper.nix ./settings.nix ]; } diff --git a/hosts/thinkpad/home-manager/hyprland/settings.nix b/hosts/thinkpad/home-manager/hyprland/settings.nix index 42826ba..0b11230 100644 --- a/hosts/thinkpad/home-manager/hyprland/settings.nix +++ b/hosts/thinkpad/home-manager/hyprland/settings.nix @@ -7,7 +7,7 @@ wayland.windowManager.hyprland.settings = { monitor = let - common = import ../common.nix; + common = import ../../common.nix; in lib.mkForce [ "${common.monitor1}, 1920x1080@60.05, 0x0, 1" diff --git a/hosts/thinkpad/home-manager/zen/default.nix b/hosts/thinkpad/home-manager/zen/default.nix index 8f253c5..721d1a9 100644 --- a/hosts/thinkpad/home-manager/zen/default.nix +++ b/hosts/thinkpad/home-manager/zen/default.nix @@ -1,5 +1,3 @@ -{ pkgs, inputs, ... }: - { # TODO merge with shared home = { @@ -7,6 +5,5 @@ source = ./chrome; recursive = true; }; - packages = with pkgs; [ inputs.zen-browser.packages.${system}.default ]; # Beta }; } diff --git a/justfile b/justfile index a654adf..01ee804 100644 --- a/justfile +++ b/justfile @@ -34,3 +34,7 @@ lock: # Decrypt all files in the repo using git-crypt and the user's GPG key unlock: git-crypt unlock ~/.config/git/crypt-key + +# Connect to tailnet or sign-in if not registered +start-tailscale: + tailscale up --login-server https://vpn.martials.no diff --git a/shared/home-manager/zen/chrome/userChrome.css b/shared/home-manager/zen/chrome/userChrome.css deleted file mode 100644 index b37a865..0000000 --- a/shared/home-manager/zen/chrome/userChrome.css +++ /dev/null @@ -1,113 +0,0 @@ -/* Catppuccin Mocha Blue userChrome.css*/ - -@media (prefers-color-scheme: dark) { - :root { - --zen-colors-primary: #313244 !important; - --zen-primary-color: #89b4fa !important; - --zen-colors-secondary: #313244 !important; - --zen-colors-tertiary: #181825 !important; - --zen-colors-border: #89b4fa !important; - --toolbarbutton-icon-fill: #89b4fa !important; - --lwt-text-color: #cdd6f4 !important; - --toolbar-field-color: #cdd6f4 !important; - --tab-selected-textcolor: rgb(171, 197, 247) !important; - --toolbar-field-focus-color: #cdd6f4 !important; - --toolbar-color: #cdd6f4 !important; - --newtab-text-primary-color: #cdd6f4 !important; - --arrowpanel-color: #cdd6f4 !important; - --arrowpanel-background: #1e1e2e !important; - --sidebar-text-color: #cdd6f4 !important; - --lwt-sidebar-text-color: #cdd6f4 !important; - --lwt-sidebar-background-color: #11111b !important; - --toolbar-bgcolor: #313244 !important; - --newtab-background-color: #1e1e2e !important; - --zen-themed-toolbar-bg: #181825 !important; - --zen-main-browser-background: #181825 !important; - } - - #permissions-granted-icon { - color: #181825 !important; - } - - .sidebar-placesTree { - background-color: #1e1e2e !important; - } - - #zen-workspaces-button { - background-color: #1e1e2e !important; - } - - #TabsToolbar { - background-color: #181825 !important; - } - - #urlbar-background { - background-color: #1e1e2e !important; - } - - .content-shortcuts { - background-color: #1e1e2e !important; - border-color: #89b4fa !important; - } - - .urlbarView-url { - color: #89b4fa !important; - } - - #zenEditBookmarkPanelFaviconContainer { - background: #11111b !important; - } - - toolbar .toolbarbutton-1 { - &:not([disabled]) { - &:is([open], [checked]) - > :is( - .toolbarbutton-icon, - .toolbarbutton-text, - .toolbarbutton-badge-stack - ) { - fill: #11111b; - } - } - } - - .identity-color-blue { - --identity-tab-color: #89b4fa !important; - --identity-icon-color: #89b4fa !important; - } - - .identity-color-turquoise { - --identity-tab-color: #94e2d5 !important; - --identity-icon-color: #94e2d5 !important; - } - - .identity-color-green { - --identity-tab-color: #a6e3a1 !important; - --identity-icon-color: #a6e3a1 !important; - } - - .identity-color-yellow { - --identity-tab-color: #f9e2af !important; - --identity-icon-color: #f9e2af !important; - } - - .identity-color-orange { - --identity-tab-color: #fab387 !important; - --identity-icon-color: #fab387 !important; - } - - .identity-color-red { - --identity-tab-color: #f38ba8 !important; - --identity-icon-color: #f38ba8 !important; - } - - .identity-color-pink { - --identity-tab-color: #f5c2e7 !important; - --identity-icon-color: #f5c2e7 !important; - } - - .identity-color-purple { - --identity-tab-color: #cba6f7 !important; - --identity-icon-color: #cba6f7 !important; - } -} diff --git a/shared/home-manager/zen/chrome/userContent.css b/shared/home-manager/zen/chrome/userContent.css deleted file mode 100644 index 036655d..0000000 --- a/shared/home-manager/zen/chrome/userContent.css +++ /dev/null @@ -1,158 +0,0 @@ -/* Catppuccin Mocha Blue userContent.css*/ - -@media (prefers-color-scheme: dark) { - /* Common variables affecting all pages */ - @-moz-document url-prefix("about:") { - :root { - --in-content-page-color: #cdd6f4 !important; - --color-accent-primary: #89b4fa !important; - --color-accent-primary-hover: rgb(163, 197, 251) !important; - --color-accent-primary-active: rgb(138, 153, 250) !important; - background-color: #1e1e2e !important; - --in-content-page-background: #1e1e2e !important; - } - } - - /* Variables and styles specific to about:newtab and about:home */ - @-moz-document url("about:newtab"), url("about:home") { - :root { - --newtab-background-color: #1e1e2e !important; - --newtab-background-color-secondary: #313244 !important; - --newtab-element-hover-color: #313244 !important; - --newtab-text-primary-color: #cdd6f4 !important; - --newtab-wordmark-color: #cdd6f4 !important; - --newtab-primary-action-background: #89b4fa !important; - } - - .icon { - color: #89b4fa !important; - } - - .search-wrapper .logo-and-wordmark .logo { - background: - url("zen-logo-mocha.svg"), - url("https://raw.githubusercontent.com/IAmJafeth/zen-browser/main/themes/Mocha/Blue/zen-logo-mocha.svg") - no-repeat center !important; - display: inline-block !important; - height: 82px !important; - width: 82px !important; - background-size: 82px !important; - } - - @media (max-width: 609px) { - .search-wrapper .logo-and-wordmark .logo { - background-size: 64px !important; - height: 64px !important; - width: 64px !important; - } - } - - .card-outer:is(:hover, :focus, .active):not(.placeholder) .card-title { - color: #89b4fa !important; - } - - .top-site-outer .search-topsite { - background-color: #89b4fa !important; - } - - .compact-cards .card-outer .card-context .card-context-icon.icon-download { - fill: #a6e3a1 !important; - } - } - - /* Variables and styles specific to about:preferences */ - @-moz-document url-prefix("about:preferences") { - :root { - --zen-colors-tertiary: #181825 !important; - --in-content-text-color: #cdd6f4 !important; - --link-color: #89b4fa !important; - --link-color-hover: rgb(163, 197, 251) !important; - --zen-colors-primary: #313244 !important; - --in-content-box-background: #313244 !important; - --zen-primary-color: #89b4fa !important; - } - - groupbox, - moz-card { - background: #1e1e2e !important; - } - - button, - groupbox menulist { - background: #313244 !important; - color: #cdd6f4 !important; - } - - .main-content { - background-color: #11111b !important; - } - - .identity-color-blue { - --identity-tab-color: #8aadf4 !important; - --identity-icon-color: #8aadf4 !important; - } - - .identity-color-turquoise { - --identity-tab-color: #8bd5ca !important; - --identity-icon-color: #8bd5ca !important; - } - - .identity-color-green { - --identity-tab-color: #a6da95 !important; - --identity-icon-color: #a6da95 !important; - } - - .identity-color-yellow { - --identity-tab-color: #eed49f !important; - --identity-icon-color: #eed49f !important; - } - - .identity-color-orange { - --identity-tab-color: #f5a97f !important; - --identity-icon-color: #f5a97f !important; - } - - .identity-color-red { - --identity-tab-color: #ed8796 !important; - --identity-icon-color: #ed8796 !important; - } - - .identity-color-pink { - --identity-tab-color: #f5bde6 !important; - --identity-icon-color: #f5bde6 !important; - } - - .identity-color-purple { - --identity-tab-color: #c6a0f6 !important; - --identity-icon-color: #c6a0f6 !important; - } - } - - /* Variables and styles specific to about:addons */ - @-moz-document url-prefix("about:addons") { - :root { - --zen-dark-color-mix-base: #181825 !important; - --background-color-box: #1e1e2e !important; - } - } - - /* Variables and styles specific to about:protections */ - @-moz-document url-prefix("about:protections") { - :root { - --zen-primary-color: #1e1e2e !important; - --social-color: #cba6f7 !important; - --coockie-color: #89dceb !important; - --fingerprinter-color: #f9e2af !important; - --cryptominer-color: #b4befe !important; - --tracker-color: #a6e3a1 !important; - --in-content-primary-button-background-hover: rgb(81, 83, 105) !important; - --in-content-primary-button-text-color-hover: #cdd6f4 !important; - --in-content-primary-button-background: #45475a !important; - --in-content-primary-button-text-color: #cdd6f4 !important; - } - - .card { - background-color: #313244 !important; - } - } -} diff --git a/shared/home-manager/zen/chrome/zen-logo.svg b/shared/home-manager/zen/chrome/zen-logo.svg deleted file mode 100644 index 3038ff2..0000000 --- a/shared/home-manager/zen/chrome/zen-logo.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/shared/home-manager/zen/default.nix b/shared/home-manager/zen/default.nix index b8d3278..f8d71cb 100644 --- a/shared/home-manager/zen/default.nix +++ b/shared/home-manager/zen/default.nix @@ -1,12 +1,5 @@ { pkgs, inputs, ... }: { - # TODO programatically get default name - home = { - file.".zen/audtxq7n.default/chrome" = { - source = ./chrome; - recursive = true; - }; - packages = with pkgs; [ inputs.zen-browser.packages.${system}.default ]; # Beta - }; + home.packages = with pkgs; [ inputs.zen-browser.packages.${system}.default ]; # Beta }