diff --git a/modules/audio/default.nix b/modules/audio/default.nix index 7bd8c07..5063f48 100644 --- a/modules/audio/default.nix +++ b/modules/audio/default.nix @@ -96,7 +96,7 @@ in description = "Link virtual PipeWire sinks"; wantedBy = [ "graphical-session.target" ]; - wants = [ + requires = [ "pipewire.service" "wireplumber.service" ]; @@ -106,7 +106,7 @@ in ]; serviceConfig = { - Type = "oneshot"; + Type = "simple"; ExecStart = "${linkSinksScript}/bin/link-virtual-sinks"; RemainAfterExit = true; }; diff --git a/modules/base.nix b/modules/base.nix index b157640..ab2b612 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -50,7 +50,7 @@ vim ]; - # TODO: use home-manager + # TODO: switch to home manager # home-manager = { # useGlobalPkgs = true; # useUserPackages = true; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index ff963fc..d4afbd0 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,10 +1,18 @@ { pkgs, inputs, ... }: { - services.displayManager.sddm.enable = true; # TODO: look into ly/greetd/something less heavy - services.displayManager.autoLogin = { - enable = true; - user = "djai"; + services.displayManager = { + ly = { + enable = true; + x11Suport = false; + }; + + autoLogin = { + enable = true; + user = "djai"; + }; + + defaultSession = "hyprland-uwsm"; # TODO: might be wrong }; # note that we set the videodrivers on a per-host basis, so not here. @@ -69,7 +77,6 @@ swaybg ]; - # TODO: qt theming qt = { enable = true; platformTheme = "qt5ct"; # might have to go back to gnome if this makes kdenlive crash @@ -109,7 +116,7 @@ extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; }; - # TODO: start using home manager + # TODO: switch to using home manager # home-manager.users.djai = { # imports = [ ./hyprland.nix ]; # loogat husseins dots for inspo # diff --git a/modules/locale.nix b/modules/locale.nix index 85b9cc0..4ab0adc 100644 --- a/modules/locale.nix +++ b/modules/locale.nix @@ -3,7 +3,6 @@ { time.timeZone = "Europe/Amsterdam"; - # TODO: copy locale settings from tuxcomp i18n.defaultLocale = "en_GB.UTF-8"; i18n.extraLocaleSettings = {