Compare commits

..

No commits in common. "3c9b3dfcacc4c467f410fda5d1a87f9dc7072429" and "bcc07b98cbb5d4d792dd1a79250b6f70fccf426e" have entirely different histories.

8 changed files with 7 additions and 12 deletions

View file

@ -35,8 +35,7 @@
... ...
}: rec { }: rec {
inherit hostname; inherit hostname;
accentColour = "blue"; accentColour = "magenta";
accentColour2 = "cyan";
iosevkaCustom = { iosevkaCustom = {
packages = iosevka-custom.outputs.packages.${system}; packages = iosevka-custom.outputs.packages.${system};
names = iosevka-custom.outputs.names; names = iosevka-custom.outputs.names;

View file

@ -6,7 +6,6 @@
}: { }: {
imports = [./default.nix]; imports = [./default.nix];
home.packages = with pkgs; [ home.packages = with pkgs; [
teams-for-linux
nomachine-client nomachine-client
(writeShellScriptBin "ukaea-vpn-connect" "sudo ${openfortivpn}/bin/openfortivpn -c ${./ukaea-vpn.conf}") (writeShellScriptBin "ukaea-vpn-connect" "sudo ${openfortivpn}/bin/openfortivpn -c ${./ukaea-vpn.conf}")
]; ];

View file

@ -23,6 +23,7 @@
libreoffice-fresh libreoffice-fresh
inkscape inkscape
webcord webcord
signal-desktop
swayimg swayimg
swaybg swaybg
(writeShellScriptBin "set-background" '' (writeShellScriptBin "set-background" ''
@ -99,6 +100,7 @@
added = defaultApplications; added = defaultApplications;
removed = { removed = {
"x-scheme-handler/zoomus" = config.xdg.mimeApps.defaultApplications."x-scheme-handler/http"; "x-scheme-handler/zoomus" = config.xdg.mimeApps.defaultApplications."x-scheme-handler/http";
"x-scheme-handler/msteams" = ["teams-for-linux.desktop"];
}; };
}; };
}; };

View file

@ -65,5 +65,4 @@ in {
"x-scheme-handler/ms-word" = ["writer.desktop"]; "x-scheme-handler/ms-word" = ["writer.desktop"];
"x-scheme-handler/ms-powerpoint" = ["impress.desktop"]; "x-scheme-handler/ms-powerpoint" = ["impress.desktop"];
"x-scheme-handler/ms-excel" = ["calc.desktop"]; "x-scheme-handler/ms-excel" = ["calc.desktop"];
"x-scheme-handler/msteams" = ["teams-for-linux.desktop"];
} }

View file

@ -4,7 +4,6 @@
pkgs, pkgs,
fonts, fonts,
accentColour, accentColour,
accentColour2,
... ...
}: { }: {
wayland.windowManager.sway = { wayland.windowManager.sway = {
@ -48,7 +47,7 @@
}; };
colors = with config.scheme.withHashtag; let colors = with config.scheme.withHashtag; let
text = toString base05; text = toString base05;
indicator = toString config.scheme.withHashtag.${accentColour2}; indicator = toString cyan;
background = toString base00; background = toString base00;
in { in {
inherit background; inherit background;

View file

@ -127,10 +127,8 @@
auctex-latexmk auctex-latexmk
latex-preview-pane latex-preview-pane
# Contacts # Email
bbdb
mu4e mu4e
ement
# RSS feeds # RSS feeds
elfeed elfeed

View file

@ -105,7 +105,7 @@
"browser.warnOnQuitShortcut" = false; "browser.warnOnQuitShortcut" = 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" = "firefox-alpenglow@mozilla.org";
"extensions.formautofill.creditCards.enabled" = false; "extensions.formautofill.creditCards.enabled" = false;
"general.useragent.locale" = "en-GB"; "general.useragent.locale" = "en-GB";
"intl.accept_languages" = "en-gb,en"; "intl.accept_languages" = "en-gb,en";

View file

@ -3,7 +3,6 @@
pkgs, pkgs,
fonts, fonts,
accentColour, accentColour,
accentColour2,
... ...
}: { }: {
home.packages = [pkgs.nyxt]; home.packages = [pkgs.nyxt];
@ -24,7 +23,7 @@
:on-primary-color "${base01}" :on-primary-color "${base01}"
:secondary-color "${base03}" :secondary-color "${base03}"
:on-secondary-color "${base05}" :on-secondary-color "${base05}"
:accent-color "${config.scheme.withHashtag.${accentColour2}}" :accent-color "${cyan}"
:on-accent-color "${base01}" :on-accent-color "${base01}"
:action-color "${cyan}" :action-color "${cyan}"
:on-action-color "${base01}" :on-action-color "${base01}"