mass tidy up

This commit is contained in:
serenity-F 2024-11-13 00:27:15 +10:00
parent 3da69ccd7e
commit 4da4b76a62
No known key found for this signature in database
19 changed files with 13 additions and 638 deletions

19
TODO.md
View file

@ -12,16 +12,23 @@ Primary short term to do list:
- [ ] /home tidy up
- [ ] programs
- [ ] services
- [ ] credit wallpapers
- [ ] dedup hypr/sway files
- [ ] scripts
- [ ] figure them all out
- [ ] delete the unneeded stuff
- [ ] themes & resources
- [ ] figure out themes imports
- [ ] credit wallpapers
- [ ] home/desktop
- [X] dedup hypr/sway files
- [X] get sway workable
- [ ] fully switch over
- [ ] fix low-latency audio crackles over speakers
- crackling @ 96/48kHz [2ms]
- testing out 144/48khZ [3ms]
- [X] fix low-latency audio crackles over speakers
- crackling @ 96/48kHz [2ms]
- testing @ 144/48kHz [3ms]
- [X] works @ 144/48kHz [3ms]
- [ ] reformat persephones host configs
- [X] reformat persephones host configs
- [ ] fix wifi on hades
- [ ] get a wireless card [hw upgrade]

View file

@ -1,81 +0,0 @@
{ config, lib, pkgs, ... }: {
services.dunst = {
enable = true;
iconTheme = {
name = "Adwaita-Dark";
package = pkgs.gnome.adwaita-icon-theme;
};
settings = {
global = {
rounded = "yes";
origin = "top-center";
monitor = "0";
alignment = "center";
vertical_alignment = "center";
width = "400";
height = "400";
scale = 0;
gap_size = 0;
progress_bar = true;
transparency = 0;
text_icon_padding = 0;
separator_color = "frame";
sort = "yes";
idle_threshold = 120;
line_height = 0;
markup = "full";
show_age_threshold = 60;
ellipsize = "middle";
ignore_newline = "no";
stack_duplicates = true;
sticky_history = "yes";
history_length = 20;
always_run_script = true;
corner_radius = config.theme.rounding;
follow = "mouse";
font = config.theme.font;
format = "<b>%s</b>\\n%b";
progress_bar_corner_radius = config.theme.rounding - 10;
#format = ''
# <span foreground='#${config.theme.colors.primary-bg}'><b>%s %p</b></span>
# %b'';
frame_color = "#" + config.theme.colors.bg;
highlight = "#" + config.theme.colors.primary-bg;
foreground = "#" + config.theme.colors.fg;
frame_width = 1;
offset = "0x10";
horizontal_padding = 10;
icon_position = "left";
indicate_hidden = "yes";
min_icon_size = 0;
max_icon_size = 64;
mouse_left_click = "do_action, close_current";
mouse_middle_click = "close_current";
mouse_right_click = "close_all";
padding = 10;
plain_text = "no";
separator_height = 2;
show_indicators = "yes";
shrink = "no";
word_wrap = "yes";
browser = "${pkgs.firefox}/bin/firefox";
};
fullscreen_delay_everything = { fullscreen = "delay"; };
urgency_critical = {
background = "#" + config.theme.colors.color1;
foreground = "#" + config.theme.colors.color0;
};
urgency_low = {
background = "#" + config.theme.colors.alt-bg;
foreground = "#" + config.theme.colors.alt-fg;
};
urgency_normal = {
background = "#" + config.theme.colors.alt-bg;
foreground = "#" + config.theme.colors.alt-fg;
};
};
};
}

View file

@ -1,8 +0,0 @@
{ config, pkgs, ... }: {
# home.file.".local/share/icons/rose-pine-hyprcursor" = {
# recursive = true;
# source = ./rose-pine;
# };
}

View file

@ -1,73 +0,0 @@
{ pkgs, config, ... }: {
xdg.configFile."hypr/hyprlock.conf".text = ''
background {
monitor =
path = $HOME/.config/wallpapers/${config.theme.wallpaper}
color = rgb(${config.theme.colors.bg})
blur_size = 4
blur_passes = 3
noise = 0.0117
contrast = 1.3000
brightness = 0.8000
vibrancy = 0.2100
vibrancy_darkness = 0.0
}
input-field {
monitor =
size = 250, 50
outline_thickness = 3
dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
dots_spacing = 0.64 # Scale of dots' absolute size, 0.0 - 1.0
dots_center = true
outer_color = rgb(${config.theme.colors.primary-bg})
inner_color = rgb(${config.theme.colors.bg})
font_color = rgb(${config.theme.colors.fg})
fade_on_empty = true
placeholder_text = <i>Password...</i> # Text rendered in the input box when it's empty.
hide_input = false
position = 0, 50
halign = center
valign = bottom
}
# Current time
label {
monitor =
text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>"
color = rgb(${config.theme.colors.fg})
font_size = 64
font_family = ${config.theme.font}
position = 0, 16
halign = center
valign = center
}
# User label
label {
monitor =
text = Hey <span text_transform="capitalize" size="larger">$USER</span>
color = rgb(${config.theme.colors.fg})
font_size = 20
font_family = ${config.theme.font}
position = 0, 0
halign = center
valign = center
}
# Type to unlock
label {
monitor =
text = Enter passowrd:
color = rgb(${config.theme.colors.fg})
font_size = 16
font_family = ${config.theme.font}
position = 0, 30
halign = center
valign = bottom
}
'';
}

