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

witch: Further deprecation efforts

Browse source
This commit is contained in:
kat witch 2021-05-06 16:08:14 +01:00
parent 8dbee8ce83
commit f95acee54d
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
6 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
default.nix
View file

@ -11,7 +11,7 @@ rec {
users = modList { modulesDir = ./users; }; users = modList { modulesDir = ./users; };
inherit (import ./lib/hosts.nix { inherit (import ./lib/hosts.nix {
inherit pkgs sources witch profiles users; inherit pkgs sources profiles users;
inherit (deploy) target; inherit (deploy) target;
}) })
hosts targets; hosts targets;

4
lib/hosts.nix
View file

@ -1,5 +1,5 @@
{ pkgs, target, users, hostsDir ? ../hosts, profiles, pkgsPath ? ../pkgs { pkgs, target, users, hostsDir ? ../hosts, profiles, pkgsPath ? ../pkgs
, sources ? { }, witch ? { } }: , sources ? { } }:
with pkgs.lib; with pkgs.lib;
@ -27,7 +27,7 @@ rec {
else else
{ }) { })
]; ];
specialArgs = { inherit sources target profiles witch hostName users; }; specialArgs = { inherit sources target profiles hostName users; };
})) hostNames); })) hostNames);
targets = foldAttrs (host: hosts: [ host ] ++ hosts) [ ] (mapAttrsToList targets = foldAttrs (host: hosts: [ host ] ++ hosts) [ ] (mapAttrsToList

10
users/kat/home/sway/mako.nix
View file

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

48
users/kat/home/sway/sway.nix
View file

@ -1,9 +1,9 @@
{ config, pkgs, lib, witch, ... }: { config, pkgs, lib, witch, ... }:
let let
witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
config.lib.arc.base16.schemeForAlias.default; config.lib.arc.base16.schemeForAlias.default;
witch.style.font = { font = {
name = "FantasqueSansMono Nerd Font"; name = "FantasqueSansMono Nerd Font";
size = "10"; size = "10";
size_css = "14px"; size_css = "14px";
@ -76,7 +76,7 @@ in {
enable = true; enable = true;
config = let config = let
dmenu = dmenu =
"${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"; "${pkgs.bemenu}/bin/bemenu --fn '${font.name} ${font.size}' --nb '${base16.base00}' --nf '${base16.base07}' --sb '${base16.base01}' --sf '${base16.base07}' -l 5 -m -1 -i";
lockCommand = "swaylock -i LVDS-1:${./wallpapers/main.png}-i eDP-1:${ lockCommand = "swaylock -i LVDS-1:${./wallpapers/main.png}-i eDP-1:${
./wallpapers/main.png ./wallpapers/main.png
} -i HDMI-A-1:${./wallpapers/main.png} -i DP-1:${ } -i HDMI-A-1:${./wallpapers/main.png} -i DP-1:${
@ -94,7 +94,7 @@ in {
}; };
}; };
fonts = [ "${witch.style.font.name} ${witch.style.font.size}" ]; fonts = [ "${font.name} ${font.size}" ];
terminal = "${pkgs.kitty}/bin/kitty"; terminal = "${pkgs.kitty}/bin/kitty";
# TODO: replace with wofi # TODO: replace with wofi
menu = menu =
@ -205,32 +205,32 @@ in {
colors = { colors = {
focused = { focused = {
border = witch.style.base16.base08; border = base16.base08;
background = witch.style.base16.base0A; background = base16.base0A;
text = witch.style.base16.base00; text = base16.base00;
indicator = witch.style.base16.base0B; indicator = base16.base0B;
childBorder = witch.style.base16.base08; childBorder = base16.base08;
}; };
focusedInactive = { focusedInactive = {
border = witch.style.base16.base00; border = base16.base00;
background = witch.style.base16.base07; background = base16.base07;
text = witch.style.base16.base0A; text = base16.base0A;
indicator = witch.style.base16.base0B; indicator = base16.base0B;
childBorder = witch.style.base16.base03; childBorder = base16.base03;
}; };
unfocused = { unfocused = {
border = witch.style.base16.base00; border = base16.base00;
background = witch.style.base16.base01; background = base16.base01;
text = witch.style.base16.base04; text = base16.base04;
indicator = witch.style.base16.base08; indicator = base16.base08;
childBorder = witch.style.base16.base08; childBorder = base16.base08;
}; };
urgent = { urgent = {
border = witch.style.base16.base00; border = base16.base00;
background = witch.style.base16.base09; background = base16.base09;
text = witch.style.base16.base00; text = base16.base00;
indicator = witch.style.base16.base01; indicator = base16.base01;
childBorder = witch.style.base16.base08; childBorder = base16.base08;
}; };
}; };
}; };

8
users/kat/home/sway/waybar/default.nix
View file

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

50
users/kat/home/sway/waybar/waybar.css.nix
View file

@ -1,11 +1,11 @@
{ hextorgba, style }: { hextorgba, base16, font }:
'' ''
* { * {
border: none; border: none;
border-radius: 0; border-radius: 0;
font-family: "${style.font.name}"; font-family: "${font.name}";
font-size: ${style.font.size_css}; font-size: ${font.size_css};
min-height: 14px min-height: 14px
} }
@ -15,18 +15,18 @@
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
transition: none; transition: none;
border-bottom: 2px solid ${style.base16.base00}; border-bottom: 2px solid ${base16.base00};
color: ${style.base16.base05} color: ${base16.base05}
} }
window#waybar { background: ${hextorgba style.base16.base00} } window#waybar { background: ${hextorgba base16.base00} }
#tray { #tray {
margin-left: 8px; margin-left: 8px;
} }
#window { #window {
color: ${style.base16.base06}; color: ${base16.base06};
padding-left: 16px; padding-left: 16px;
padding-right: 16px padding-right: 16px
} }
@ -34,40 +34,40 @@
#workspaces { padding: 0px 4px 0px 4px } #workspaces { padding: 0px 4px 0px 4px }
#workspaces button { #workspaces button {
color: ${style.base16.base04}; color: ${base16.base04};
background: ${hextorgba style.base16.base02}; background: ${hextorgba base16.base02};
font-size: 16px; font-size: 16px;
margin: 0px 4px 0px 4px; margin: 0px 4px 0px 4px;
border-bottom: 2px solid transparent; border-bottom: 2px solid transparent;
border-left: 1px solid ${style.base16.base07}; border-left: 1px solid ${base16.base07};
border-right: 1px solid ${style.base16.base07} border-right: 1px solid ${base16.base07}
} }
#workspaces button:last-child { margin-right: 0px } #workspaces button:last-child { margin-right: 0px }
#workspaces button.focused { #workspaces button.focused {
color: ${style.base16.base0A}; color: ${base16.base0A};
border-bottom-color: ${style.base16.base0A} border-bottom-color: ${base16.base0A}
} }
#workspaces button:hover { #workspaces button:hover {
transition: none; transition: none;
box-shadow: inherit; box-shadow: inherit;
text-shadow: inherit; text-shadow: inherit;
color: ${style.base16.base0F}; color: ${base16.base0F};
border-bottom-color: ${style.base16.base0F} border-bottom-color: ${base16.base0F}
} }
#mpd, #idle_inhibitor { border-color: #5af78e } #mpd, #idle_inhibitor { border-color: #5af78e }
#mpd.disconnected, #mpd.stopped { border-color: #282a36 } #mpd.disconnected, #mpd.stopped { border-color: #282a36 }
#network { border-color: ${style.base16.base08} } #network { border-color: ${base16.base08} }
#custom-weather { border-color: ${style.base16.base00} } #custom-weather { border-color: ${base16.base00} }
#custom-gpg-status { border-color: ${style.base16.base09} } #custom-gpg-status { border-color: ${base16.base09} }
#pulseaudio { border-color: ${style.base16.base0A} } #pulseaudio { border-color: ${base16.base0A} }
#temperature { border-color: ${style.base16.base0B} } #temperature { border-color: ${base16.base0B} }
#battery { border-color: ${style.base16.base0C} } #battery { border-color: ${base16.base0C} }
#backlight { border-color: ${style.base16.base0D} } #backlight { border-color: ${base16.base0D} }
#cpu { border-color: ${style.base16.base0E} } #cpu { border-color: ${base16.base0E} }
#memory { border-color: ${style.base16.base0F} } #memory { border-color: ${base16.base0F} }
#clock { border-color: ${style.base16.base06} } #clock { border-color: ${base16.base06} }
'' ''