so much organization

This commit is contained in:
mjallen18
2025-06-29 14:50:34 -05:00
parent ca155505be
commit 532c97cf00
58 changed files with 354 additions and 992 deletions

View File

@@ -1,6 +1,6 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
in
{
programs.btop = {
@@ -73,48 +73,48 @@ in
};
themes = {
nord = ''
theme[main_bg]="${theme.nord.polarNight.nord0}"
theme[main_fg]="${theme.nord.snowStorm.nord6}"
theme[title]="${theme.nord.snowStorm.nord6}"
theme[hi_fg]="${theme.nord.frost.nord7}"
theme[selected_bg]="${theme.nord.polarNight.nord1}"
theme[selected_fg]="${theme.nord.frost.nord7}"
theme[inactive_fg]="${theme.nord.polarNight.nord2}"
theme[graph_text]="${theme.nord.snowStorm.nord6}"
theme[meter_bg]="${theme.nord.polarNight.nord1}"
theme[proc_misc]="${theme.nord.snowStorm.nord6}"
theme[cpu_box]="${theme.nord.aurora.nord15}"
theme[mem_box]="${theme.nord.aurora.nord14}"
theme[net_box]="${theme.nord.aurora.nord12}"
theme[proc_box]="${theme.nord.aurora.nord11}"
theme[div_line]="${theme.nord.polarNight.nord1}"
theme[temp_start]="${theme.nord.aurora.nord14}"
theme[temp_mid]="${theme.nord.aurora.nord13}"
theme[temp_end]="${theme.nord.aurora.nord11}"
theme[cpu_start]="${theme.nord.aurora.nord15}"
theme[cpu_mid]="${theme.nord.aurora.nord12}"
theme[cpu_end]="${theme.nord.aurora.nord11}"
theme[free_start]="${theme.nord.aurora.nord14}"
theme[free_mid]="${theme.nord.aurora.nord13}"
theme[free_end]="${theme.nord.aurora.nord12}"
theme[cached_start]="${theme.nord.aurora.nord14}"
theme[cached_mid]="${theme.nord.aurora.nord13}"
theme[cached_end]="${theme.nord.aurora.nord12}"
theme[available_start]="${theme.nord.snowStorm.nord6}"
theme[available_mid]="${theme.nord.aurora.nord11}"
theme[available_end]="${theme.nord.aurora.nord11}"
theme[used_start]="${theme.nord.aurora.nord14}"
theme[used_mid]="${theme.nord.aurora.nord13}"
theme[used_end]="${theme.nord.aurora.nord11}"
theme[download_start]="${theme.nord.frost.nord8}"
theme[download_mid]="${theme.nord.frost.nord8}"
theme[download_end]="${theme.nord.aurora.nord12}"
theme[upload_start]="${theme.nord.frost.nord7}"
theme[upload_mid]="${theme.nord.frost.nord7}"
theme[upload_end]="${theme.nord.aurora.nord12}"
theme[process_start]="${theme.nord.aurora.nord15}"
theme[process_mid]="${theme.nord.aurora.nord12}"
theme[process_end]="${theme.nord.aurora.nord11}"
theme[main_bg]="${settings.nord.polarNight.nord0}"
theme[main_fg]="${settings.nord.snowStorm.nord6}"
theme[title]="${settings.nord.snowStorm.nord6}"
theme[hi_fg]="${settings.nord.frost.nord7}"
theme[selected_bg]="${settings.nord.polarNight.nord1}"
theme[selected_fg]="${settings.nord.frost.nord7}"
theme[inactive_fg]="${settings.nord.polarNight.nord2}"
theme[graph_text]="${settings.nord.snowStorm.nord6}"
theme[meter_bg]="${settings.nord.polarNight.nord1}"
theme[proc_misc]="${settings.nord.snowStorm.nord6}"
theme[cpu_box]="${settings.nord.aurora.nord15}"
theme[mem_box]="${settings.nord.aurora.nord14}"
theme[net_box]="${settings.nord.aurora.nord12}"
theme[proc_box]="${settings.nord.aurora.nord11}"
theme[div_line]="${settings.nord.polarNight.nord1}"
theme[temp_start]="${settings.nord.aurora.nord14}"
theme[temp_mid]="${settings.nord.aurora.nord13}"
theme[temp_end]="${settings.nord.aurora.nord11}"
theme[cpu_start]="${settings.nord.aurora.nord15}"
theme[cpu_mid]="${settings.nord.aurora.nord12}"
theme[cpu_end]="${settings.nord.aurora.nord11}"
theme[free_start]="${settings.nord.aurora.nord14}"
theme[free_mid]="${settings.nord.aurora.nord13}"
theme[free_end]="${settings.nord.aurora.nord12}"
theme[cached_start]="${settings.nord.aurora.nord14}"
theme[cached_mid]="${settings.nord.aurora.nord13}"
theme[cached_end]="${settings.nord.aurora.nord12}"
theme[available_start]="${settings.nord.snowStorm.nord6}"
theme[available_mid]="${settings.nord.aurora.nord11}"
theme[available_end]="${settings.nord.aurora.nord11}"
theme[used_start]="${settings.nord.aurora.nord14}"
theme[used_mid]="${settings.nord.aurora.nord13}"
theme[used_end]="${settings.nord.aurora.nord11}"
theme[download_start]="${settings.nord.frost.nord8}"
theme[download_mid]="${settings.nord.frost.nord8}"
theme[download_end]="${settings.nord.aurora.nord12}"
theme[upload_start]="${settings.nord.frost.nord7}"
theme[upload_mid]="${settings.nord.frost.nord7}"
theme[upload_end]="${settings.nord.aurora.nord12}"
theme[process_start]="${settings.nord.aurora.nord15}"
theme[process_mid]="${settings.nord.aurora.nord12}"
theme[process_end]="${settings.nord.aurora.nord11}"
'';
};
};

