Add GTK extra CSS using base16 colours

CSS based on that from stylix
Swap alacritty for foot (terminal)
2024-07-09 07:57:36 +01:00 · 2024-07-09 07:28:05 +01:00 · 2024-07-09 07:18:52 +01:00 · 2024-07-09 07:17:16 +01:00
9 changed files with 135 additions and 41 deletions
--- a/home/browser/default.nix
+++ b/home/browser/default.nix
@ -1,6 +1 @@
-{...}: {
-  imports = [
-    ./nyxt.nix
-    ./firefox.nix
-  ];
-}
+{...}: {imports = [./firefox.nix];}
--- a/home/browser/firefox.nix
+++ b/home/browser/firefox.nix
@ -24,7 +24,6 @@
        DisableSetDesktopBackground = true;
        DisableSystemAddonUpdate = true;
        DisableTelemetry = true;
-        DisplayBookmarksToolbar = "never";
        DisplayMenuBar = "default-off";
        DontCheckDefaultBrowser = true;
        EnableTrackingProtection = {
@ -95,11 +94,12 @@
          "app.shield.optoutstudies.enabled" = false;
          "browser.bookmarks.addedImportButton" = false;
          "browser.bookmarks.showMobileBookmarks" = false;
-          "browser.toolbars.bookmarks.visibility" = "newtab";
+          "browser.toolbars.bookmarks.visibility" = "never";
          "browser.contentblocking.category" = "strict";
          "browser.search.region" = "GB";
          "browser.search.isUS" = false;
          "browser.warnOnQuitShortcut" = false;
+          "browser.zoom.siteSpecific" = false;
          "distribution.searchplugins.defaultLocale" = "en-GB";
          "doh-rollout.home-region" = "GB";
          "extensions.activeThemeID" = "default-theme@mozilla.org";
@ -107,11 +107,14 @@
          "general.useragent.locale" = "en-GB";
          "intl.accept_languages" = "en-gb,en";
          "intl.locale.requested" = "en-gb,en";
-          "intl.regional_prefs.use_os_locales" = false;
+          "intl.regional_prefs.use_os_locales" = true;
          "media.eme.enabled" = true;
          "privacy.webrtc.legacyGlobalIndicator" = false;
          "signon.management.page.breach-alerts.enabled" = false;
          "signon.rememberSignons" = false;
+          "widget.use-xdg-desktop-portal.file-picker" = 1;
+          "widget.use-xdg-desktop-portal.mime-handler" = 1;
+          "widget.use-xdg-desktop-portal.open-uri" = 1;
          "browser.newtabpage.pinned" = [
            {
              title = "NixOS Wiki";
--- a/home/desktop/base16/gtk.nix
+++ b/home/desktop/base16/gtk.nix
@ -0,0 +1,91 @@
+scheme:
+with scheme.withHashtag; ''
+  @define-color accent_color ${base0D-hex};
+  @define-color accent_bg_color ${base0D-hex};
+  @define-color accent_fg_color ${base00-hex};
+  @define-color destructive_color ${base08-hex};
+  @define-color destructive_bg_color ${base08-hex};
+  @define-color destructive_fg_color ${base00-hex};
+  @define-color success_color ${base0B-hex};
+  @define-color success_bg_color ${base0B-hex};
+  @define-color success_fg_color ${base00-hex};
+  @define-color warning_color ${base0E-hex};
+  @define-color warning_bg_color ${base0E-hex};
+  @define-color warning_fg_color ${base00-hex};
+  @define-color error_color ${base08-hex};
+  @define-color error_bg_color ${base08-hex};
+  @define-color error_fg_color ${base00-hex};
+  @define-color window_bg_color ${base00-hex};
+  @define-color window_fg_color ${base05-hex};
+  @define-color view_bg_color ${base00-hex};
+  @define-color view_fg_color ${base05-hex};
+  @define-color headerbar_bg_color ${base01-hex};
+  @define-color headerbar_fg_color ${base05-hex};
+  @define-color headerbar_border_color rgba(${scheme.base01-dec-r}, ${scheme.base01-dec-g}, ${scheme.base01-dec-b}, 0.7);
+  @define-color headerbar_backdrop_color @window_bg_color;
+  @define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
+  @define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+  @define-color sidebar_bg_color ${base01-hex};
+  @define-color sidebar_fg_color ${base05-hex};
+  @define-color sidebar_backdrop_color @window_bg_color;
+  @define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
+  @define-color secondary_sidebar_bg_color @sidebar_bg_color;
+  @define-color secondary_sidebar_fg_color @sidebar_fg_color;
+  @define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
+  @define-color secondary_sidebar_shade_color @sidebar_shade_color;
+  @define-color card_bg_color ${base01-hex};
+  @define-color card_fg_color ${base05-hex};
+  @define-color card_shade_color rgba(0, 0, 0, 0.07);
+  @define-color dialog_bg_color ${base01-hex};
+  @define-color dialog_fg_color ${base05-hex};
+  @define-color popover_bg_color ${base01-hex};
+  @define-color popover_fg_color ${base05-hex};
+  @define-color popover_shade_color rgba(0, 0, 0, 0.07);
+  @define-color shade_color rgba(0, 0, 0, 0.07);
+  @define-color scrollbar_outline_color ${base02-hex};
+  @define-color blue_1 ${base0D-hex};
+  @define-color blue_2 ${base0D-hex};
+  @define-color blue_3 ${base0D-hex};
+  @define-color blue_4 ${base0D-hex};
+  @define-color blue_5 ${base0D-hex};
+  @define-color green_1 ${base0B-hex};
+  @define-color green_2 ${base0B-hex};
+  @define-color green_3 ${base0B-hex};
+  @define-color green_4 ${base0B-hex};
+  @define-color green_5 ${base0B-hex};
+  @define-color yellow_1 ${base0A-hex};
+  @define-color yellow_2 ${base0A-hex};
+  @define-color yellow_3 ${base0A-hex};
+  @define-color yellow_4 ${base0A-hex};
+  @define-color yellow_5 ${base0A-hex};
+  @define-color orange_1 ${base09-hex};
+  @define-color orange_2 ${base09-hex};
+  @define-color orange_3 ${base09-hex};
+  @define-color orange_4 ${base09-hex};
+  @define-color orange_5 ${base09-hex};
+  @define-color red_1 ${base08-hex};
+  @define-color red_2 ${base08-hex};
+  @define-color red_3 ${base08-hex};
+  @define-color red_4 ${base08-hex};
+  @define-color red_5 ${base08-hex};
+  @define-color purple_1 ${base0E-hex};
+  @define-color purple_2 ${base0E-hex};
+  @define-color purple_3 ${base0E-hex};
+  @define-color purple_4 ${base0E-hex};
+  @define-color purple_5 ${base0E-hex};
+  @define-color brown_1 ${base0F-hex};
+  @define-color brown_2 ${base0F-hex};
+  @define-color brown_3 ${base0F-hex};
+  @define-color brown_4 ${base0F-hex};
+  @define-color brown_5 ${base0F-hex};
+  @define-color light_1 ${base01-hex};
+  @define-color light_2 ${base01-hex};
+  @define-color light_3 ${base01-hex};
+  @define-color light_4 ${base01-hex};
+  @define-color light_5 ${base01-hex};
+  @define-color dark_1 ${base01-hex};
+  @define-color dark_2 ${base01-hex};
+  @define-color dark_3 ${base01-hex};
+  @define-color dark_4 ${base01-hex};
+  @define-color dark_5 ${base01-hex};
+''
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@ -6,7 +6,7 @@
 }: {
  imports = [
    ./sway/default.nix
-    ./alacritty/default.nix
+    ./foot/default.nix
    ./avizo/default.nix
    ./fuzzel/default.nix
    ./swaylock/default.nix
@ -73,8 +73,12 @@
    };
  };
  programs.mpv.enable = true;
-  gtk = {
+  gtk = let
+    extraCss = import ./base16/gtk.nix config.scheme;
+  in {
    enable = true;
+    gtk3 = {inherit extraCss;};
+    gtk4 = {inherit extraCss;};
    iconTheme = {
      package = pkgs.papirus-icon-theme.override {color = "violet";};
      name =
--- a/home/desktop/fuzzel/default.nix
+++ b/home/desktop/fuzzel/default.nix
@ -17,10 +17,10 @@
        fuzzy = true;
        filter-desktop = true;
        terminal = with config.programs; "${
-          if alacritty.enable
-          then alacritty.package
-          else pkgs.alacritty
-        }/bin/alacritty -e";
+          if foot.enable
+          then foot.package
+          else pkgs.foot
+        }/bin/foot -e";
        lines = 24;
        width = 80;
        tabs = 4;
--- a/home/desktop/rofi/default.nix
+++ b/home/desktop/rofi/default.nix
@ -9,10 +9,10 @@
    enable = true;
    package = pkgs.rofi-wayland;
    terminal = with config.programs; "${
-      if alacritty.enable
-      then alacritty.package
-      else pkgs.alacritty
-    }/bin/alacritty";
+      if foot.enable
+      then foot.package
+      else pkgs.foot
+    }/bin/foot";
    font = fonts.monospace.name;
    location = "center";
    plugins = with pkgs; [rofi-emoji];
--- a/home/desktop/sway/default.nix
+++ b/home/desktop/sway/default.nix
@ -39,7 +39,7 @@ in {
        };
      };
      modifier = "Mod4";
