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

Work in progress refactor.

Browse source
This commit is contained in:
kat witch 2021-03-03 03:00:51 +00:00
parent ad1faf2f24
commit 9ece41ee80
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
14 changed files with 130 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

25
config/users/kat/kitty.nix
View file

@ -1,28 +1,27 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, witch, ... }:
let style = import ./style.nix;
in {
{
config = lib.mkIf (lib.elem "desktop" config.meta.deploy.profiles) {
home-manager.users.kat = {
programs.kitty = {
enable = true;
font.name = style.font.name;
font.name = witch.style.font.name;
settings = {
font_size = style.font.size;
background = style.base16.color0;
font_size = witch.style.font.size;
background = witch.style.base16.color0;
background_opacity = "0.7";
foreground = style.base16.color7;
selection_background = style.base16.color7;
selection_foreground = style.base16.color0;
url_color = style.base16.color3;
cursor = style.base16.color7;
foreground = witch.style.base16.color7;
selection_background = witch.style.base16.color7;
selection_foreground = witch.style.base16.color0;
url_color = witch.style.base16.color3;
cursor = witch.style.base16.color7;
active_border_color = "#75715e";
active_tab_background = "#9900ff";
active_tab_foreground = style.base16.color7;
active_tab_foreground = witch.style.base16.color7;
inactive_tab_background = "#3a3a3a";
inactive_tab_foreground = "#665577";
} // style.base16;
} // witch.style.base16;
};
};
};

34
config/users/kat/style.nix
View file

@ -1,34 +0,0 @@
rec {
base16 = {
color0 = "#2e3440";
color1 = "#bf616a";
color2 = "#a3be8c";
color3 = "#ebcb8b";
color4 = "#81a1c1";
color5 = "#b48ead";
color6 = "#88c0d0";
color7 = "#e5e9f0";
color8 = "#4c566a";
color9 = "#d08770";
color10 = "#3b4252";
color11 = "#434c5e";
color12 = "#d8dee9";
color13 = "#eceff4";
color14 = "#5e81ac";
color15 = "#8fbcbb";
color16 = "#fd971f";
color17 = "#cc6633";
color18 = "#383830";
color19 = "#49483e";
color20 = "#a59f85";
color21 = "#f5f4f1";
};
font = {
name = "Hack Nerd Font";
size = "9";
size_css = "12px";
};
}

53
config/users/kat/sway.nix
View file

@ -1,7 +1,6 @@
{ config, pkgs, lib, ... }:
{ config, pkgs, lib, witch, ... }:
let
style = import ./style.nix;
secrets = import ../../../secrets.nix;
in {
config = lib.mkIf (lib.elem "sway" config.meta.deploy.profiles) {
@ -26,16 +25,16 @@ in {
programs.mako = {
enable = true;
defaultTimeout = 3000;
borderColor = style.base16.color7;
backgroundColor = "${style.base16.color0}70";
textColor = style.base16.color7;
borderColor = witch.style.base16.color7;
backgroundColor = "${witch.style.base16.color0}70";
textColor = witch.style.base16.color7;
};
wayland.windowManager.sway = {
enable = true;
config = let
dmenu =
"${pkgs.bemenu}/bin/bemenu --fn '${style.font.name} ${style.font.size}' --nb '${style.base16.color0}' --nf '${style.base16.color7}' --sb '${style.base16.color1}' --sf '${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.color0}' --nf '${witch.style.base16.color7}' --sb '${witch.style.base16.color1}' --sf '${witch.style.base16.color7}' -l 5 -m -1 -i";
lockCommand = "swaylock -i ${./wallpapers/main.png} -s fill";
cfg = config.home-manager.users.kat.wayland.windowManager.sway.config;
in {
@ -84,7 +83,7 @@ in {
};
};
fonts = [ "${style.font.name} ${style.font.size}" ];
fonts = [ "${witch.style.font.name} ${witch.style.font.size}" ];
terminal = "${pkgs.kitty}/bin/kitty";
# TODO: replace with wofi
menu =
@ -192,32 +191,32 @@ in {
colors = {
focused = {
border = style.base16.color8;
background = style.base16.color4;
text = style.base16.color0;
indicator = style.base16.color2;
childBorder = style.base16.color8;
border = witch.style.base16.color8;
background = witch.style.base16.color4;
text = witch.style.base16.color0;
indicator = witch.style.base16.color2;
childBorder = witch.style.base16.color8;
};
focusedInactive = {
border = style.base16.color0;
background = style.base16.color11;
text = style.base16.color12;
indicator = style.base16.color2;
childBorder = style.base16.color8;
border = witch.style.base16.color0;
background = witch.style.base16.color11;
text = witch.style.base16.color12;
indicator = witch.style.base16.color2;
childBorder = witch.style.base16.color8;
};
unfocused = {
border = style.base16.color0;
background = style.base16.color8;
text = style.base16.color12;
indicator = style.base16.color8;
childBorder = style.base16.color8;
border = witch.style.base16.color0;
background = witch.style.base16.color8;
text = witch.style.base16.color12;
indicator = witch.style.base16.color8;
childBorder = witch.style.base16.color8;
};
urgent = {
border = style.base16.color8;
background = style.base16.color9;
text = style.base16.color0;
indicator = style.base16.color1;
childBorder = style.base16.color8;
border = witch.style.base16.color8;
background = witch.style.base16.color9;
text = witch.style.base16.color0;
indicator = witch.style.base16.color1;
childBorder = witch.style.base16.color8;
};
};
};

7
config/users/kat/waybar/default.nix
View file

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, witch, ... }:
let
style = import ../style.nix;
secrets = import ../../../../secrets.nix;
in {
config = lib.mkIf (lib.elem "sway" config.meta.deploy.profiles) {
@ -9,8 +8,8 @@ in {
programs.waybar = {
enable = true;
style = import ./waybar.css.nix {
inherit style;
hextorgba = pkgs.colorhelpers.hextorgba;
style = witch.style;
hextorgba = witch.colorhelpers.hextorgba;
};
settings = [{
modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];