View File

@@ -1,7 +1,7 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${theme.iconTheme}";
settings = import ../../settings.nix { inherit pkgs; };
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${settings.iconTheme}";
in
{
wayland.windowManager.hyprland = {
@@ -33,7 +33,7 @@ in
# https://wiki.hyprland.org/Configuring/Binds/#mouse-buttons
bind = [
"$mod, Return, exec, ${theme.defaultApps.terminal.pname}"
"$mod, Return, exec, ${settings.defaultApps.terminal.pname}"
"$mod, SPACE, exec, wofi --show drun"
"$mod, Q, killactive, "
"$mod, M, exec, wlogout --protocol layer-shell"
@@ -47,8 +47,8 @@ in
"$mod,F,exec,hyprctl dispatch fullscreen active"
"$mod SHIFT, E, exec, smile"
"$mod, mouse:276, movecurrentworkspacetomonitor, ${theme.displayLeft.input}"
"$mod, mouse:275, movecurrentworkspacetomonitor, ${theme.displayRight.input}"
"$mod, mouse:276, movecurrentworkspacetomonitor, ${settings.displayLeft.input}"
"$mod, mouse:275, movecurrentworkspacetomonitor, ${settings.displayRight.input}"
# alt-tab between workspaces on active monitor
"$mod, Tab, workspace, m+1"
@@ -91,7 +91,7 @@ in
"$mod SHIFT, k, movewindow, u"
"$mod SHIFT, j, movewindow, d"
"$mod, b, exec, ${theme.defaultApps.browser.pname}"
"$mod, b, exec, ${settings.defaultApps.browser.pname}"
];
bindm = [
@@ -115,8 +115,8 @@ in
];
monitor = [
"${theme.displayLeft.input},${theme.displayLeft.resolution}@${theme.displayLeft.refreshRate},0x0,1"
"${theme.displayRight.input},${theme.displayRight.resolution}@${theme.displayRight.refreshRate},3840x0,1"
"${settings.displayLeft.input},${settings.displayLeft.resolution}@${settings.displayLeft.refreshRate},0x0,1"
"${settings.displayRight.input},${settings.displayRight.resolution}@${settings.displayRight.refreshRate},3840x0,1"
];
misc = {
@@ -180,9 +180,9 @@ in
};
workspace = [
"name:firefox, monitor:${theme.displayRight.input}, default:false, special, class:(.*firefox.*)"
"name:discord, monitor:${theme.displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
"name:steam, monitor:${theme.displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
"name:firefox, monitor:${settings.displayRight.input}, default:false, special, class:(.*firefox.*)"
"name:discord, monitor:${settings.displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
"name:steam, monitor:${settings.displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
];
windowrule = [
@@ -194,6 +194,7 @@ in
"float, title:(.*[Ee]rror.*)"
"float, title:(.*[Ss]plash.*)"
"float, title:(.*[Cc]onfirmreset.*)"
"float, title:(.*[Ss]ign [Ii]n - .*)"
"float, title:(.*[Oo]pen [Ff]ile.*)"
"float, title:(.*branchdialog.*)"
"float, class:(.*pavucontrol.*)"

View File

@@ -1,6 +1,6 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
in
{
programs.kitty = {
@@ -8,9 +8,9 @@ in
shellIntegration.enableZshIntegration = true;
font = {
name = theme.fontName;
package = theme.fontPackage;
size = theme.fontSize;
name = settings.fontName;
package = settings.fontPackage;
size = settings.fontSize;
};
settings = {
@@ -24,77 +24,77 @@ in
background_opacity = "0.85";
# The basic colors
foreground = theme.nord.snowStorm.nord6;
background = theme.nord.polarNight.nord0;
selection_foreground = theme.nord.polarNight.nord0;
selection_background = theme.nord.aurora.nord15;
foreground = settings.nord.snowStorm.nord6;
background = settings.nord.polarNight.nord0;
selection_foreground = settings.nord.polarNight.nord0;
selection_background = settings.nord.aurora.nord15;
# Cursor colors
cursor = theme.nord.aurora.nord15;
cursor_text_color = theme.nord.polarNight.nord0;
cursor = settings.nord.aurora.nord15;
cursor_text_color = settings.nord.polarNight.nord0;
# URL underline color when hovering with mouse
url_color = theme.nord.aurora.nord15;
url_color = settings.nord.aurora.nord15;
# Kitty window border colors
active_border_color = theme.nord.frost.nord10;
inactive_border_color = theme.nord.polarNight.nord1;
bell_border_color = theme.nord.aurora.nord13;
active_border_color = settings.nord.frost.nord10;
inactive_border_color = settings.nord.polarNight.nord1;
bell_border_color = settings.nord.aurora.nord13;
# OS Window titlebar colors
wayland_titlebar_color = theme.nord.polarNight.nord0;
macos_titlebar_color = theme.nord.polarNight.nord0;
wayland_titlebar_color = settings.nord.polarNight.nord0;
macos_titlebar_color = settings.nord.polarNight.nord0;
# Tab bar colors
active_tab_foreground = theme.nord.polarNight.nord3;
active_tab_background = theme.nord.aurora.nord15;
inactive_tab_foreground = theme.nord.snowStorm.nord6;
inactive_tab_background = theme.nord.polarNight.nord1;
tab_bar_background = theme.nord.polarNight.nord3;
active_tab_foreground = settings.nord.polarNight.nord3;
active_tab_background = settings.nord.aurora.nord15;
inactive_tab_foreground = settings.nord.snowStorm.nord6;
inactive_tab_background = settings.nord.polarNight.nord1;
tab_bar_background = settings.nord.polarNight.nord3;
# Colors for marks (marked text in the terminal)
mark1_foreground = theme.nord.polarNight.nord0;
mark1_background = theme.nord.frost.nord10;
mark2_foreground = theme.nord.polarNight.nord0;
mark2_background = theme.nord.aurora.nord15;
mark3_foreground = theme.nord.polarNight.nord0;
mark3_background = theme.nord.frost.nord8;
mark1_foreground = settings.nord.polarNight.nord0;
mark1_background = settings.nord.frost.nord10;
mark2_foreground = settings.nord.polarNight.nord0;
mark2_background = settings.nord.aurora.nord15;
mark3_foreground = settings.nord.polarNight.nord0;
mark3_background = settings.nord.frost.nord8;
# The 16 terminal colors
# black
color0 = theme.nord.polarNight.nord0;
color0 = settings.nord.polarNight.nord0;
# Autosuggestion
color8 = theme.nord.frost.nord10;
color8 = settings.nord.frost.nord10;
# red
color1 = theme.nord.aurora.nord11;
color9 = theme.nord.aurora.nord11;
color1 = settings.nord.aurora.nord11;
color9 = settings.nord.aurora.nord11;
# green
color2 = theme.nord.aurora.nord14;
color10 = theme.nord.aurora.nord14;
color2 = settings.nord.aurora.nord14;
color10 = settings.nord.aurora.nord14;
# yellow
color3 = theme.nord.aurora.nord13;
color11 = theme.nord.aurora.nord13;
color3 = settings.nord.aurora.nord13;
color11 = settings.nord.aurora.nord13;
# blue
color4 = theme.nord.frost.nord10;
color12 = theme.nord.frost.nord10;
color4 = settings.nord.frost.nord10;
color12 = settings.nord.frost.nord10;
# magenta
color5 = theme.nord.aurora.nord15;
color13 = theme.nord.aurora.nord15;
color5 = settings.nord.aurora.nord15;
color13 = settings.nord.aurora.nord15;
# cyan
color6 = theme.nord.frost.nord8;
color14 = theme.nord.frost.nord8;
color6 = settings.nord.frost.nord8;
color14 = settings.nord.frost.nord8;
# white
color7 = theme.nord.snowStorm.nord5;
color15 = theme.nord.snowStorm.nord4;
color7 = settings.nord.snowStorm.nord5;
color15 = settings.nord.snowStorm.nord4;
};
};
}

View File

@@ -1,12 +1,12 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
in
{
services.mako = {
enable = true;
settings = {
font = theme.fontName;
font = settings.fontName;
icons = true;
ignore-timeout = true;
sort = "-time";
@@ -18,10 +18,10 @@ in
max-icon-size = 64;
default-timeout = 5000;
background-color = theme.nord.polarNight.nord0;
text-color = theme.nord.snowStorm.nord6;
border-color = theme.nord.frost.nord10;
progress-color = "over ${theme.nord.frost.nord8}";
background-color = settings.nord.polarNight.nord0;
text-color = settings.nord.snowStorm.nord6;
border-color = settings.nord.frost.nord10;
progress-color = "over ${settings.nord.frost.nord8}";
};
};
}

View File

@@ -1,16 +1,16 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
in
{
home.file = {
".config/nwg-dock-hyprland/drawer.css".text = ''
window {
background: ${theme.nord.polarNight.nord0};
background: ${settings.nord.polarNight.nord0};
border-radius: 10px;
border-style: none;
border-width: 1px;
border-color: ${theme.nord.aurora.nord15}b0
border-color: ${settings.nord.aurora.nord15}b0
}
#box {
@@ -21,14 +21,14 @@ in
active {
/* This is to underline the button representing the currently active window */
border-bottom: solid 1px;
border-color: ${theme.nord.aurora.nord14}1a
border-color: ${settings.nord.aurora.nord14}1a
}
button, image {
background: none;
border-style: none;
box-shadow: none;
color: ${theme.nord.frost.nord10}
color: ${settings.nord.frost.nord10}
}
button {
@@ -40,7 +40,7 @@ in
}
button:hover {
background-color: ${theme.nord.polarNight.nord0}1a;
background-color: ${settings.nord.polarNight.nord0}1a;
border-radius: 2px;
}

View File

@@ -1,18 +1,18 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
in
{
home.file = {
".config/nwg-drawer/drawer.css".text = ''
window {
background-color: ${theme.nord.polarNight.nord0}bf;
color: ${theme.nord.snowStorm.nord5}00
background-color: ${settings.nord.polarNight.nord0}bf;
color: ${settings.nord.snowStorm.nord5}00
}
/* search entry */
entry {
background-color: ${theme.nord.polarNight.nord1}0f
background-color: ${settings.nord.polarNight.nord1}0f
}
button, image {
@@ -21,7 +21,7 @@ in
}
button:hover {
background-color: ${theme.nord.frost.nord10}1a
background-color: ${settings.nord.frost.nord10}1a
}
/* in case you wanted to give category buttons a different look */
@@ -31,12 +31,12 @@ in
#pinned-box {
padding-bottom: 5px;
border-bottom: 1px dotted ${theme.nord.polarNight.nord3}
border-bottom: 1px dotted ${settings.nord.polarNight.nord3}
}
#files-box {
padding: 5px;
border: 1px dotted ${theme.nord.polarNight.nord3};
border: 1px dotted ${settings.nord.polarNight.nord3};
border-radius: 15px
}
'';

View File

@@ -1,6 +1,6 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
in
{
home.file = {
@@ -9,12 +9,12 @@ in
'';
".config/nwg-panel/preferred-apps.json".text = ''
{
"\\.pdf$": "${theme.defaultApps.browser.pname}",
"\\.pdf$": "${settings.defaultApps.browser.pname}",
"\\.svg$": "inkscape",
"\\.(jpg|png|tiff|gif)$": "${theme.defaultApps.imageViewer.pname}",
"\\.(jpg|png|tiff|gif)$": "${settings.defaultApps.imageViewer.pname}",
"\\.(mp3|ogg|flac|wav|wma)$": "audacious",
"\\.(avi|mp4|mkv|mov|wav)$": "${theme.defaultApps.video.pname}",
"\\.(doc|docx|xls|xlsx)$": "${theme.defaultApps.office.pname}"
"\\.(avi|mp4|mkv|mov|wav)$": "${settings.defaultApps.video.pname}",
"\\.(doc|docx|xls|xlsx)$": "${settings.defaultApps.office.pname}"
}
'';
};

View File

@@ -1,6 +1,6 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
defaultOpacity = "opacity: 0.85;";
defaultBorderRadius = "border-radius: 1rem;";
@@ -209,10 +209,10 @@ in
calendar = {
mode = "month";
format = {
months = "<span color='${theme.nord.frost.nord9}'><b>{}</b></span>";
days = "<span color='${theme.nord.frost.nord10}'><b>{}</b></span>";
weekdays = "<span color='${theme.nord.frost.nord8}'><b>{}</b></span>";
today = "<span color='${theme.nord.aurora.nord14}'><b><u>{}</u></b></span>";
months = "<span color='${settings.nord.frost.nord9}'><b>{}</b></span>";
days = "<span color='${settings.nord.frost.nord10}'><b>{}</b></span>";
weekdays = "<span color='${settings.nord.frost.nord8}'><b>{}</b></span>";
today = "<span color='${settings.nord.aurora.nord14}'><b><u>{}</u></b></span>";
};
};
};
@@ -238,12 +238,12 @@ in
#waybar {
background: transparent;
color: ${theme.nord.snowStorm.nord6};
color: ${settings.nord.snowStorm.nord6};
margin: 5px 5px;
}
#workspaces {
background-color: ${theme.nord.polarNight.nord0};
background-color: ${settings.nord.polarNight.nord0};
${defaultBorderRadius}
${defaultOpacity}
${defaultCenterOptions}
@@ -251,44 +251,44 @@ in
}
#workspaces button {
color: ${theme.nord.frost.nord10};
color: ${settings.nord.frost.nord10};
${defaultBorderRadius}
padding: 0.4rem;
}
#workspaces button.active {
color: ${theme.nord.frost.nord8};
color: ${settings.nord.frost.nord8};
${defaultBorderRadius}
}
#workspaces button:hover {
color: ${theme.nord.frost.nord7};
color: ${settings.nord.frost.nord7};
${defaultBorderRadius}
}
#workspaces button.focused {
color: ${theme.nord.snowStorm.nord6};
background: ${theme.nord.aurora.nord13};
color: ${settings.nord.snowStorm.nord6};
background: ${settings.nord.aurora.nord13};
${defaultBorderRadius}
}
#workspaces button.urgent {
color: ${theme.nord.polarNight.nord0};
background: ${theme.nord.snowStorm.nord6};
color: ${settings.nord.polarNight.nord0};
background: ${settings.nord.snowStorm.nord6};
${defaultBorderRadius}
}
#tooltip {
background: ${theme.nord.polarNight.nord0};
border-color: ${theme.nord.polarNight.nord0};
background: ${settings.nord.polarNight.nord0};
border-color: ${settings.nord.polarNight.nord0};
${defaultBorderRadius}
border-width: 1rem;
border-style: solid;
}
#window {
color: ${theme.nord.aurora.nord15};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.aurora.nord15};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultBorderRadius}
${defaultCenterOptions}
@@ -297,15 +297,15 @@ in
}
#custom-weather {
color: ${theme.nord.frost.nord10};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord10};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${borderRight}
}
#clock {
color: ${theme.nord.frost.nord9};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${borderLeft}
}
@@ -313,63 +313,63 @@ in
/* ------------- */
#bluetooth {
color: ${theme.nord.frost.nord9};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${borderRight}
}
#wireplumber.source {
color: ${theme.nord.frost.nord8};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord8};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#wireplumber.sink {
color: ${theme.nord.frost.nord7};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord7};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#keyboard-state.numlock {
color: ${theme.nord.frost.nord8};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord8};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#keyboard-state.capslock {
color: ${theme.nord.frost.nord9};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#temperature.gpu {
color: ${theme.nord.frost.nord10};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord10};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#temperature {
color: ${theme.nord.frost.nord9};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#custom-lights {
color: ${theme.nord.frost.nord8};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.frost.nord8};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${borderLeft}
}
@@ -377,7 +377,7 @@ in
/* ------------- */
#tray {
background-color: ${theme.nord.polarNight.nord0};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
${defaultBorderRadius}

