mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some hyprland updates

Browse Source
This commit is contained in:
mjallen18
2025-06-25 18:42:52 -05:00
parent e436f4e543
commit 24fa8c6569
11 changed files with 306 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
modules/desktop-environments/hyprland/config/btop/default.nix
View File

@@ -1,9 +1,12 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
in
{
programs.btop = {
enable = true;
settings = {
color_theme = "/home/matt/.config/btop/themes/nord.theme";
color_theme = "nord";
theme_background = true;
truecolor = true;
force_tty = false;
@@ -68,6 +71,52 @@
selected_battery = "Auto";
log_level = "WARNING";
};
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}"
'';
};
};
}

68
modules/desktop-environments/hyprland/config/hypr/default.nix
View File

@@ -1,5 +1,7 @@
{ pkgs, ... }:
let
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i Colloid-nord-dark";
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}";
in
{
wayland.windowManager.hyprland = {
@@ -32,6 +34,7 @@ in
bind = [
"$mod, Return, exec, kitty"
"$mod, SPACE, exec, wofi --show drun"
"$mod, Q, killactive, "
"$mod, M, exec, wlogout --protocol layer-shell"
"$mod, E, exec, nautilus"
@@ -44,12 +47,12 @@ in
"$mod,F,exec,hyprctl dispatch fullscreen active"
"$mod SHIFT, E, exec, smile"
"$mod, mouse:276, movecurrentworkspacetomonitor, DP-1"
"$mod, mouse:275, movecurrentworkspacetomonitor, DP-2"
"$mod, mouse:276, movecurrentworkspacetomonitor, ${theme.displayLeft.input}"
"$mod, mouse:275, movecurrentworkspacetomonitor, ${theme.displayRight.input}"
# alt-tab between workspaces on active monitor
"ALT, Tab, workspace, m+1"
"ALT SHIFT, Tab, workspace, m-1"
"$mod, Tab, workspace, m+1"
"$mod SHIFT, Tab, workspace, m-1"
"$mod, h, movefocus, l"
"$mod, l, movefocus, r"
@@ -112,9 +115,8 @@ in
];
monitor = [
"DP-1,3840x2160@240.00000,0x0,1"
"DP-2,3840x2160@240.00000,3840x0,1"
"HDMI-A-1,1920x1080@60.00000,0x0,1"
"${theme.displayLeft.input},${theme.displayLeft.resolution}@${theme.displayLeft.refreshRate},0x0,1"
"${theme.displayRight.input},${theme.displayRight.resolution}@${theme.displayRight.refreshRate},3840x0,1"
];
misc = {
@@ -178,27 +180,27 @@ in
};
workspace = [
"name:firefox, monitor:DP-2, default:false, special, class:(.*firefox.*)"
"name:discord, monitor:DP-2, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
"name:steam, monitor:DP-1, default:false, special, class:(.*[Ss]team.*)"
"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.*)"
];
windowrule = [
"float, title:(file_progress)"
"float, title:(.*confirm.*)"
"float, title:(.*dialog.*)"
"float, title:(.*download.*)"
"float, title:(.*notification.*)"
"float, title:(.*error.*)"
"float, title:(.*splash.*)"
"float, title:(.*confirmreset.*)"
"float, title:(.*Open File.*)"
"float, title:(.*[Cc]onfirm.*)"
"float, title:(.*[Dd]ialog.*)"
"float, title:(.*[Dd]ownload.*)"
"float, title:(.*[Nn]otification.*)"
"float, title:(.*[Ee]rror.*)"
"float, title:(.*[Ss]plash.*)"
"float, title:(.*[Cc]onfirmreset.*)"
"float, title:(.*[Oo]pen [Ff]ile.*)"
"float, title:(.*branchdialog.*)"
"float, class:(.*pavucontrol)"
"move onscreen cursor 0% 0%, class:(.*pavucontrol)"
"float, class:(.*FileRoller)"
"float, class:(.*wlogout)"
"idleinhibit stayfocused, title:(.*mpv)"
"float, class:(.*pavucontrol.*)"
"move onscreen cursor 0% 0%, class:(.*pavucontrol.*)"
"float, class:(.*FileRoller.*)"
"float, class:(.*wlogout.*)"
"idleinhibit stayfocused, title:(.*mpv.*)"
"float, title:(Media viewer)"
"float, class:(it.mijorus.smile),title:(Smile)"
@@ -226,10 +228,11 @@ in
# Game Tearing??? https://wiki.hyprland.org/Configuring/Tearing/
"immediate, class:(.*gamescope)"
# todo properly fix this shit instead of using gamescope
# vmware
"tag +horizonrdp, class:(Remote Desktop Connection),title:(BBar)"
"tag +horizonrdp, class:(Remote Desktop Connection),title:(Remote Desktop Connection)"
# this tag will set the below options to the vdi window
# this will have it auto open as a 2160x7680 window
# and makes multi-monitor work
"tag +horizonrdp, class:(.*[Vv][Mm]ware-view),title:(USPS Next VDI)"
"noanim, tag:horizonrdp"
"noblur, tag:horizonrdp"
@@ -240,11 +243,12 @@ in
"noborder, tag:horizonrdp"
"nodim, tag:horizonrdp"
"nomaxsize, tag:horizonrdp"
"float, class:(.*Vmware-view),title:(VMware Horizon Client"
"float, class:(Remote Desktop Connection),title:(.*Remote Desktop Connection.*)"
"float, class:(Remote Desktop Connection),title:(.*5cd238b4x0.*)"
"float, class:(Credential Manager UI Host),title:(.*Windows Security.*)"
"renderunfocused, tag:horizonrdp"
"idleinhibit, tag:horizonrdp"
"float, tag:horizonrdp"
"size 2160 7680, tag:horizonrdp"
# float the vmware window cause its annoying to use in fullscreen
"float, class:(.*[Vv][Mm]ware-view),title:([Vv][Mm]ware [Hh]orizon [Cc]lient)"
];
input = {

6
modules/desktop-environments/hyprland/config/mako/default.nix
View File

@@ -1,8 +1,12 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
in
{
services.mako = {
enable = true;
settings = {
font = "monospace 12";
font = theme.fontName;
icons = false;
ignore-timeout = true;
sort = "-time";

91
modules/desktop-environments/hyprland/config/wofi/default.nix
View File

@@ -1,62 +1,13 @@
{ pkgs, ... }:
let
theme = import ../../theme.nix { inherit pkgs; };
in
{
programs.wofi = {
enable = false;
enable = true;
style = ''
@define-color rosewater #f4dbd6;
@define-color rosewater-rgb rgb(244, 219, 214);
@define-color flamingo #f0c6c6;
@define-color flamingo-rgb rgb(240, 198, 198);
@define-color pink #f5bde6;
@define-color pink-rgb rgb(245, 189, 230);
@define-color mauve #c6a0f6;
@define-color mauve-rgb rgb(198, 160, 246);
@define-color red #ed8796;
@define-color red-rgb rgb(237, 135, 150);
@define-color maroon #ee99a0;
@define-color maroon-rgb rgb(238, 153, 160);
@define-color peach #f5a97f;
@define-color peach-rgb rgb(245, 169, 127);
@define-color yellow #eed49f;
@define-color yellow-rgb rgb(238, 212, 159);
@define-color green #a6da95;
@define-color green-rgb rgb(166, 218, 149);
@define-color teal #8bd5ca;
@define-color teal-rgb rgb(139, 213, 202);
@define-color sky #91d7e3;
@define-color sky-rgb rgb(145, 215, 227);
@define-color sapphire #7dc4e4;
@define-color sapphire-rgb rgb(125, 196, 228);
@define-color blue #8aadf4;
@define-color blue-rgb rgb(138, 173, 244);
@define-color lavender #b7bdf8;
@define-color lavender-rgb rgb(183, 189, 248);
@define-color text #cad3f5;
@define-color text-rgb rgb(202, 211, 245);
@define-color subtext1 #b8c0e0;
@define-color subtext1-rgb rgb(184, 192, 224);
@define-color subtext0 #a5adcb;
@define-color subtext0-rgb rgb(165, 173, 203);
@define-color overlay2 #939ab7;
@define-color overlay2-rgb rgb(147, 154, 183);
@define-color overlay1 #8087a2;
@define-color overlay1-rgb rgb(128, 135, 162);
@define-color overlay0 #6e738d;
@define-color overlay0-rgb rgb(110, 115, 141);
@define-color surface2 #5b6078;
@define-color surface2-rgb rgb(91, 96, 120);
@define-color surface1 #494d64;
@define-color surface1-rgb rgb(73, 77, 100);
@define-color surface0 #363a4f;
@define-color surface0-rgb rgb(54, 58, 79);
@define-color base #24273a;
@define-color base-rgb rgb(36, 39, 58);
@define-color mantle #1e2030;
@define-color mantle-rgb rgb(30, 32, 48);
@define-color crust #181926;
@define-color crust-rgb rgb(24, 25, 38);
* {
font-family: "Inconsolata Nerd Font", monospace;
font-family: "${theme.fontName}", monospace;
font-size: 14px;
}
@@ -64,9 +15,9 @@
window {
margin: 0px;
padding: 10px;
border: 0.16em solid @lavender;
border: 0.16em solid ${theme.nord.aurora.nord15};
border-radius: 0.1em;
background-color: @base;
background-color: ${theme.nord.polarNight.nord0};
}
/* Inner Box */
@@ -74,7 +25,7 @@
margin: 5px;
padding: 10px;
border: none;
background-color: @base;
background-color: ${theme.nord.polarNight.nord0};
}
/* Outer Box */
@@ -82,7 +33,7 @@
margin: 5px;
padding: 10px;
border: none;
background-color: @base;
background-color: ${theme.nord.polarNight.nord0};
}
/* Scroll */
@@ -90,7 +41,7 @@
margin: 0px;
padding: 10px;
border: none;
background-color: @base;
background-color: ${theme.nord.polarNight.nord0};
}
/* Input */
@@ -99,46 +50,46 @@
padding: 10px;
border: none;
border-radius: 0.1em;
color: @text;
background-color: @base;
color: ${theme.nord.snowStorm.nord6};
background-color: ${theme.nord.polarNight.nord0};
}
#input image {
border: none;
color: @red;
color: ${theme.nord.aurora.nord11};
}
#input * {
outline: 4px solid @red!important;
outline: 4px solid ${theme.nord.aurora.nord11}!important;
}
/* Text */
#text {
margin: 5px;
border: none;
color: @text;
color: ${theme.nord.snowStorm.nord6};
}
#entry {
background-color: @base;
background-color: ${theme.nord.polarNight.nord0};
}
#entry arrow {
border: none;
color: @lavender;
color: ${theme.nord.aurora.nord15};
}
/* Selected Entry */
#entry:selected {
border: 0.11em solid @lavender;
border: 0.11em solid ${theme.nord.aurora.nord15};
}
#entry:selected #text {
color: @mauve;
color: ${theme.nord.frost.nord7};
}
#entry:drop(active) {
background-color: @lavender!important;
background-color: ${theme.nord.aurora.nord15}!important;
}
'';
};