Compare commits

..

No commits in common. "7ea03d08bfe99d0ec44873dff0c59a1727469c25" and "248c0b16d0fe297667b5b3db757d0ffad35a3719" have entirely different histories.

9 changed files with 41 additions and 135 deletions

View file

@ -1 +1,6 @@
{...}: {imports = [./firefox.nix];} {...}: {
imports = [
./nyxt.nix
./firefox.nix
];
}

View file

@ -24,6 +24,7 @@
DisableSetDesktopBackground = true; DisableSetDesktopBackground = true;
DisableSystemAddonUpdate = true; DisableSystemAddonUpdate = true;
DisableTelemetry = true; DisableTelemetry = true;
DisplayBookmarksToolbar = "never";
DisplayMenuBar = "default-off"; DisplayMenuBar = "default-off";
DontCheckDefaultBrowser = true; DontCheckDefaultBrowser = true;
EnableTrackingProtection = { EnableTrackingProtection = {
@ -94,12 +95,11 @@
"app.shield.optoutstudies.enabled" = false; "app.shield.optoutstudies.enabled" = false;
"browser.bookmarks.addedImportButton" = false; "browser.bookmarks.addedImportButton" = false;
"browser.bookmarks.showMobileBookmarks" = false; "browser.bookmarks.showMobileBookmarks" = false;
"browser.toolbars.bookmarks.visibility" = "never"; "browser.toolbars.bookmarks.visibility" = "newtab";
"browser.contentblocking.category" = "strict"; "browser.contentblocking.category" = "strict";
"browser.search.region" = "GB"; "browser.search.region" = "GB";
"browser.search.isUS" = false; "browser.search.isUS" = false;
"browser.warnOnQuitShortcut" = false; "browser.warnOnQuitShortcut" = false;
"browser.zoom.siteSpecific" = false;
"distribution.searchplugins.defaultLocale" = "en-GB"; "distribution.searchplugins.defaultLocale" = "en-GB";
"doh-rollout.home-region" = "GB"; "doh-rollout.home-region" = "GB";
"extensions.activeThemeID" = "default-theme@mozilla.org"; "extensions.activeThemeID" = "default-theme@mozilla.org";
@ -107,14 +107,11 @@
"general.useragent.locale" = "en-GB"; "general.useragent.locale" = "en-GB";
"intl.accept_languages" = "en-gb,en"; "intl.accept_languages" = "en-gb,en";
"intl.locale.requested" = "en-gb,en"; "intl.locale.requested" = "en-gb,en";
"intl.regional_prefs.use_os_locales" = true; "intl.regional_prefs.use_os_locales" = false;
"media.eme.enabled" = true; "media.eme.enabled" = true;
"privacy.webrtc.legacyGlobalIndicator" = false; "privacy.webrtc.legacyGlobalIndicator" = false;
"signon.management.page.breach-alerts.enabled" = false; "signon.management.page.breach-alerts.enabled" = false;
"signon.rememberSignons" = 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" = [ "browser.newtabpage.pinned" = [
{ {
title = "NixOS Wiki"; title = "NixOS Wiki";

View file

@ -1,91 +0,0 @@
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};
''

View file

@ -6,7 +6,7 @@
}: { }: {
imports = [ imports = [
./sway/default.nix ./sway/default.nix
./foot/default.nix ./alacritty/default.nix
./avizo/default.nix ./avizo/default.nix
./fuzzel/default.nix ./fuzzel/default.nix
./swaylock/default.nix ./swaylock/default.nix
@ -73,12 +73,8 @@
}; };
}; };
programs.mpv.enable = true; programs.mpv.enable = true;
gtk = let gtk = {
extraCss = import ./base16/gtk.nix config.scheme;
in {
enable = true; enable = true;
gtk3 = {inherit extraCss;};
gtk4 = {inherit extraCss;};
iconTheme = { iconTheme = {
package = pkgs.papirus-icon-theme.override {color = "violet";}; package = pkgs.papirus-icon-theme.override {color = "violet";};
name = name =

View file

@ -17,10 +17,10 @@
fuzzy = true; fuzzy = true;
filter-desktop = true; filter-desktop = true;
terminal = with config.programs; "${ terminal = with config.programs; "${
if foot.enable if alacritty.enable
then foot.package then alacritty.package
else pkgs.foot else pkgs.alacritty
}/bin/foot -e"; }/bin/alacritty -e";
lines = 24; lines = 24;
width = 80; width = 80;
tabs = 4; tabs = 4;

View file

@ -9,10 +9,10 @@
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
terminal = with config.programs; "${ terminal = with config.programs; "${
if foot.enable if alacritty.enable
then foot.package then alacritty.package
else pkgs.foot else pkgs.alacritty
}/bin/foot"; }/bin/alacritty";
font = fonts.monospace.name; font = fonts.monospace.name;
location = "center"; location = "center";
plugins = with pkgs; [rofi-emoji]; plugins = with pkgs; [rofi-emoji];

View file

@ -39,7 +39,7 @@ in {
}; };
}; };
modifier = "Mod4"; modifier = "Mod4";
terminal = "${config.programs.foot.package}/bin/foot"; terminal = "${config.programs.alacritty.package}/bin/alacritty";
menu = "${config.programs.fuzzel.package}/bin/fuzzel"; menu = "${config.programs.fuzzel.package}/bin/fuzzel";
workspaceAutoBackAndForth = true; workspaceAutoBackAndForth = true;
bars = []; bars = [];

View file

@ -63,7 +63,7 @@
"max-length" = 50; "max-length" = 50;
"rewrite" = { "rewrite" = {
"(.*) - GNU Emacs at (.*)" = " $1 [$2]"; "(.*) - GNU Emacs at (.*)" = " $1 [$2]";
"(foot.*)" = " $1"; "(alacritty.*)" = " $1";
"(.*) - mpv" = "󰦟 $1"; "(.*) - mpv" = "󰦟 $1";
"swayimg: (.*)" = "󰋩 $1"; "swayimg: (.*)" = "󰋩 $1";
"(btm)" = " Resource Usage [$1]"; "(btm)" = " Resource Usage [$1]";
@ -145,10 +145,9 @@
format-icons = ["󰤟 " "󰤢 " "󰤥 " "󰤨 "]; format-icons = ["󰤟 " "󰤢 " "󰤥 " "󰤨 "];
format-wifi = "{icon}"; format-wifi = "{icon}";
format-ethernet = "󰈁 "; format-ethernet = "󰈁 ";
tooltip-format = "{essid} ({signalStrength}%)";
format-linked = "󰈂 "; format-linked = "󰈂 ";
format-disconnected = "󰈂 "; format-disconnected = "󰈂 ";
tooltip-format = "{essid} ({signalStrength}%)";
on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor";
}; };
bluetooth = { bluetooth = {
format = "󰂯"; format = "󰂯";
@ -157,7 +156,8 @@
format-on = "󰂯"; format-on = "󰂯";
format-connected = "󰂱"; format-connected = "󰂱";
tooltip-format = "{status} | {device_alias}"; tooltip-format = "{status} | {device_alias}";
on-click = "${pkgs.blueman}/bin/blueman-manager"; on-click = "${pkgs.bluez}/bin/bluetoothctl power on";
on-click-right = "${pkgs.bluez}/bin/bluetoothctl power off";
}; };
"clock#calendar" = { "clock#calendar" = {
format = "󰃭 {:%Y-%m-%d}"; format = "󰃭 {:%Y-%m-%d}";
@ -202,24 +202,24 @@
"custom/notification" = let "custom/notification" = let
swaync = pkgs.swaynotificationcenter; swaync = pkgs.swaynotificationcenter;
in { in {
tooltip = false; "tooltip" = false;
format = "{icon}{}"; "format" = "{icon}{}";
format-icons = { "format-icons" = {
notification = "󱅫 "; "notification" = "󱅫 ";
none = "󰂚 "; "none" = "󰂚 ";
dnd-notification = "󰅸 "; "dnd-notification" = "󰅸 ";
dnd-none = "󰂜 "; "dnd-none" = "󰂜 ";
inhibited-notification = "󰅸 "; "inhibited-notification" = "󰅸 ";
inhibited-none = "󰂜 "; "inhibited-none" = "󰂜 ";
dnd-inhibited-notification = "󰅸 "; "dnd-inhibited-notification" = "󰅸 ";
dnd-inhibited-none = "󰂜 "; "dnd-inhibited-none" = "󰂜 ";
}; };
return-type = "json"; "return-type" = "json";
exec-if = "which ${swaync}/bin/swaync-client"; "exec-if" = "which ${swaync}/bin/swaync-client";
exec = "${swaync}/bin/swaync-client -swb"; "exec" = "${swaync}/bin/swaync-client -swb";
on-click = "${swaync}/bin/swaync-client -t -sw"; "on-click" = "${swaync}/bin/swaync-client -t -sw";
on-click-right = "${swaync}/bin/swaync-client -d -sw"; "on-click-right" = "${swaync}/bin/swaync-client -d -sw";
escape = true; "escape" = true;
}; };
"custom/weather" = let "custom/weather" = let
date-format = "%Y-%m-%d"; date-format = "%Y-%m-%d";

View file

@ -48,7 +48,6 @@
programs = { programs = {
dconf.enable = true; dconf.enable = true;
light.enable = true; light.enable = true;
nm-applet.enable = true;
noisetorch.enable = true; noisetorch.enable = true;
kdeconnect.enable = true; kdeconnect.enable = true;
file-roller.enable = true; file-roller.enable = true;