diff --git a/modules/applications/default.nix b/modules/applications/default.nix index 388d366..c021745 100644 --- a/modules/applications/default.nix +++ b/modules/applications/default.nix @@ -2,6 +2,7 @@ imports = [ ./1password.nix ./emacs.nix + ./dunst.nix ./firefox.nix ./gnome-common.nix ./kitty.nix diff --git a/modules/applications/dunst.nix b/modules/applications/dunst.nix index c81bc86..67068bc 100644 --- a/modules/applications/dunst.nix +++ b/modules/applications/dunst.nix @@ -76,16 +76,14 @@ in with lib; { ''; }; + systemd.user.services.dunst = { enable = true; - description = "Dunst"; - wantedBy = [ "graphical-session.target" ] - ++ optional sway.enable [ "sway-session.target" ]; + description = "Notifications "; + wantedBy = [ "sway-session.target" ]; partOf = [ "graphical-session.target" ]; serviceConfig = { - ExecStart = '' - ${pkgs.dunst}/bin/dunst - ''; + ExecStart = "${pkgs.dunst}/bin/dunst"; RestartSec = 5; Restart = "always"; }; diff --git a/modules/applications/nextcloud.nix b/modules/applications/nextcloud.nix index 3d511c1..3e28a20 100644 --- a/modules/applications/nextcloud.nix +++ b/modules/applications/nextcloud.nix @@ -17,7 +17,7 @@ in with lib; { systemd.user.services = { nextcloud = { Unit = { - Description = "Nextcloud - A slighly more GNU friendly dropbox"; + Description = "Nextcloud - A slightly more GNU friendly dropbox"; BindsTo = [ "graphical-session.target" ]; Wants = [ "graphical-session-pre.target" ]; After = [ "graphical-session-pre.target" ]; @@ -25,6 +25,7 @@ in with lib; { Service = { Type = "simple"; + Description = "Nextcloud - A slightly more GNU friendly dropbox"; ExecStart = "${pkgs.nextcloud-client}/bin/nextclient --background"; Restart = "on-failure"; RestartSec = 1; diff --git a/modules/applications/sway/sway.nix b/modules/applications/sway/sway.nix index 86f1ace..4ccece2 100644 --- a/modules/applications/sway/sway.nix +++ b/modules/applications/sway/sway.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.this.application.sway; + power = config.this.system.power; graphical = config.this.graphical; modifier = "Mod4"; wallpaper = pkgs.fetchurl { diff --git a/modules/system/xdg.nix b/modules/system/xdg.nix index ea04369..c0088ab 100644 --- a/modules/system/xdg.nix +++ b/modules/system/xdg.nix @@ -25,6 +25,5 @@ LESSHISTFILE = "$XDG_CACHE_HOME/lesshst"; WGETRC = "$XDG_CONFIG_HOME/wgetrc"; }; - }; }