-      terminal = "${config.programs.alacritty.package}/bin/alacritty";
+      terminal = "${config.programs.foot.package}/bin/foot";
      menu = "${config.programs.fuzzel.package}/bin/fuzzel";
      workspaceAutoBackAndForth = true;
      bars = [];
--- a/home/desktop/waybar/default.nix
+++ b/home/desktop/waybar/default.nix
@ -63,7 +63,7 @@
        "max-length" = 50;
        "rewrite" = {
          "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
-          "(alacritty.*)" = "  $1";
+          "(foot.*)" = "  $1";
          "(.*) - mpv" = "󰦟  $1";
          "swayimg: (.*)" = "󰋩  $1";
          "(btm)" = "  Resource Usage [$1]";
@ -145,9 +145,10 @@
        format-icons = ["󰤟 " "󰤢 " "󰤥 " "󰤨 "];
        format-wifi = "{icon}";
        format-ethernet = "󰈁 ";
-        tooltip-format = "{essid} ({signalStrength}%)";
        format-linked = "󰈂 ";
        format-disconnected = "󰈂 ";
+        tooltip-format = "{essid} ({signalStrength}%)";
+        on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor";
      };
      bluetooth = {
        format = "󰂯";
@ -156,8 +157,7 @@
        format-on = "󰂯";
        format-connected = "󰂱";
        tooltip-format = "{status} | {device_alias}";
-        on-click = "${pkgs.bluez}/bin/bluetoothctl power on";
-        on-click-right = "${pkgs.bluez}/bin/bluetoothctl power off";
+        on-click = "${pkgs.blueman}/bin/blueman-manager";
      };
      "clock#calendar" = {
        format = "󰃭 {:%Y-%m-%d}";
@ -202,24 +202,24 @@
      "custom/notification" = let
        swaync = pkgs.swaynotificationcenter;
      in {
-        "tooltip" = false;
-        "format" = "{icon}{}";
-        "format-icons" = {
-          "notification" = "󱅫 ";
-          "none" = "󰂚 ";
-          "dnd-notification" = "󰅸 ";
-          "dnd-none" = "󰂜 ";
-          "inhibited-notification" = "󰅸 ";
-          "inhibited-none" = "󰂜 ";
-          "dnd-inhibited-notification" = "󰅸 ";
-          "dnd-inhibited-none" = "󰂜 ";
+        tooltip = false;
+        format = "{icon}{}";
+        format-icons = {
+          notification = "󱅫 ";
+          none = "󰂚 ";
+          dnd-notification = "󰅸 ";
+          dnd-none = "󰂜 ";
+          inhibited-notification = "󰅸 ";
+          inhibited-none = "󰂜 ";
+          dnd-inhibited-notification = "󰅸 ";
+          dnd-inhibited-none = "󰂜 ";
        };
-        "return-type" = "json";
-        "exec-if" = "which ${swaync}/bin/swaync-client";
-        "exec" = "${swaync}/bin/swaync-client -swb";
-        "on-click" = "${swaync}/bin/swaync-client -t -sw";
-        "on-click-right" = "${swaync}/bin/swaync-client -d -sw";
-        "escape" = true;
+        return-type = "json";
+        exec-if = "which ${swaync}/bin/swaync-client";
+        exec = "${swaync}/bin/swaync-client -swb";
+        on-click = "${swaync}/bin/swaync-client -t -sw";
+        on-click-right = "${swaync}/bin/swaync-client -d -sw";
+        escape = true;
      };
      "custom/weather" = let
        date-format = "%Y-%m-%d";
--- a/system/desktop.nix
+++ b/system/desktop.nix
@ -48,6 +48,7 @@
  programs = {
    dconf.enable = true;
    light.enable = true;
+    nm-applet.enable = true;
    noisetorch.enable = true;
    kdeconnect.enable = true;
    file-roller.enable = true;
Author	SHA1	Message	Date
Evie Litherland-Smith	7ea03d08bf	Add GTK extra CSS using base16 colours CSS based on that from stylix	2024-07-09 07:57:36 +01:00
Evie Litherland-Smith	48793f9718	Swap alacritty for foot (terminal)	2024-07-09 07:28:05 +01:00
Evie Litherland-Smith	f80f3a8bdd	Enable networkmanager-applet, add to on-click for waybar module	2024-07-09 07:18:52 +01:00
Evie Litherland-Smith	d0771d3418	Fix firefox bookmark bar setting Had accidentally duplicated the setting... Use OS locales for formatting Use XDG portal for file picker, mime handler, etc...	2024-07-09 07:17:16 +01:00