Compare commits

..

1 commit

Author SHA1 Message Date
1b71633b9b
feat: use per device monitor configuration 2024-11-29 10:58:20 +01:00
12 changed files with 35 additions and 94 deletions

View file

@ -17,12 +17,9 @@ let
}; };
in in
{ {
xdg = { xdg.desktopEntries = builtins.listToAttrs [
userDirs.enable = true; (mkURLEntry "Paperless" "https://paperless.ccnlc.eu" "${self}/assets/favicon-paperless.png")
desktopEntries = builtins.listToAttrs [ (mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png")
(mkURLEntry "Paperless" "https://paperless.ccnlc.eu" "${self}/assets/favicon-paperless.png") (mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
(mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png") ];
(mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
];
};
} }

View file

@ -5,10 +5,7 @@
config, config,
... ...
}: }:
let lib.mkIf osConfig.programs.hyprland.enable {
inherit (lib) mapAttrsToList mkIf hasAttr;
in
mkIf osConfig.programs.hyprland.enable {
home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto"; home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
@ -17,15 +14,10 @@ mkIf osConfig.programs.hyprland.enable {
settings = { settings = {
"$mod" = "SUPER"; "$mod" = "SUPER";
monitor = mapAttrsToList ( monitor = [
name: value: "DP-2,1920x1080@144, 0x0, 1"
let "HDMI-A-1,1920x1080@60, 1920x0, 1"
inherit (value) resX resY scale; ];
posFinal = "${toString value.posX}x${toString value.posY}";
rrFinal = if hasAttr "rr" value then "@${toString value.rr}" else "";
in
"${name}, ${toString resX}x${toString resY}${rrFinal}, ${posFinal}, ${toString scale}"
) osConfig.modules.system.outputs;
exec-once = [ exec-once = [
"${config.services.kdeconnect.package}/bin/kdeconnect-indicator" "${config.services.kdeconnect.package}/bin/kdeconnect-indicator"
@ -59,7 +51,6 @@ mkIf osConfig.programs.hyprland.enable {
input = { input = {
numlock_by_default = true; numlock_by_default = true;
kb_options = "compose:caps"; kb_options = "compose:caps";
kb_layout = osConfig.console.keyMap;
}; };
decoration = { decoration = {
@ -69,12 +60,10 @@ mkIf osConfig.programs.hyprland.enable {
active_opacity = 1.0; active_opacity = 1.0;
inactive_opacity = 1.0; inactive_opacity = 1.0;
shadow = { drop_shadow = true;
enabled = true; shadow_range = 4;
range = 4; shadow_render_power = 3;
render_power = 3; "col.shadow" = "rgba(1a1a1aee)";
color = "rgba(1a1a1aee)";
};
# https://wiki.hyprland.org/Configuring/Variables/#blur # https://wiki.hyprland.org/Configuring/Variables/#blur
blur = { blur = {

View file

@ -33,8 +33,6 @@
modules = { modules = {
system = { system = {
roles.desktop.enable = true;
outputs = { outputs = {
"DP-2" = { "DP-2" = {
resX = 1920; resX = 1920;
@ -77,7 +75,10 @@
}; };
media.enableAll = true; media.enableAll = true;
}; };
documentation = {
doc.enable = false;
man.generateCaches = false;
};
services = { services = {
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
dbus.enable = true; dbus.enable = true;

View file

@ -17,8 +17,6 @@
media.enableAll = true; media.enableAll = true;
system = { system = {
roles.desktop.enable = true;
outputs = { outputs = {
eDP-1 = { eDP-1 = {
resX = 3840; resX = 3840;

View file

@ -47,17 +47,7 @@
} }
{ {
name = "movies"; name = "movies";
comment = "backup location for movies and shows"; comment = "backup location for movies shows";
mode = "write";
}
{
name = "books";
comment = "backup location for books";
mode = "write";
}
{
name = "games";
comment = "backup location for games";
mode = "write"; mode = "write";
} }
]; ];

View file

@ -28,9 +28,6 @@ in
upstream_dns_file = config.age.secrets.adguard-dns-list.path; upstream_dns_file = config.age.secrets.adguard-dns-list.path;
fallback_dns = [ "9.9.9.9" ]; fallback_dns = [ "9.9.9.9" ];
}; };
filtering = {
filtering_enabled = true;
};
clients = { clients = {
persistent = [ persistent = [
{ {

View file

@ -1,6 +1,3 @@
{ {
imports = [ imports = [ ./system.nix ];
./system.nix
./documentation.nix
];
} }

View file

@ -1,6 +0,0 @@
{
documentation = {
doc.enable = false;
man.generateCaches = false;
};
}

View file

@ -1,23 +1,16 @@
{ pkgs, ... }:
{ {
pkgs, qt = {
lib, enable = true;
config, platformTheme = "gtk2";
... #platformTheme = "qt5ct";
}: #style = "kvantum";
{
config = lib.mkIf config.modules.system.roles.desktop.enable {
qt = {
enable = true;
platformTheme = "gtk2";
#platformTheme = "qt5ct";
#style = "kvantum";
};
environment.systemPackages = with pkgs; [
#vimix-icon-theme
#pop-icon-theme
catppuccin-papirus-folders
#catppuccin-kvantum
];
}; };
environment.systemPackages = with pkgs; [
#vimix-icon-theme
#pop-icon-theme
catppuccin-papirus-folders
#catppuccin-kvantum
];
} }

View file

@ -82,8 +82,7 @@ in
serviceConfig = serviceConfigSecurity // { serviceConfig = serviceConfigSecurity // {
ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}"; ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}";
RestartSec = 15; RestartSec = 1;
Restart = "always";
}; };
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];

View file

@ -1,6 +1 @@
{ { imports = [ ./terminal.nix ]; }
imports = [
./terminal.nix
./desktop.nix
];
}

View file

@ -1,9 +0,0 @@
{ lib, ... }:
let
inherit (lib) mkEnableOption;
in
{
options.modules.system.roles.desktop = {
enable = mkEnableOption "desktop usage features";
};
}