diff --git a/config/modules/obs.nix b/config/modules/obs.nix index afbcc9a..ba6f309 100644 --- a/config/modules/obs.nix +++ b/config/modules/obs.nix @@ -2,7 +2,12 @@ { modules.obs = settings: { homeManager = - { pkgs, config, ... }: + { + pkgs, + lib, + config, + ... + }: { programs = { obs-studio = { @@ -19,7 +24,7 @@ }; }; systemd.user.services = - pkgs.lib.mkIf settings.virtual_audio_devices { + lib.mkIf settings.virtual_audio_devices { pw-discordaudio-virtual-device = { Install = { WantedBy = [ "hyprland-session.target" ]; diff --git a/config/modules/quickshell/quickshell.nix b/config/modules/quickshell/quickshell.nix index 15998c0..b67da3f 100644 --- a/config/modules/quickshell/quickshell.nix +++ b/config/modules/quickshell/quickshell.nix @@ -9,22 +9,12 @@ ... }: { - home.file.".config/quickshell" = { - recursive = true; - source = config.lib.file.mkOutOfStoreSymlink ./quickshell; - }; - systemd.user.services.quickshell = { - Unit = { - Description = "Quickshell daemon"; - After = [ "hyprland-session.target" ]; - }; - Install = { - WantedBy = [ "default.target" ]; - }; - Service = { - ExecStart = "${pkgs.quickshell}/bin/quickshell"; - Restart = "on-failure"; - RestartSec = "5s"; + programs.quickshell = { + systemd.enable = true; + enable = true; + activeConfig = "main"; + configs = { + main = config.lib.file.mkOutOfStoreSymlink "/home/doloro/dotfiles/config/modules/quickshell/quickshell"; }; }; }; diff --git a/config/modules/quickshell/quickshell/.qmlls.ini b/config/modules/quickshell/quickshell/.qmlls.ini deleted file mode 100644 index e69de29..0000000 diff --git a/config/modules/quickshell/quickshell/.qmlls.ini b/config/modules/quickshell/quickshell/.qmlls.ini new file mode 120000 index 0000000..a6c8b8e --- /dev/null +++ b/config/modules/quickshell/quickshell/.qmlls.ini @@ -0,0 +1 @@ +/run/user/1000/quickshell/vfs/6e389f6b800776b0595d9d90e42ebd04/.qmlls.ini \ No newline at end of file diff --git a/config/modules/quickshell/quickshell/main b/config/modules/quickshell/quickshell/main new file mode 120000 index 0000000..ea9c8ea --- /dev/null +++ b/config/modules/quickshell/quickshell/main @@ -0,0 +1 @@ +/nix/store/ynim9hhkc1smj1h2plrw3ap978dlm3qj-home-manager-files/.config/quickshell/main \ No newline at end of file