updated terminal fonts

This commit is contained in:
specCon18 2023-08-31 00:14:52 -04:00
parent 84bde42545
commit 6034a5ea93
10 changed files with 379 additions and 410 deletions

View file

@ -22,12 +22,17 @@
font = {
normal = {
family = "SauceCodePro Nerd Font";
style = "Regular";
};
bold = {
family = "SauceCodePro Nerd Font";
style = "bold";
style = "Bold";
};
size = 12;
italic = {
family = "SauceCodePro Nerd Font";
style = "Italic";
};
size = 14;
};
colors = {
primary = {

View file

@ -9,7 +9,7 @@
nodePackages_latest.typescript-language-server
nodePackages_latest.svelte-language-server
nodePackages_latest.vls
python39Packages.python-lsp-server
python311Packages.python-lsp-server
rnix-lsp
rust-analyzer
taplo

View file

@ -4,12 +4,37 @@
# systemdIntegration = true;
enable = true;
extraConfig = ''
bind = SUPER, Return, exec, alacritty
bind = CONTROL_SHIFT, W, exec, firefox
bind = SUPER, R, exec, rofi -show drun
$mainMod = SUPER
bind = $mainMod, Return, exec, alacritty
bind = $mainMod, W, exec, firefox
bind = $mainMod, R, exec, rofi -show drun
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
exec-once=waybar
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once=mako
exec-once = swww init
monitor=,highres,auto,1
'';
};

View file

@ -3,219 +3,320 @@
programs.waybar = {
enable = true;
package = pkgs.waybar;
systemd = {
enable = true;
target = "hyprland-session.target"
};
settings = {
main_bar = {
layer = "top";
gtk-layer-shell = true;
position = "top";
height = 0;
modules-left = [
"cpu"
"memory"
"tray"
"river/mode"
"river/tags"
];
modules-center = [
"clock"
"custom/joljol"
];
modules-right = [
"backlight"
"custom/pw-volume"
"tray"
"network"
"pulseaudio"
"battery"
];
"custom/pipewire" = {
"exec" = "pw-volume status";
"return-type" = "json";
"interval" = "once";
"signal" = 8;
"format" = "{icon} {percentage}";
"format-icons" = {
"mute" = "";
"default" = [
""
""
""
river/tags = {
num-tags = 9;
};
river/mode = {
format = "Mode: {}";
};
clock = {
format = "{:%H:%M}";
format-alt = "{:%Y-%m-%d}";
};
battery = {
interval = 60;
states = {
hundred = 100;
ninty = 90;
eighty = 80;
seventy = 70;
sixty = 60;
fifty = 50;
fourty = 40;
thirty = 30;
twenty = 20;
ten = 10;
five = 5;
three = 3;
};
format = " {capacity} ";
format-charging = " {capacity} ";
format-discharging = " {capacity} ";
format-plugged = " {capacity} ";
format-full = " {capacity} ";
};
network = {
format-wifi = "";
format-ethernet = "";
format-linked = " (No IP)";
format-disconnected = "";
format-alt = "{bandwidthUpBytes} {bandwidthDownBits}";
interval = 2;
};
pulseaudio = {
states = {
hundred = 100;
ninty = 90;
eighty = 80;
seventy = 70;
sixty = 60;
fifty = 50;
fourty = 40;
thirty = 30;
twenty = 20;
ten = 10;
zero = 0;
};
format = "{icon}";
format-muted = "";
on-click = "pactl set-sink-mute alsa_output.pci-0000_00_1f.3.analog-stereo toggle";
scroll-steps = 10;
format-icons = {
headphone = "";
"hands-free" = "";
headset = "";
phone = "";
portable = "";
car = "";
default = [
""
""
""
];
};
};
"network" = {
"tooltip" = false;
"format-wifi" = " {essid}";
"format-ethernet" = "";
tray = {
show-passive-items = true;
icon-size = 20;
spacing = 10;
};
"backlight" = {
"tooltip" = false;
"format" = " {}%";
"interval" = 1;
"on-scroll-up" = "light -A 5";
"on-scroll-down" = "light -U 5";
};
"battery" = {
"states" = {
"good" = 95;
"warning" = 30;
"critical" = 20;
};
"format" = "{icon} {capacity}%";
"format-charging" = " {capacity}%";
"format-plugged" = " {capacity}%";
"format-alt" = "{time} {icon}";
"format-icons" = [
""
""
""
""
""
];
};
"tray" = {
"icon-size" = 18;
"spacing" = 10;
};
"clock" = {
"format" = "{: %I:%M %p %d/%m/%Y}";
};
"cpu" = {
"interval" = 15;
"format" = " {}%";
"max-length" = 10;
};
"memory" = {
"interval" = 30;
"format" = " {}%";
"max-length" = 10;
};
};
custom/joljol = {
exec = "joljol";
format = "{}";
update-interval = 100;
};
};
style = ''
* {
border: none;
border-radius: 10;
font-family: "JetbrainsMono Nerd Font" ;
font-size: 15px;
min-height: 10px;
}
window#waybar {
background: transparent;
}
window#waybar.hidden {
opacity: 0.2;
}
#window {
margin-top: 6px;
padding-left: 10px;
padding-right: 10px;
border-radius: 10px;
transition: none;
color: transparent;
background: transparent;
}
#network {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #161320;
background: #bd93f9;
}
#battery {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #161320;
background: #B5E8E0;
}
#battery.charging, #battery.plugged {
color: #161320;
background-color: #B5E8E0;
}
#battery.critical:not(.charging) {
background-color: #B5E8E0;
color: #161320;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
@keyframes blink {
to {
background-color: #BF616A;
color: #B5E8E0;
}
}
#backlight {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #161320;
background: #F8BD96;
}
#clock {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: #161320;
background: #ABE9B3;
/*background: #1A1826;*/
}
#memory {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
margin-bottom: 0px;
padding-right: 10px;
border-radius: 10px;
transition: none;
color: #161320;
background: #DDB6F2;
border: none;
/* font-family: "Recursive Sans Casual Static", "JetBrainsMono Nerd Font"; */
font-family: "Gintronic","Recursive Sans Casual Static", "JetBrainsMono Nerd Font";
font-size: 12px;
min-height: 20px;
border-radius: 0px;
}
#cpu {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
margin-bottom: 0px;
padding-right: 10px;
border-radius: 10px;
transition: none;
color: #161320;
background: #96CDFB;
window#waybar {
background: transparent;
border-radius: 0px;
}
tooltip {
background: #ebbcba;
}
tooltip label {
color: #191724;
}
#tags {
background-color: transparent;
border-radius: 0px;
padding: 5px 5px 0px 5px;
}
#tags button {
padding: 0px 5px;
margin-right: 5px;
margin-left: 5px;
color: transparent;
/* border: 0px solid transparent; */
/* border-top: 3px solid #f6c177; */
/* border-left: 3px solid #f6c177; */
/* border-bottom: 2px solid #f6c177; */
background: #1f1d2e;
}
#tags button.occupied {
border-radius: 0px;
font-weight: 900;
color: #191724;
background: #31748f;
}
#tags button.focused {
font-weight: 900;
color: #191724;
background: #ebbcba;
}
#tags button.urgent {
color: #e0def4;
background-color: #eb6f92;
border-radius: 0px;
}
#custom-date,
#clock,
#battery,
#pulseaudio,
#network,
#custom-joljol {
color: #e0def4;
background: #1f1d2e;
padding: 2.5px 15px;
margin: 10px 10px 0px 0px;
font-weight: 900;
}
#clock {
color: #ebbcba;
}
#custom-joljol {
color: #ebbcba;
margin: 10px 10px 0px 10px;
}
#battery {
background: #31748f;
color: #191724;
}
/* #battery.charging { */
/* color: #9ccfd8; */
/* } */
#battery.ninty.charging {
background: linear-gradient(to right, #31748f 90%, #9ccfd8 90%);
}
#battery.ninty:not(.charging) {
background: linear-gradient(to right, #31748f 90%, #ebbcba 90%);
}
#battery.eighty.charging {
background: linear-gradient(to right, #31748f 80%, #9ccfd8 80%);
}
#battery.eighty:not(.charging) {
background: linear-gradient(to right, #31748f 80%, #ebbcba 80%);
}
#battery.seventy.charging {
background: linear-gradient(to right, #31748f 70%, #9ccfd8 70%);
}
#battery.seventy:not(.charging) {
background: linear-gradient(to right, #31748f 70%, #ebbcba 70%);
}
#battery.sixty.charging {
background: linear-gradient(to right, #31748f 60%, #9ccfd8 60%);
}
#battery.sixty:not(.charging) {
background: linear-gradient(to right, #31748f 60%, #ebbcba 60%);
}
#battery.fifty.charging {
background: linear-gradient(to right, #31748f 50%, #9ccfd8 50%);
}
#battery.fifty:not(.charging) {
background: linear-gradient(to right, #31748f 50%, #ebbcba 50%);
}
#battery.fourty.charging {
background: linear-gradient(to right, #31748f 40%, #9ccfd8 40%);
}
#battery.fourty:not(.charging) {
background: linear-gradient(to right, #31748f 40%, #ebbcba 40%);
}
#battery.thirty.charging {
background: linear-gradient(to right, #31748f 30%, #9ccfd8 30%);
}
#battery.thirty:not(.charging) {
background: linear-gradient(to right, #31748f 30%, #ebbcba 30%);
}
#battery.twenty.charging {
background: linear-gradient(to right, #31748f 20%, #9ccfd8 20%);
}
#battery.twenty:not(.charging) {
background: linear-gradient(to right, #31748f 20%, #eb6f92 20%);
}
#battery.ten.charging {
background: linear-gradient(to right, #31748f 10%, #9ccfd8 10%);
}
#battery.ten:not(.charging) {
background: linear-gradient(to right, #31748f 10%, #eb6f92 10%);
}
#battery.five.charging {
background: linear-gradient(to right, #31748f 5%, #9ccfd8 5%);
}
#battery.five:not(.charging) {
background: linear-gradient(to right, #31748f 5%, #eb6f92 5%);
}
#battery.three.charging {
background: linear-gradient(to right, #31748f 3%, #9ccfd8 3%);
}
#battery.three:not(.charging) {
background: linear-gradient(to right, #31748f 3%, #eb6f92 3%);
}
#network {
color: #31748f;
}
#pulseaudio {
background: #c4a7e7;
color: #191724;
}
#pulseaudio.ninty {
background: linear-gradient(to top, #c4a7e7 90%, #908caa 90%);
}
#pulseaudio.eighty {
background: linear-gradient(to top, #c4a7e7 80%, #908caa 80%);
}
#pulseaudio.seventy {
background: linear-gradient(to top, #c4a7e7 70%, #908caa 70%);
}
#pulseaudio.sixty {
background: linear-gradient(to top, #c4a7e7 60%, #908caa 60%);
}
#pulseaudio.fifty {
background: linear-gradient(to top, #c4a7e7 50%, #908caa 50%);
}
#pulseaudio.fourty {
background: linear-gradient(to top, #c4a7e7 40%, #908caa 40%);
}
#pulseaudio.thirty {
background: linear-gradient(to top, #c4a7e7 30%, #908caa 30%);
}
#pulseaudio.twenty {
background: linear-gradient(to top, #c4a7e7 20%, #908caa 20%);
}
#pulseaudio.ten {
background: linear-gradient(to top, #c4a7e7 10%, #908caa 10%);
}
#pulseaudio.zero {
background: linear-gradient(to top, #c4a7e7 0%, #908caa 00%);
}
#pulseaudio.muted {
font-weight: 900;
background: #eb6f92;
}
#tray {
margin-top: 6px;
margin-left: 8px;
padding-left: 10px;
margin-bottom: 0px;
padding-right: 10px;
border-radius: 10px;
transition: none;
color: #B5E8E0;
background: #161320;
/* background: #505050; */
/* padding: 5px 10px; */
margin: 10px 10px 0px 10px;
color: #e0def4;
}
#tray menu {
color: #e0def4;
}
'';
};

View file

@ -25,10 +25,29 @@ in {
libnotify
mako
hyprland
font-awesome
];
sessionVariables = {
#Enable Wayland
WLR_NO_HARDWARE_CURSORS = "1";
NIXOS_OZONE_WL = "1";
MOZ_ENABLE_WAYLAND = "1";
GTK_USE_PORTAL = "1";
NIXOS_XDG_OPEN_USE_PORTAL = "1";
SDL_VIDEODRIVER = "wayland";
# XDG_Config
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";
XDG_CACHE_HOME = "\${HOME}/.cache";
XDG_CONFIG_HOME = "\${HOME}/.config";
XDG_BIN_HOME = "\${HOME}/.local/bin";
XDG_DATA_HOME = "\${HOME}/.local/share";
#Default Applications
BROWSER = "firefox";
TERMINAL = "alacritty";
};
};
xdg.portal = {