View File

@@ -1,6 +1,6 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
in
{
programs.wlogout = {
@@ -49,13 +49,13 @@ in
}
window {
background-color: ${theme.nord.polarNight.nord0}f0
background-color: ${settings.nord.polarNight.nord0}f0
}
button {
margin: 8px;
color: ${theme.nord.frost.nord7};
background-color: ${theme.nord.polarNight.nord1};
color: ${settings.nord.frost.nord7};
background-color: ${settings.nord.polarNight.nord1};
border-style: solid;
border-width: 2px;
background-repeat: no-repeat;
@@ -66,8 +66,8 @@ in
button:active,
button:focus,
button:hover {
color: ${theme.nord.frost.nord8};
background-color: ${theme.nord.polarNight.nord2};
color: ${settings.nord.frost.nord8};
background-color: ${settings.nord.polarNight.nord2};
outline-style: none;
}

View File

@@ -1,13 +1,13 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
settings = import ../../settings.nix { inherit pkgs; };
in
{
programs.wofi = {
enable = true;
style = ''
* {
font-family: "${theme.fontName}", monospace;
font-family: "${settings.fontName}", monospace;
font-size: 14px;
}
@@ -15,9 +15,9 @@ in
window {
margin: 0px;
padding: 10px;
border: 0.16em solid ${theme.nord.aurora.nord15};
border: 0.16em solid ${settings.nord.aurora.nord15};
border-radius: 0.1em;
background-color: ${theme.nord.polarNight.nord0};
background-color: ${settings.nord.polarNight.nord0};
}
/* Inner Box */
@@ -25,7 +25,7 @@ in
margin: 5px;
padding: 10px;
border: none;
background-color: ${theme.nord.polarNight.nord0};
background-color: ${settings.nord.polarNight.nord0};
}
/* Outer Box */
@@ -33,7 +33,7 @@ in
margin: 5px;
padding: 10px;
border: none;
background-color: ${theme.nord.polarNight.nord0};
background-color: ${settings.nord.polarNight.nord0};
}
/* Scroll */
@@ -41,7 +41,7 @@ in
margin: 0px;
padding: 10px;
border: none;
background-color: ${theme.nord.polarNight.nord0};
background-color: ${settings.nord.polarNight.nord0};
}
/* Input */
@@ -50,46 +50,46 @@ in
padding: 10px;
border: none;
border-radius: 0.1em;
color: ${theme.nord.snowStorm.nord6};
background-color: ${theme.nord.polarNight.nord0};
color: ${settings.nord.snowStorm.nord6};
background-color: ${settings.nord.polarNight.nord0};
}
#input image {
border: none;
color: ${theme.nord.aurora.nord11};
color: ${settings.nord.aurora.nord11};
}
#input * {
outline: 4px solid ${theme.nord.aurora.nord11}!important;
outline: 4px solid ${settings.nord.aurora.nord11}!important;
}
/* Text */
#text {
margin: 5px;
border: none;
color: ${theme.nord.snowStorm.nord6};
color: ${settings.nord.snowStorm.nord6};
}
#entry {
background-color: ${theme.nord.polarNight.nord0};
background-color: ${settings.nord.polarNight.nord0};
}
#entry arrow {
border: none;
color: ${theme.nord.aurora.nord15};
color: ${settings.nord.aurora.nord15};
}
/* Selected Entry */
#entry:selected {
border: 0.11em solid ${theme.nord.aurora.nord15};
border: 0.11em solid ${settings.nord.aurora.nord15};
}
#entry:selected #text {
color: ${theme.nord.frost.nord7};
color: ${settings.nord.frost.nord7};
}
#entry:drop(active) {
background-color: ${theme.nord.aurora.nord15}!important;
background-color: ${settings.nord.aurora.nord15}!important;
}
'';
};

