diff options
| -rw-r--r-- | home-modules/apps/desktop/default.nix | 9 | ||||
| -rw-r--r-- | home-modules/desktop/hyprland.nix | 45 | ||||
| -rw-r--r-- | hosts/apocalypse/default.nix | 1 | ||||
| -rw-r--r-- | hosts/apocalypse/hardware-configuration.nix | 37 | ||||
| -rw-r--r-- | modules/desktop/akonadi.nix | 8 | ||||
| -rw-r--r-- | modules/desktop/default.nix | 1 | ||||
| -rw-r--r-- | modules/desktop/wms/cosmic.nix | 18 | ||||
| -rw-r--r-- | modules/desktop/wms/default.nix | 1 |
8 files changed, 82 insertions, 38 deletions
diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix index 9a6f0e4..a732ded 100644 --- a/home-modules/apps/desktop/default.nix +++ b/home-modules/apps/desktop/default.nix @@ -67,7 +67,14 @@ in ]; }) (lib.mkIf cfg.note-taking.enable { - home.packages = with pkgs; [ obsidian ]; + home.packages = with pkgs; [ + obsidian + kdePackages.kdepim-runtime + ] ++ (with pkgs.kdePackages; [ + zanshin + kdepim-runtime + akonadi-calendar + ]); # Todo force synthing to be on here }) (lib.mkIf cfg.art.enable { diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index caca14f..80773d4 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -38,7 +38,7 @@ with lib; # Hyprland wayland.windowManager.hyprland = { - systemd.enable = false; + systemd.enable = true; enable = true; xwayland.enable = true; settings = { @@ -252,6 +252,9 @@ with lib; }; }; + systemd.user.services.hyprpaper = { + Install.WantedBy = [ "hyprland-session.target"]; + }; services.hyprpaper = { enable = true; settings = { @@ -301,6 +304,7 @@ with lib; }; services.hyprsunset = { enable = true; + systemdTarget = "hyprland-session.target"; settings = { max-gamma = 140; profile = [ @@ -324,25 +328,28 @@ with lib; }; }; - services.hypridle.enable = true; - services.hypridle.settings = { - general = { - lock_cmd = "pidof hyprlock || hyprlock"; - before_sleep_cmd = "loginctl lock-session"; - ignore_dbus_inhibit = false; - after_sleep_cmd = "hyprctl_dispatch dpms on"; + services.hypridle = { + enable = true; + systemdTarget = "hyprland-session.target"; + settings = { + general = { + lock_cmd = "pidof hyprlock || hyprlock"; + before_sleep_cmd = "loginctl lock-session"; + ignore_dbus_inhibit = false; + after_sleep_cmd = "hyprctl_dispatch dpms on"; + }; + listener = [ + { + timeout = 120; + on-timeout = "hyprlock"; + } + { + timeout = 300; + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; + } + ]; }; - listener = [ - { - timeout = 120; - on-timeout = "hyprlock"; - } - { - timeout = 300; - on-timeout = "hyprctl dispatch dpms off"; - on-resume = "hyprctl dispatch dpms on"; - } - ]; }; }; } diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix index 5e13448..8149611 100644 --- a/hosts/apocalypse/default.nix +++ b/hosts/apocalypse/default.nix @@ -14,6 +14,7 @@ addons = { desktop.hyprland.enable = true; desktop.xfce.enable = true; + desktop.cosmic.enable = true; steam.enable = true; virtualisation.guest = false; diff --git a/hosts/apocalypse/hardware-configuration.nix b/hosts/apocalypse/hardware-configuration.nix index 74b1101..a644cd9 100644 --- a/hosts/apocalypse/hardware-configuration.nix +++ b/hosts/apocalypse/hardware-configuration.nix @@ -144,23 +144,24 @@ # Copied from nix wiki to save on battery life. services.tlp = { - enable = true; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 20; - - #Optional helps save long term battery health - START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge - STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging - - }; + enable = false; }; + # settings = { + # CPU_SCALING_GOVERNOR_ON_AC = "performance"; + # CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + # + # CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + # CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + # + # CPU_MIN_PERF_ON_AC = 0; + # CPU_MAX_PERF_ON_AC = 100; + # CPU_MIN_PERF_ON_BAT = 0; + # CPU_MAX_PERF_ON_BAT = 20; + # + # #Optional helps save long term battery health + # START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge + # STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging + # + # }; + # }; } diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix new file mode 100644 index 0000000..93006b2 --- /dev/null +++ b/modules/desktop/akonadi.nix @@ -0,0 +1,8 @@ +{pkgs, config, ...}: { + programs.kde-pim = { + enable = true; + kmail = false; + merkuro = false; + kontact = false; + }; +} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 2cfe5bf..de32b42 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -22,6 +22,7 @@ in ./wayland.nix ./wms ./steam.nix + ./akonadi.nix ]; options.addons.desktop = with types; { wmMeta = mkOption { diff --git a/modules/desktop/wms/cosmic.nix b/modules/desktop/wms/cosmic.nix new file mode 100644 index 0000000..6f7c29e --- /dev/null +++ b/modules/desktop/wms/cosmic.nix @@ -0,0 +1,18 @@ +{pkgs, config, lib, ... }: let + cfg = config.addons.desktop.cosmic; +in { + options.addons.desktop.cosmic = { + enable = lib.mkEnableOption "Enable Cosmic WM"; + enableScheduler = lib.mkEnableOption "Enable the special scheduler from system76"; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + (import ../../../utils/makeWm.nix "Cosmic WM" "wayland") + { + services.desktopManager.cosmic.enable = true; + services.system76-scheduler.enable = cfg.enableScheduler; + } + ] + ); +} diff --git a/modules/desktop/wms/default.nix b/modules/desktop/wms/default.nix index 9f7a18d..ea6b61e 100644 --- a/modules/desktop/wms/default.nix +++ b/modules/desktop/wms/default.nix @@ -3,5 +3,6 @@ imports = [ ./hyprland.nix ./xfce.nix + ./cosmic.nix ]; } |