gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

profiles/{gui,sway}: Moved to base16-shell fully

Browse source
This commit is contained in:
kat witch 2021-04-30 02:41:04 +01:00
parent 0d465c9d72
commit ba2a026d35
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
8 changed files with 74 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/style.nix
View file

@ -1,11 +0,0 @@
{ pkgs }:
rec {
base16 = mapAttrs (_: toString) pkgs.base16.shell.shell256;
font = {
name = "FantasqueSansMono Nerd Font";
size = "10";
size_css = "14px";
};
}

2
lib/witch.nix
View file

@ -1,7 +1,5 @@
{ pkgs, lib }:
{
style = import ./style.nix { inherit pkgs; };
colorhelpers = import ./colorhelpers.nix { inherit lib; };
modList = import ./modules.nix;
}

2
pkgs/default.nix
View file

@ -49,6 +49,8 @@ let
obs-studio = super.obs-studio.override { pipewireSupport = true; };
hextorgba = (import ../lib/colorhelpers.nix { inherit (super) lib; }).hextorgba;
ff-sponsorblock = super.callPackage ./ff-sponsorblock { };
kat-glauca-dns = super.callPackage ./kat-glauca-dns { };

6
profiles/gui/home/kitty.nix
View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, witch, ... }:
{
let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default; witch.style.font = {
name = "FantasqueSansMono Nerd Font";
size = "10";
size_css = "14px";
}; in {
programs.kitty = {
enable = true;
font.name = witch.style.font.name;

12
profiles/sway/home/mako.nix
View file

@ -1,6 +1,10 @@
{ config, pkgs, lib, witch, ... }:
{
let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default; witch.style.font = {
name = "FantasqueSansMono Nerd Font";
size = "10";
size_css = "14px";
}; in {
systemd.user.services = {
mako = {
Unit = {
@ -19,8 +23,8 @@
programs.mako = {
enable = true;
defaultTimeout = 3000;
borderColor = witch.style.base16.color7;
backgroundColor = "${witch.style.base16.color0}70";
textColor = witch.style.base16.color7;
borderColor = witch.style.base16.base07;
backgroundColor = "${witch.style.base16.base00}70";
textColor = witch.style.base16.base07;
};
}

48
profiles/sway/home/sway.nix
View file

@ -1,6 +1,10 @@
{ config, pkgs, lib, witch, ... }:
{
let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default; witch.style.font = {
name = "FantasqueSansMono Nerd Font";
size = "10";
size_css = "14px";
}; in {
home.sessionVariables = {
MOZ_ENABLE_WAYLAND = 1;
XDG_CURRENT_DESKTOP = "sway";
@ -66,7 +70,7 @@
enable = true;
config = let
dmenu =
"${pkgs.bemenu}/bin/bemenu --fn '${witch.style.font.name} ${witch.style.font.size}' --nb '${witch.style.base16.color0}' --nf '${witch.style.base16.color7}' --sb '${witch.style.base16.color1}' --sf '${witch.style.base16.color7}' -l 5 -m -1 -i";
"${pkgs.bemenu}/bin/bemenu --fn '${witch.style.font.name} ${witch.style.font.size}' --nb '${witch.style.base16.base00}' --nf '${witch.style.base16.base07}' --sb '${witch.style.base16.base01}' --sf '${witch.style.base16.base07}' -l 5 -m -1 -i";
lockCommand = "swaylock -i LVDS-1:${
../../../private/files/wallpapers/main.png
}-i eDP-1:${../../../private/files/wallpapers/main.png} -i HDMI-A-1:${
@ -189,32 +193,32 @@
colors = {
focused = {
border = witch.style.base16.color8;
background = witch.style.base16.color3;
text = witch.style.base16.color0;
indicator = witch.style.base16.color2;
childBorder = witch.style.base16.color8;
border = witch.style.base16.base08;
background = witch.style.base16.base0A;
text = witch.style.base16.base00;
indicator = witch.style.base16.base0B;
childBorder = witch.style.base16.base08;
};
focusedInactive = {
border = witch.style.base16.color0;
background = witch.style.base16.color15;
text = witch.style.base16.color13;
indicator = witch.style.base16.color2;
childBorder = witch.style.base16.color8;
border = witch.style.base16.base00;
background = witch.style.base16.base07;
text = witch.style.base16.base0E;
indicator = witch.style.base16.base0B;
childBorder = witch.style.base16.base03;
};
unfocused = {
border = witch.style.base16.color0;
background = witch.style.base16.color8;
text = witch.style.base16.color7;
indicator = witch.style.base16.color8;
childBorder = witch.style.base16.color8;
border = witch.style.base16.base00;
background = witch.style.base16.base01;
text = witch.style.base16.base04;
indicator = witch.style.base16.base08;
childBorder = witch.style.base16.base08;
};
urgent = {
border = witch.style.base16.color0;
background = witch.style.base16.color9;
text = witch.style.base16.color0;
indicator = witch.style.base16.color1;
childBorder = witch.style.base16.color8;
border = witch.style.base16.base00;
background = witch.style.base16.base09;
text = witch.style.base16.base00;
indicator = witch.style.base16.base01;
childBorder = witch.style.base16.base08;
};
};
};

8
profiles/sway/home/waybar/default.nix
View file

@ -1,12 +1,16 @@
{ config, lib, pkgs, witch, ... }:
{
let witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default; witch.style.font = {
name = "FantasqueSansMono Nerd Font";
size = "10";
size_css = "14px";
}; in {
config = lib.mkIf config.deploy.profile.sway {
programs.waybar = {
enable = true;
style = import ./waybar.css.nix {
style = witch.style;
hextorgba = witch.colorhelpers.hextorgba;
hextorgba = pkgs.hextorgba;
};
settings = [{
modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];

51
profiles/sway/home/waybar/waybar.css.nix
View file

@ -9,20 +9,24 @@
min-height: 14px
}
#clock, #memory, #cpu, #temperature, #pulseaudio, #network, #mpd, #backlight, #battery, #custom-weather, #custom-gpg-status, #idle_inhibitor, #tray {
#clock, #memory, #cpu, #temperature, #pulseaudio, #network, #mpd, #backlight, #battery, #custom-weather, #custom-gpg-status, #idle_inhibitor {
margin-left: 8px;
margin-right: 8px;
padding-left: 8px;
padding-right: 8px;
transition: none;
border-bottom: 2px solid ${style.base16.color7};
color: ${style.base16.color7}
border-bottom: 2px solid ${style.base16.base00};
color: ${style.base16.base05}
}
window#waybar { background: ${hextorgba style.base16.color0} }
window#waybar { background: ${hextorgba style.base16.base00} }
#tray {
margin-left: 8px;
}
#window {
color: ${style.base16.color7};
color: ${style.base16.base06};
padding-left: 16px;
padding-right: 16px
}
@ -30,41 +34,40 @@
#workspaces { padding: 0px 4px 0px 4px }
#workspaces button {
color: ${style.base16.color7};
background: ${hextorgba style.base16.color8};
color: ${style.base16.base04};
background: ${hextorgba style.base16.base02};
font-size: 16px;
margin: 0px 4px 0px 4px;
border-bottom: 2px solid transparent;
border-left: 1px solid ${style.base16.color7};
border-right: 1px solid ${style.base16.color7}
border-left: 1px solid ${style.base16.base07};
border-right: 1px solid ${style.base16.base07}
}
#workspaces button:last-child { margin-right: 0px }
#workspaces button.focused {
color: ${style.base16.color5};
border-bottom-color: ${style.base16.color5}
color: ${style.base16.base0A};
border-bottom-color: ${style.base16.base0A}
}
#workspaces button:hover {
transition: none;
box-shadow: inherit;
text-shadow: inherit;
color: ${style.base16.color2};
border-bottom-color: ${style.base16.color2}
color: ${style.base16.base0F};
border-bottom-color: ${style.base16.base0F}
}
#mpd, #idle_inhibitor { border-color: #5af78e }
#mpd.disconnected, #mpd.stopped { border-color: #282a36 }
#tray { border-color: ${style.base16.color19} }
#network { border-color: ${style.base16.color3} }
#custom-weather { border-color: ${style.base16.color14} }
#custom-gpg-status { border-color: ${style.base16.color2} }
#pulseaudio { border-color: ${style.base16.color2} }
#temperature { border-color: ${style.base16.color4} }
#battery { border-color: ${style.base16.color6} }
#backlight { border-color: ${style.base16.color9} }
#cpu { border-color: ${style.base16.color5} }
#memory { border-color: ${style.base16.color17} }
#clock { border-color: ${style.base16.color7} }
#network { border-color: ${style.base16.base08} }
#custom-weather { border-color: ${style.base16.base00} }
#custom-gpg-status { border-color: ${style.base16.base09} }
#pulseaudio { border-color: ${style.base16.base0A} }
#temperature { border-color: ${style.base16.base0B} }
#battery { border-color: ${style.base16.base0C} }
#backlight { border-color: ${style.base16.base0D} }
#cpu { border-color: ${style.base16.base0E} }
#memory { border-color: ${style.base16.base0F} }
#clock { border-color: ${style.base16.base06} }
''