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 = {
lockScreenTimer = mkOption {
type = with types; int;
default = 5;
default = 300;
};
screenOffTimer = mkOption {
type = with types; int;
default = 15;
default = 900;
};
suspendTimer = mkOption {
type = with types; int;
default = 30;
default = 1500;
};
};
};

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

@@ -373,7 +373,7 @@ in
${defaultBorderRadius}
${defaultCenterOptions}
margin-left: 4rem;
margin-right: 400rem;
margin-right: 4rem;
}
/* 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, ... }:
let
# Displays
displayLeft = {
input = "DP-1";
resolution = "3840x2160";
refreshRate = "240.00000";
};
displayRight = {
input = "DP-2";
resolution = "3840x2160";
refreshRate = "240.00000";
};
# displayLeft = {
# input = "DP-1";
# resolution = "3840x2160";
# refreshRate = "240.00000";
# };
# displayRight = {
# input = "DP-2";
# resolution = "3840x2160";
# refreshRate = "240.00000";
# };
in
{
specialisation.hyprland.inheritParentConfig = true;
@@ -18,38 +18,37 @@ in
home-manager.users.matt = import ./home/default.nix;
${namespace} = {
desktop = {
hyprland = {
enable = true;
primaryDisplay = "DP-1";
hyprland.enable = true;
# primaryDisplay = "DP-1";
wallpaper = [
"${displayLeft.input}, /run/wallpaper.jpg"
"${displayRight.input}, /run/wallpaper.jpg"
];
# 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"
];
# 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.*)"
];
# 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"
];
# 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
'';
};
# 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
# '';
# };
gnome.enable = lib.mkForce false;
};
};

46
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");
fontName = "JetBrainsMono NFM";
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
{
mjallen = {
desktop.hyprland = {
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 = {
browser = pkgs.firefox;
};
@@ -36,7 +77,6 @@ in
waybar = {
enable = true;
networkInterface = "wlp9s0";
layer = "bottom";
modules-right = [
@@ -54,13 +94,13 @@ in
"clock"
"custom/weather"
];
extraModules = {
"custom/lights" = {
tooltip = false;
exec = "waybar-hass --get_light light.living_room_lights";
interval = "once";
format = "{text}"; # "󱉓";
format = "{text}";#"󱉓";
on-click = "waybar-hass --toggle_light light.living_room_lights";
return-type = "json";
};