This commit is contained in:
Daniel Flanagan 2023-10-05 09:45:18 -05:00
parent 48ad18ab16
commit bd542366f5
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
3 changed files with 183 additions and 203 deletions

View file

@ -26,28 +26,6 @@ in {
# nix-colors.homeManagerModules.default # nix-colors.homeManagerModules.default
]; ];
# copied here for easy lookups:
# https://github.com/tinted-theming/base16-schemes/blob/main/catppuccin-mocha.yaml
/*
base00: "1e1e2e" # base
base01: "181825" # mantle
base02: "313244" # surface0
base03: "45475a" # surface1
base04: "585b70" # surface2
base05: "cdd6f4" # text
base06: "f5e0dc" # rosewater
base07: "b4befe" # lavender
base08: "f38ba8" # red
base09: "fab387" # peach
base0A: "f9e2af" # yellow
base0B: "a6e3a1" # green
base0C: "94e2d5" # teal
base0D: "89b4fa" # blue
base0E: "cba6f7" # mauve
base0F: "f2cdcd" # flamingo
*/
home = { home = {
username = lib.mkDefault "daniel"; username = lib.mkDefault "daniel";
homeDirectory = lib.mkDefault "/home/daniel/.home"; homeDirectory = lib.mkDefault "/home/daniel/.home";
@ -543,7 +521,7 @@ in {
"ui.text.inactive" = {fg = fg2;}; "ui.text.inactive" = {fg = fg2;};
"ui.virtual" = fg2; "ui.virtual" = fg2;
"ui.virtual.ruler" = {bg = bg2;}; "ui.virtual.ruler" = {bg = bg3;};
"ui.virtual.indent-guide" = bg3; "ui.virtual.indent-guide" = bg3;
"ui.virtual.inlay-hint" = { "ui.virtual.inlay-hint" = {
fg = bg3; fg = bg3;
@ -641,9 +619,8 @@ in {
# "ui.cursorline.primary" = { bg = "default" } # "ui.cursorline.primary" = { bg = "default" }
# "ui.cursorline.secondary" = { bg = "default" } # "ui.cursorline.secondary" = { bg = "default" }
# "ui.cursorcolumn.primary" = { bg = "default" } "ui.cursorcolumn.primary" = {bg = bg3;};
# "ui.cursorcolumn.secondary" = { bg = "default" } "ui.cursorcolumn.secondary" = {bg = bg3;};
# "ui.virtual.ruler" = { bg = "default" }
"ui.bufferline.active" = { "ui.bufferline.active" = {
fg = primary; fg = primary;

View file

@ -151,3 +151,7 @@ bind -M insert \ca beginning-of-line
bind -M insert \cv edit_command_buffer bind -M insert \cv edit_command_buffer
bind -M default \cv edit_command_buffer bind -M default \cv edit_command_buffer
test $PWD = $HOME && begin
cd $NICE_HOME || cd
end

View file

@ -742,16 +742,6 @@
"sway/workspaces" = { "sway/workspaces" = {
"disable-scroll" = false; "disable-scroll" = false;
"persistent_workspaces" = { "persistent_workspaces" = {
"1" = [];
"2" = [];
"3" = [];
"4" = [];
"5" = [];
"6" = [];
"7" = [];
"8" = [];
"9" = [];
# "10" = [;
}; };
"all-outputs" = true; "all-outputs" = true;
"format" = "{name}"; "format" = "{name}";
@ -840,210 +830,219 @@
}; };
}; };
}; };
style = with colors.withHashPrefix; '' style = let
* { border-width = "0px";
border-radius: 0; in
font-family: "${font.name}", "Symbols Nerd Font Mono", sans-serif; with colors.withHashPrefix; ''
font-size: 16px; * {
} border-radius: 0;
font-family: "${font.name}", "Symbols Nerd Font Mono", sans-serif;
font-size: 16px;
}
window#waybar { window#waybar {
min-height: 32px; min-height: 32px;
background-color: ${bg}; background-color: ${bg};
color: ${text}; color: ${text};
border-top: solid ${blue} 1px; border-top: solid ${blue} ${border-width};
transition: none; transition: none;
} }
window#waybar.hidden { window#waybar.hidden {
/* opacity: 0.2; */ /* opacity: 0.2; */
} }
window#waybar.empty { window#waybar.empty {
/* opacity: 0.2; */ /* opacity: 0.2; */
} }
#workspaces button { #workspaces button {
padding: 0 0.75em; padding: 0 0.75em;
background-color: transparent; background-color: transparent;
border-top: solid ${primary} 1px; border-top: solid ${primary} ${border-width};
transition: none; transition: none;
} color: ${fgdim};
background-color: ${bg};
}
#workspaces button:hover { #workspaces button:hover {
/* background: rgba(0, 0, 0, 0.2);
* background: rgba(0, 0, 0, 0.2); }
* box-shadow: inherit;
*/
}
#workspaces button.visible { #workspaces button.active {
background-color: ${bg}; color: ${text};
} background-color: ${bg};
}
#workspaces button.focused { #workspaces button.visible {
color: ${bg}; color: ${fgdim};
background-color: ${blue}; background-color: ${bg};
} }
#workspaces button.persistent { /* A workspace that is persistent but has windows in it */
color: ${text}; #workspaces button.persistent {
} color: ${fgdim};
}
#workspaces button.urgent { #workspaces button.focused {
background-color: ${urgent}; color: ${bg};
color: ${bg}; background-color: ${primary};
border-top: solid ${urgent} 1px; }
}
#mode { #workspaces button.urgent {
background-color: transparent; background-color: ${urgent};
} color: ${bg};
border-top: solid ${urgent} ${border-width};
}
#clock, #mode {
#battery, background-color: transparent;
#cpu, }
#memory,
#temperature,
#backlight,
#network,
#pulseaudio,
#custom-media,
#tray,
#mode,
#idle_inhibitor,
#mpris,
#window,
#mpd {
margin-top: 1px;
padding: 0 0.75em;
background-color: inherit;
color: ${text};
}
#clock {} #clock,
#battery,
#cpu,
#memory,
#temperature,
#backlight,
#network,
#pulseaudio,
#custom-media,
#tray,
#mode,
#idle_inhibitor,
#mpris,
#window,
#mpd {
margin-top: 1px;
padding: 0 0.75em;
background-color: inherit;
color: ${text};
}
#battery { #clock {}
/* background-color: #ffffff; */
/* color: #000000; */
}
#battery.charging { #battery {
/* color: #ffffff; */ /* background-color: #ffffff; */
/* background-color: #26A65B; */ /* color: #000000; */
} }
@keyframes blink { #battery.charging {
to { /* color: #ffffff; */
background-color: #ffffff; /* background-color: #26A65B; */
color: #000000; }
}
}
#battery.critical:not(.charging) { @keyframes blink {
background-color: ${red}; to {
animation-name: blink; background-color: #ffffff;
animation-duration: 0.5s; color: #000000;
animation-timing-function: linear; }
animation-iteration-count: infinite; }
animation-direction: alternate;
}
#bluetooth, #battery.critical:not(.charging) {
#bluetooth.connected-battery, background-color: ${red};
#bluetooth.connected.battery, animation-name: blink;
#bluetooth.connected { animation-duration: 0.5s;
color: ${text}; animation-timing-function: linear;
} animation-iteration-count: infinite;
animation-direction: alternate;
}
label:focus { #bluetooth,
/* background-color: #000000; */ #bluetooth.connected-battery,
} #bluetooth.connected.battery,
#bluetooth.connected {
color: ${text};
}
#cpu { label:focus {
/* background-color: #2ecc71; */ /* background-color: #000000; */
/* color: #000000; */ }
}
#memory { #cpu {
/* background-color: #9b59b6; */ /* background-color: #2ecc71; */
} /* color: #000000; */
}
#backlight { #memory {
/* background-color: #90b1b1; */ /* background-color: #9b59b6; */
} }
#network { #backlight {
/* background-color: #2980b9; */ /* background-color: #90b1b1; */
} }
#network.disconnected { #network {
/* background-color: #f53c3c; */ /* background-color: #2980b9; */
} }
#pulseaudio { #network.disconnected {
color: ${red}; /* background-color: #f53c3c; */
/* background-color: #f1c40f; */ }
/* color: #000000; */
}
#pulseaudio.source-muted { #pulseaudio {
/* background-color: #90b1b1; */ color: ${red};
color: ${text}; /* background-color: #f1c40f; */
} /* color: #000000; */
}
#custom-media { #pulseaudio.source-muted {
/* background-color: #66cc99; */ /* background-color: #90b1b1; */
/* color: #2a5c45; */ color: ${text};
/* min-width: 100px; */ }
}
#custom-media.custom-spotify { #custom-media {
/* background-color: #66cc99; */ /* background-color: #66cc99; */
} /* color: #2a5c45; */
/* min-width: 100px; */
}
#custom-media.custom-vlc { #custom-media.custom-spotify {
/* background-color: #ffa000; */ /* background-color: #66cc99; */
} }
#temperature { #custom-media.custom-vlc {
/* background-color: #f0932b; */ /* background-color: #ffa000; */
} }
#temperature.critical { #temperature {
/* background-color: #eb4d4b; */ /* background-color: #f0932b; */
} }
#tray { #temperature.critical {
/* background-color: #2980b9; */ /* background-color: #eb4d4b; */
} }
#idle_inhibitor { #tray {
/* background-color: #2d3436; */ /* background-color: #2980b9; */
} }
#idle_inhibitor.activated { #idle_inhibitor {
/* background-color: #ecf0f1; */ /* background-color: #2d3436; */
/* color: #2d3436; */ }
}
#mpd { #idle_inhibitor.activated {
/* background-color: #66cc99; */ /* background-color: #ecf0f1; */
/* color: #2a5c45; */ /* color: #2d3436; */
} }
#mpd.disconnected { #mpd {
/* background-color: #f53c3c; */ /* background-color: #66cc99; */
} /* color: #2a5c45; */
}
#mpd.stopped { #mpd.disconnected {
/* background-color: #90b1b1; */ /* background-color: #f53c3c; */
} }
#mpd.paused { #mpd.stopped {
/* background-color: #51a37a; */ /* background-color: #90b1b1; */
} }
'';
#mpd.paused {
/* background-color: #51a37a; */
}
'';
systemd = { systemd = {
enable = true; enable = true;
}; };