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

desktop stuff

Browse Source
This commit is contained in:
mjallen18
2025-07-28 09:32:31 -05:00
parent 5b34456571
commit 1a3b091588
4 changed files with 83 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/home/desktop/hyprland/options.nix
View File

@@ -132,15 +132,15 @@ with lib;
hyprIdle = { hyprIdle = {
lockScreenTimer = mkOption { lockScreenTimer = mkOption {
type = with types; int; type = with types; int;
default = 5; default = 300;
}; };
screenOffTimer = mkOption { screenOffTimer = mkOption {
type = with types; int; type = with types; int;
default = 15; default = 900;
}; };
suspendTimer = mkOption { suspendTimer = mkOption {
type = with types; int; type = with types; int;
default = 30; default = 1500;
}; };
}; };
}; };

2
modules/home/programs/waybar/default.nix
View File

@@ -373,7 +373,7 @@ in
${defaultBorderRadius} ${defaultBorderRadius}
${defaultCenterOptions} ${defaultCenterOptions}
margin-left: 4rem; margin-left: 4rem;
margin-right: 400rem; margin-right: 4rem;
} }
/* make window module transparent when no windows present */ /* make window module transparent when no windows present */

73
systems/x86_64-linux/desktop/specialisations/hyprland/default.nix
View File

@@ -1,16 +1,16 @@
{ lib, namespace, ... }: { lib, namespace, ... }:
let let
# Displays # Displays
displayLeft = { # displayLeft = {
input = "DP-1"; # input = "DP-1";
resolution = "3840x2160"; # resolution = "3840x2160";
refreshRate = "240.00000"; # refreshRate = "240.00000";
}; # };
displayRight = { # displayRight = {
input = "DP-2"; # input = "DP-2";
resolution = "3840x2160"; # resolution = "3840x2160";
refreshRate = "240.00000"; # refreshRate = "240.00000";
}; # };
in in
{ {
specialisation.hyprland.inheritParentConfig = true; specialisation.hyprland.inheritParentConfig = true;
@@ -18,38 +18,37 @@ in
home-manager.users.matt = import ./home/default.nix; home-manager.users.matt = import ./home/default.nix;
${namespace} = { ${namespace} = {
desktop = { desktop = {
hyprland = { hyprland.enable = true;
enable = true; # primaryDisplay = "DP-1";
primaryDisplay = "DP-1";
wallpaper = [ # wallpaper = [
"${displayLeft.input}, /run/wallpaper.jpg" # "${displayLeft.input}, /run/wallpaper.jpg"
"${displayRight.input}, /run/wallpaper.jpg" # "${displayRight.input}, /run/wallpaper.jpg"
]; # ];
monitor = [ # monitor = [
"${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98" # "${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
"${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98" # "${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
]; # ];
workspace = [ # workspace = [
"name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)" # "name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)"
"name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)" # "name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
"name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)" # "name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
]; # ];
windowRule = [ # windowRule = [
"size 2160 7680, tag:horizonrdp" # "size 2160 7680, tag:horizonrdp"
]; # ];
extraConfig = '' # extraConfig = ''
exec-once = nm-applet # exec-once = nm-applet
exec-once = [silent] firefox # exec-once = [silent] firefox
exec-once = [silent] vesktop # exec-once = [silent] vesktop
exec-once = [silent] chromium --app="https://music.apple.com" # exec-once = [silent] chromium --app="https://music.apple.com"
exec-once = [silent] steam # exec-once = [silent] steam
''; # '';
}; # };
gnome.enable = lib.mkForce false; gnome.enable = lib.mkForce false;
}; };
}; };

44
systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix
View File

@@ -3,11 +3,52 @@ let
theme = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix"); theme = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
fontName = "JetBrainsMono NFM"; fontName = "JetBrainsMono NFM";
fontPackage = pkgs.nerd-fonts.jetbrains-mono; fontPackage = pkgs.nerd-fonts.jetbrains-mono;
displayLeft = {
input = "DP-1";
resolution = "3840x2160";
refreshRate = "240.00000";
};
displayRight = {
input = "DP-2";
resolution = "3840x2160";
refreshRate = "240.00000";
};
in in
{ {
mjallen = { mjallen = {
desktop.hyprland = { desktop.hyprland = {
enable = true; enable = true;
primaryDisplay = "DP-1";
wallpaper = [
"${displayLeft.input}, /run/wallpaper.jpg"
"${displayRight.input}, /run/wallpaper.jpg"
];
monitor = [
"${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
"${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
];
workspace = [
"name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)"
"name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
"name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
];
windowRule = [
"size 2160 7680, tag:horizonrdp"
];
extraConfig = ''
exec-once = nm-applet
exec-once = [silent] firefox
exec-once = [silent] vesktop
exec-once = [silent] chromium --app="https://music.apple.com"
exec-once = [silent] steam
'';
defaultApps = { defaultApps = {
browser = pkgs.firefox; browser = pkgs.firefox;
}; };
@@ -36,7 +77,6 @@ in
waybar = { waybar = {
enable = true; enable = true;
networkInterface = "wlp9s0";
layer = "bottom"; layer = "bottom";
modules-right = [ modules-right = [
@@ -60,7 +100,7 @@ in
tooltip = false; tooltip = false;
exec = "waybar-hass --get_light light.living_room_lights"; exec = "waybar-hass --get_light light.living_room_lights";
interval = "once"; interval = "once";
format = "{text}"; # "󱉓"; format = "{text}";#"󱉓";
on-click = "waybar-hass --toggle_light light.living_room_lights"; on-click = "waybar-hass --toggle_light light.living_room_lights";
return-type = "json"; return-type = "json";
}; };