View file

@ -1,257 +0,0 @@
{ pkgs, config, lib, waybar, ... }: {
services = {
blueman-applet.enable = false;
network-manager-applet.enable = true;
};
programs.waybar = {
enable = true;
# package = waybar.packages."${pkgs.system}".waybar;
systemd.enable = true;
settings = {
mainBar = {
layer = "top";
position = "top";
spacing = 0;
"margin-top" = config.theme.gaps-out;
"margin-left" = config.theme.gaps-out;
"margin-right" = config.theme.gaps-out;
height = 44;
modules-left = [ "custom/logo" "hyprland/window" ];
modules-center = [ "hyprland/workspaces" ];
modules-right =
[ "tray" "backlight" "pulseaudio" "battery" "clock" "custom/power" ];
"wlr/taskbar" = {
format = "{icon}";
"on-click" = "activate";
"on-click-right" = "fullscreen";
"icon-size" = 25;
"tooltip-format" = "{title}";
};
"hyprland/window" = {
"format" = "{title:30}";
"max-length" = 32;
};
"hyprland/workspaces" = {
"on-click" = "activate";
format = "{icon}";
"format-icons" = {
"default" = "";
"1" = "1";
"2" = "2";
"3" = "3";
"4" = "4";
"5" = "5";
"6" = "6";
"7" = "7";
"8" = "8";
"9" = "9";
"active" = "󱓻";
"urgent" = "󱓻";
};
"persistent-workspaces" = {
"1" = [ ];
"2" = [ ];
"3" = [ ];
};
};
tray = { spacing = 16; };
clock = {
"tooltip-format" = "<tt>{calendar}</tt>";
"format-alt" = " {:%a, %d %b %Y}";
format = "󰥔 {:%I:%M %p}";
};
pulseaudio = {
format = "{icon}";
"format-bluetooth" = "󰂰";
nospacing = 1;
"tooltip-format" = "Volume : {volume}%";
"format-muted" = "󰝟";
"format-icons" = {
"headphone" = "";
"default" = [ "󰖀" "󰕾" "" ];
};
"on-click" = "pamixer -t";
"scroll-step" = 1;
};
"custom/logo" = {
format = " ";
tooltip = false;
on-click = "menu";
};
battery = {
format = "{capacity}% {icon}";
"format-icons" = {
"charging" = [ "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅" ];
"default" = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
};
"format-full" = "󰁹 ";
interval = 10;
states = {
warning = 20;
critical = 10;
};
tooltip = false;
};
"custom/power" = {
format = "󰤆";
tooltip = false;
on-click = "powermenu";
};
backlight = {
device = "nvidia_0";
format = "{icon}";
"format-icons" = [ " " " " "" "" "" "" "" "" "" ];
};
};
};
style = ''
* {
border: none;
border-radius: 0;
min-height: 0;
font-family: "${config.theme.font}";
color: #${config.theme.colors.fg};
font-weight: 700;
}
window#waybar {
background-color: ${
if config.theme.waybar-transparent then
"rgba(0, 0, 0, 0)"
else
"#${config.theme.colors.bg}"
};
transition-property: background-color;
transition-duration: 0.5s;
border-radius: ${toString config.theme.rounding}px;
font-size: 13px;
}
.modules-left, .modules-center, .modules-right {
border-radius: ${toString config.theme.rounding}px;
background-color: #${config.theme.colors.bg};
padding: 2px 6px;
}
window#waybar.hidden {
opacity: 0.5;
}
#workspaces {
background-color: transparent;
}
#workspaces button {
all: initial; /* Remove GTK theme values (waybar #1351) */
min-width: 0; /* Fix weird spacing in materia (waybar #450) */
box-shadow: inset 0 -3px transparent; /* Use box-shadow instead of border so the text isn't offset */
padding: 6px 18px;
margin: 6px 3px;
border-radius: 4px;
background-color: #${config.theme.colors.alt-bg};
color: #${config.theme.colors.alt-fg};
}
#workspaces button.active {
color: #${config.theme.colors.primary-fg};
background-color: #${config.theme.colors.primary-bg};
}
#workspaces button:hover {
box-shadow: inherit;
text-shadow: inherit;
opacity: 0.8;
}
#workspaces button.urgent {
background-color: #${config.theme.colors.color1};
}
#window > * {
font-family: "${config.theme.font-mono}";
}
#memory,
#custom-power,
#battery,
#backlight,
#pulseaudio,
#network,
#clock,
#tray,
#backlight{
border-radius: 9px;
margin: 6px 3px;
padding: 6px 12px;
background-color: #${config.theme.colors.alt-bg};
color: #${config.theme.colors.alt-fg};
}
#tray menu {
background-color: #${config.theme.colors.alt-bg};
color: #${config.theme.colors.alt-fg};
}
#custom-logo {
padding-right: 7px;
font-size: 15px;
color: #${config.theme.colors.primary-bg};
}
@keyframes blink {
to {
background-color: #f38ba8;
color: #181825;
}
}
#battery.warning,
#battery.critical,
#battery.urgent {
background-color: #ff0048;
color: #181825;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
#battery.charging {
background-color: #${config.theme.colors.alt-bg};
color: #${config.theme.colors.alt-fg};
animation: none;
}
#custom-power {
background-color: #${config.theme.colors.primary-bg};
color: #${config.theme.colors.primary-fg};
}
tooltip {
border-radius: 8px;
padding: 15px;
background-color: #${config.theme.colors.alt-bg};
color: #${config.theme.colors.alt-fg};
}
tooltip label {
padding: 5px;
background-color: #${config.theme.colors.alt-bg};
color: #${config.theme.colors.alt-fg};
}
'';
};
}

