diff --git a/Vanguard.nix b/Vanguard.nix index b027ff6a..d2d65f07 100644 --- a/Vanguard.nix +++ b/Vanguard.nix @@ -5,7 +5,7 @@ ./hardware/audio.nix ./hardware/bluetooth.nix ./locales/en_GB.nix - ./desktop/plasma.nix + ./desktop/sddm.nix ./desktop/hyprland.nix ./desktop/steam.nix ./syncthing/Vanguard.nix @@ -23,6 +23,7 @@ allowedTCPPorts = [22]; }; + services.xserver.displayManager.defaultSession = "hyprland"; users.users.xenia = { isNormalUser = true; description = "Evie Litherland-Smith"; diff --git a/desktop/sddm.nix b/desktop/sddm.nix index aac45090..322f69ab 100644 --- a/desktop/sddm.nix +++ b/desktop/sddm.nix @@ -1,6 +1,7 @@ {pkgs, ...}: let sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato {}; in { + imports = [./xserver.nix]; environment.systemPackages = [ sddm-catppuccin-macchiato.sddm-catppuccin-macchiato ]; diff --git a/home/Vanguard/xenia.nix b/home/Vanguard/xenia.nix index 0263647e..835874a8 100644 --- a/home/Vanguard/xenia.nix +++ b/home/Vanguard/xenia.nix @@ -11,18 +11,10 @@ xdg.configFile."hypr/hyprpaper.conf".source = ../desktop/config/hypr/hyprpaper-Vanguard.conf; wayland.windowManager.hyprland.extraConfig = '' source=./common.conf - misc { vrr = 2 } - - monitor=DP-1,highrr,auto,1 - monitor=HDMI-A-1,highres,auto,2 - monitor=HDMI-A-2,highrr,auto,1 - monitor=,auto,auto,1 - - exec-once = hyprpaper - exec-once = waybar + monitor=DP-2,highrr,auto,1 ''; programs.waybar = { style = '' diff --git a/home/gui/kdeconnect.nix b/home/gui/kdeconnect.nix new file mode 100644 index 00000000..cff771e6 --- /dev/null +++ b/home/gui/kdeconnect.nix @@ -0,0 +1,6 @@ +{...}: { + services.kdeconnect = { + enable = true; + indicator = true; + }; +} diff --git a/home/personal.nix b/home/personal.nix index bd51403c..fbec812f 100644 --- a/home/personal.nix +++ b/home/personal.nix @@ -3,6 +3,7 @@ ./common.nix ./env ./gui + ./gui/kdeconnect.nix ./tui ./git/personal.nix ./ssh/personal.nix @@ -10,5 +11,6 @@ home.packages = with pkgs; [ discord element-desktop + qbittorrent ]; }