View File

@@ -1,6 +1,6 @@
{ pkgs, lib, ... }:
let
theme = import ./theme.nix { inherit pkgs; };
settings = import ./settings.nix { inherit pkgs; };
bing-wallpaper = pkgs.writeScriptBin "bing-wallpaper" ''
# Directory to store wallpapers
@@ -19,19 +19,19 @@ in
./environment.nix
];
home-manager.users.matt = import ./home.nix;
home-manager.users."${settings.user}" = import ./home.nix;
services = {
displayManager = {
sddm = {
enable = true;
package = pkgs.kdePackages.sddm;
extraPackages = [ theme.sddm.package ];
theme = theme.sddm.themeName;
extraPackages = [ settings.sddm.package ];
theme = settings.sddm.themeName;
wayland.enable = true;
settings = {
Theme = {
ThemeDir = "${theme.sddm.package}/share/sddm/themes";
ThemeDir = "${settings.sddm.package}/share/sddm/themes";
};
};
};
@@ -89,19 +89,19 @@ in
};
};
};
user.services.polkit-gnome-authentication-agent-1 = {
description = "polkit-gnome-authentication-agent-1";
wantedBy = [ "graphical-session.target" ];
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
# user.services.polkit-gnome-authentication-agent-1 = {
# description = "polkit-gnome-authentication-agent-1";
# wantedBy = [ "graphical-session.target" ];
# wants = [ "graphical-session.target" ];
# after = [ "graphical-session.target" ];
# serviceConfig = {
# Type = "simple";
# ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
# Restart = "on-failure";
# RestartSec = 1;
# TimeoutStopSec = 10;
# };
# };
extraConfig = ''
DefaultTimeoutStopSec=10s
'';

View File

@@ -20,6 +20,7 @@
hyprcursor
hyprland
hyprshot
hyprsysteminfo
kdePackages.qtmultimedia
libnotify
mako

View File

@@ -1,6 +1,6 @@
{ lib, pkgs, ... }:
let
theme = import ./theme.nix { inherit pkgs; };
settings = import ./settings.nix { inherit pkgs; };
wallpaper = "/run/wallpaper.jpg";
in
{
@@ -63,7 +63,7 @@ in
", edge:r:l, workspace, +1"
# swipe up from bottom edge
", edge:d:u, exec, ${theme.defaultApps.browser.pname}"
", edge:d:u, exec, ${settings.defaultApps.browser.pname}"
# swipe down from left edge
", edge:l:d, exec, pactl set-sink-volume @DEFAULT_SINK@ -4%"
@@ -93,13 +93,14 @@ in
};
services = {
hyprpolkitagent.enable = true;
hyprpaper = {
enable = true;
settings = {
preload = [ "/run/wallpaper.jpg" wallpaper ];
wallpaper = [
"${theme.displayLeft.input}, /run/wallpaper.jpg"
"${theme.displayRight.input}, /run/wallpaper.jpg"
"${settings.displayLeft.input}, /run/wallpaper.jpg"
"${settings.displayRight.input}, /run/wallpaper.jpg"
];
splash = false;
};
@@ -121,16 +122,16 @@ in
# on-resume = "brightnessctl -r"; # monitor backlight restore.
# }
{
timeout = theme.lockScreenTimer;
timeout = settings.lockScreenTimer;
on-timeout = "loginctl lock-session"; # lock screen when timeout has passed
}
{
timeout = theme.screenOffTimer;
timeout = settings.screenOffTimer;
on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed
on-resume = "hyprctl dispatch dpms on"; # screen on when activity is detected after timeout has fired.
}
{
timeout = theme.suspendTimer;
timeout = settings.suspendTimer;
on-timeout = "systemctl suspend"; # suspend pc
}
];
@@ -162,7 +163,7 @@ in
{
size = "200, 50";
position = "0, -80";
monitor = theme.displayLeft.input;
monitor = settings.displayLeft.input;
dots_center = true;
fade_on_empty = true;
font_color = "rgb(202, 211, 245)";
@@ -181,16 +182,16 @@ in
home = {
sessionVariables = {
BROWSER = "${theme.defaultApps.browser.pname}";
BROWSER = "${settings.defaultApps.browser.pname}";
CLUTTER_BACKEND = "wayland";
EDITOR = "${theme.defaultApps.editor.pname}";
VISUAL = "${theme.defaultApps.visual.pname}";
ICON_THEME = theme.iconTheme;
EDITOR = "${settings.defaultApps.editor.pname}";
VISUAL = "${settings.defaultApps.visual.pname}";
ICON_THEME = settings.iconTheme;
GTK_CSD = "0";
GTK_THEME = theme.gtkTheme;
GTK_THEME = settings.gtkTheme;
GTK_USE_PORTAL = "1";
HYPRCURSOR_THEME = theme.cursorTheme;
HYPRCURSOR_SIZE = theme.cursorSize;
HYPRCURSOR_THEME = settings.cursorTheme;
HYPRCURSOR_SIZE = settings.cursorSize;
MOZ_ENABLE_WAYLAND = "1";
NIXOS_OZONE_WL = "1";
NIXOS_XDG_OPEN_USE_PORTAL = "1";
@@ -200,9 +201,9 @@ in
QT_SCALE_FACTOR = "1";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland";
TERMINAL = "${theme.defaultApps.terminal.pname}";
XCURSOR_THEME = theme.cursorTheme;
XCURSOR_SIZE = theme.cursorSize;
TERMINAL = "${settings.defaultApps.terminal.pname}";
XCURSOR_THEME = settings.cursorTheme;
XCURSOR_SIZE = settings.cursorSize;
XDG_CACHE_HOME = "\${HOME}/.cache";
XDG_CONFIG_HOME = "\${HOME}/.config";
XDG_CURRENT_DESKTOP = "Hyprland";
@@ -213,21 +214,21 @@ in
pointerCursor = {
gtk.enable = true;
package = theme.cursorThemePkg;
name = theme.cursorTheme;
size = theme.cursorSize;
package = settings.cursorThemePkg;
name = settings.cursorTheme;
size = settings.cursorSize;
};
packages = theme.requiredPkgs;
packages = settings.requiredPkgs;
};
dconf = {
enable = true;
settings = {
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
"org/gnome/desktop/interface".cursor-theme = theme.cursorTheme;
"org/gnome/desktop/interface".gtk-theme = theme.gtkTheme;
"org/gnome/desktop/interface".icon-theme = theme.iconTheme;
"org/gnome/desktop/interface".cursor-theme = settings.cursorTheme;
"org/gnome/desktop/interface".gtk-theme = settings.gtkTheme;
"org/gnome/desktop/interface".icon-theme = settings.iconTheme;
};
};
@@ -235,18 +236,18 @@ in
enable = true;
cursorTheme = {
name = theme.cursorTheme;
package = theme.cursorThemePkg;
name = settings.cursorTheme;
package = settings.cursorThemePkg;
};
theme = {
name = theme.gtkTheme;
package = theme.gtkThemePkg;
name = settings.gtkTheme;
package = settings.gtkThemePkg;
};
iconTheme = {
name = theme.iconTheme;
package = theme.iconThemePkg;
name = settings.iconTheme;
package = settings.iconThemePkg;
};
gtk3.extraConfig = {
@@ -258,9 +259,9 @@ in
};
font = {
name = theme.fontName;
package = theme.fontPackage;
size = theme.fontSize;
name = settings.fontName;
package = settings.fontPackage;
size = settings.fontSize;
};
};
}

View File

@@ -15,6 +15,9 @@ let
};
in
{
# Username
user = "matt";
# Displays
displayLeft = {
input = "DP-1";