View file

@ -1,117 +0,0 @@
{ config, pkgs, ... }: {
programs.wlogout = {
enable = true;
layout = [
{
label = "lock";
action = "${pkgs.hyprlock}/bin/hyprlock";
text = "Lock";
keybind = "l";
}
{
label = "hibernate";
action = "systemctl hibernate";
text = "Hibernate";
keybind = "h";
}
{
label = "logout";
action = "killall -9 Hyprland sleep 2";
text = "Exit";
keybind = "e";
}
{
label = "shutdown";
action = "systemctl poweroff";
text = "Shutdown";
keybind = "s";
}
{
label = "suspend";
action = "systemctl suspend";
text = "Suspend";
keybind = "u";
}
{
label = "reboot";
action = "systemctl reboot";
text = "Reboot";
keybind = "r";
}
];
style = ''
* {
font-family: "${config.theme.font}";
background-image: none;
transition: 20ms;
}
window {
background-color: rgba(12,12,12,0.5);
}
button {
color: #${config.theme.colors.fg};
font-size:20px;
background-repeat: no-repeat;
background-position: center;
background-size: 25%;
border-style: solid;
background-color: #${config.theme.colors.bg};
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
}
button:focus,
button:active {
color: #${config.theme.colors.primary-fg};
background-color: #${config.theme.colors.primary-bg};
border: 3px solid #${config.theme.colors.primary-bg};
}
/*
-----------------------------------------------------
Buttons
-----------------------------------------------------
*/
#lock,#logout,#suspend,#hibernate,#shutdown,#reboot {
margin: 10px;
border-radius: ${toString config.theme.rounding}px;
}
#lock {
background-image: image(url("../common/themes/resources/icons/lock.png"));
}
#logout {
background-image: image(url("../common/themes/resources/icons/logout.png"));
}
#suspend {
background-image: image(url("../common/themes/resources/icons/suspend.png"));
}
#hibernate {
background-image: image(url("../common/themes/resources/icons/hibernate.png"));
}
#shutdown {
background-image: image(url("../common/themes/resources/icons/shutdown.png"));
}
#reboot {
background-image: image(url("../common/themes/resources/icons/reboot.png"));
}
'';
};
xdg.configFile."icons" = {
recursive = true;
source = ../common/themes/resources/icons;
};
}

View file

@ -1,96 +0,0 @@
{ config, ... }: {
programs.wofi = {
enable = true;
settings = {
allow_markup = true;
width = 500;
show = "drun";
prompt = "Apps";
normal_window = true;
layer = "top";
term = "foot";
height = "305px";
orientation = "vertical";
halign = "fill";
line_wrap = "off";
dynamic_lines = false;
allow_images = true;
image_size = 24;
exec_search = false;
hide_search = false;
parse_search = false;
insensitive = true;
hide_scroll = true;
no_actions = true;
sort_order = "default";
gtk_dark = true;
filter_rate = 100;
key_expand = "Tab";
key_exit = "Escape";
};
style = ''
/** ********** Fonts ********** **/
* {
font-family: "${config.theme.font}";
font-weight: 500;
font-size: 12px;
}
#window {
background-color: #${config.theme.colors.alt-bg};
color: #${config.theme.colors.alt-fg};
border-radius: ${toString config.theme.rounding}px;
}
#outer-box {
padding: 20px;
}
#input {
background-color: #${config.theme.colors.bg};
border: 0px solid #${config.theme.colors.primary-bg};
padding: 8px 12px;
}
#scroll {
margin-top: 20px;
}
#inner-box {}
#img {
padding-right: 8px;
}
#text {
color: #${config.theme.colors.color7};
}
#text:selected {
color: #${config.theme.colors.fg};
}
#entry {
padding: 6px;
}
#entry:selected {
background-color: #${config.theme.colors.primary-bg};
color: #${config.theme.colors.primary-fg};
}
#unselected {}
#selected {}
#input,
#entry:selected {
border-radius: ${toString (config.theme.rounding - 10)}px;
}
'';
};
}