✨ Monitor specific configs in hosts
This commit is contained in:
parent
980334b44b
commit
4a884f5e6e
4
hosts/desktop/common.nix
Normal file
4
hosts/desktop/common.nix
Normal file
@ -0,0 +1,4 @@
|
||||
{
|
||||
monitor1 = "DP-1";
|
||||
monitor2 = "DP-3";
|
||||
}
|
@ -6,6 +6,8 @@
|
||||
{
|
||||
imports = [
|
||||
(lib.custom.relativeToRoot "shared/home-manager")
|
||||
./hyprpaper.nix
|
||||
./settings.nix
|
||||
];
|
||||
|
||||
programs.git.signing.key = "706F53DD087A91DE";
|
||||
|
29
hosts/desktop/home-manager/hyprpaper.nix
Normal file
29
hosts/desktop/home-manager/hyprpaper.nix
Normal file
@ -0,0 +1,29 @@
|
||||
# Wallpapers
|
||||
{
|
||||
lib,
|
||||
theme,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
services.hyprpaper.settings =
|
||||
let
|
||||
wallpaper1 = builtins.toString theme.wallpaper.monitor1;
|
||||
wallpaper2 = builtins.toString theme.wallpaper.monitor2;
|
||||
in
|
||||
{
|
||||
preload = lib.mkDefault [
|
||||
wallpaper1
|
||||
wallpaper2
|
||||
];
|
||||
|
||||
wallpaper =
|
||||
let
|
||||
common = import ../common.nix;
|
||||
in
|
||||
lib.mkDefault [
|
||||
"${common.monitor1},${wallpaper1}"
|
||||
"${common.monitor2},${wallpaper2}"
|
||||
];
|
||||
};
|
||||
}
|
12
hosts/desktop/home-manager/settings.nix
Normal file
12
hosts/desktop/home-manager/settings.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
wayland.windowManager.hyprland.settings.monitor =
|
||||
let
|
||||
common = import ../common.nix;
|
||||
in
|
||||
lib.mkForce [
|
||||
"${common.monitor1}, 3440x1440@175, 0x0, 1"
|
||||
"${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
|
||||
];
|
||||
}
|
@ -1,25 +1,4 @@
|
||||
rec {
|
||||
default = {
|
||||
browser = "zen";
|
||||
calculator = "gnome-calculator";
|
||||
fileManager = "nautilus";
|
||||
imageViewer = "loupe";
|
||||
lockScreen = "hyprlock";
|
||||
terminal = "kitty";
|
||||
};
|
||||
|
||||
dir = {
|
||||
home = "/home/${username}";
|
||||
pictures = "${dir.home}/Pictures";
|
||||
};
|
||||
|
||||
keymaps = {
|
||||
layout = "gb,no";
|
||||
options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
|
||||
};
|
||||
|
||||
# Empty matches all
|
||||
{
|
||||
# Empty matches all monitors
|
||||
monitor1 = "";
|
||||
|
||||
username = "martin";
|
||||
}
|
||||
|
@ -1,23 +0,0 @@
|
||||
# Wallpapers
|
||||
{
|
||||
lib,
|
||||
theme,
|
||||
common,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
services.hyprpaper.settings =
|
||||
let
|
||||
monitor1 = builtins.toString theme.wallpaper.monitor1;
|
||||
in
|
||||
{
|
||||
preload = lib.mkDefault [
|
||||
monitor1
|
||||
];
|
||||
|
||||
wallpaper = lib.mkDefault [
|
||||
"${common.monitor1},${monitor1}"
|
||||
];
|
||||
};
|
||||
}
|
@ -1,14 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
common,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = lib.mkDefault [
|
||||
"${common.monitor1}, 1920x1080@60.05, 0x0, 1"
|
||||
];
|
||||
monitor =
|
||||
let
|
||||
common = import ../common.nix;
|
||||
in
|
||||
lib.mkForce [
|
||||
"${common.monitor1}, 1920x1080@60.05, 0x0, 1"
|
||||
];
|
||||
|
||||
# Autostart
|
||||
exec-once = [
|
||||
|
@ -18,10 +18,6 @@ rec {
|
||||
options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
|
||||
};
|
||||
|
||||
# Empty matches all
|
||||
monitor1 = "DP-1";
|
||||
monitor2 = "DP-3";
|
||||
|
||||
username = "martin";
|
||||
|
||||
root = ../.;
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Home configurations for Hyprland. For system configs, see ./modules/hyprland
|
||||
# Home configurations for Hyprland. For system configs, see ./shared/modules/hyprland
|
||||
{
|
||||
imports = [
|
||||
./binds.nix
|
||||
|
@ -1,7 +1,6 @@
|
||||
# Wallpapers
|
||||
{
|
||||
pkgs,
|
||||
common,
|
||||
theme,
|
||||
...
|
||||
}:
|
||||
@ -13,8 +12,7 @@
|
||||
enable = true;
|
||||
settings =
|
||||
let
|
||||
monitor1 = builtins.toString theme.wallpaper.monitor1;
|
||||
monitor2 = builtins.toString theme.wallpaper.monitor2;
|
||||
defaultWallpaper = builtins.toString theme.wallpaper.default;
|
||||
in
|
||||
{
|
||||
ipc = "on";
|
||||
@ -22,13 +20,11 @@
|
||||
splash_offset = 2.0;
|
||||
|
||||
preload = [
|
||||
monitor1
|
||||
monitor2
|
||||
defaultWallpaper
|
||||
];
|
||||
|
||||
wallpaper = [
|
||||
"${common.monitor1},${monitor1}"
|
||||
"${common.monitor2},${monitor2}"
|
||||
",${defaultWallpaper}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
@ -10,8 +10,7 @@ in
|
||||
{
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"${common.monitor1}, 3440x1440@175, 0x0, 1"
|
||||
"${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
|
||||
", preferred, auto, 1"
|
||||
];
|
||||
|
||||
# Autostart
|
||||
|
@ -5,8 +5,9 @@ rec {
|
||||
|
||||
nerdFont = "JetBrainsMono";
|
||||
|
||||
wallpaper = {
|
||||
wallpaper = rec {
|
||||
lockscreen = ./assets/catppuccin_page_curl.png;
|
||||
default = monitor1;
|
||||
monitor1 = ./assets/nixos_waves.png;
|
||||
monitor2 = ./assets/ekg_v2.png;
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user