diff --git a/flake.nix b/flake.nix index 1d7811b..98ca789 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ user = user; hostName = hostName; firewall = { - enable = true; + enable = false; }; enableCore = true; enableFonts = true; @@ -57,6 +57,7 @@ ./modules/optional/x11.nix # still needed for things like lightdm ./modules/optional/wayland.nix ./modules/optional/kde.nix + ./modules/optional/sway.nix (import ./modules/optional/home-manager-config.nix { user = user; hostName = hostName; diff --git a/modules/optional/hyprland.nix b/modules/optional/hyprland.nix index 18585fb..0a281ca 100644 --- a/modules/optional/hyprland.nix +++ b/modules/optional/hyprland.nix @@ -7,7 +7,7 @@ environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; - programs.waybar.enable = true; + programs.waybar.enable = false; environment.systemPackages = with pkgs; [ # common utilities busybox @@ -26,10 +26,28 @@ lxqt.lxqt-policykit xdg-desktop-portal-gtk xdg-desktop-portal-hyprland + hyprlock + hypridle + hyprpaper + # color picker + hyprpicker + # nwg-shell + nwg-dock-hyprland + nwg-launchers + nwg-displays + nwg-drawer + nwg-panel + gopsuinfo + nwg-look + nwg-menu + nwg-bar # screenshots + ## old grim swappy slurp + ## new + hyprshot # networking networkmanagerapplet # waybar diff --git a/modules/optional/kde.nix b/modules/optional/kde.nix index 558958c..d812e5b 100644 --- a/modules/optional/kde.nix +++ b/modules/optional/kde.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; + # services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; programs.dconf.enable = true; } diff --git a/modules/optional/sway.nix b/modules/optional/sway.nix new file mode 100644 index 0000000..d6a6bd6 --- /dev/null +++ b/modules/optional/sway.nix @@ -0,0 +1,19 @@ +{ user }: +{ pkgs, ... }: +{ + environment.sessionVariables = { + NIXOS_OZONE_WL = "1"; + }; + programs.sway.enable = false; + programs.sway.wrapperFeature.base = true; + programs.sway.wrapperFeature.gtk = true; + environment.systemPackages = with pkgs; [ + + ]; + services.mpd.enable = true; + programs.kdeconnect.enable = true; + services.pipewire.wireplumber.enable = true; + users.users.${user.name}.extraGroups = [ + "input" + ]; +}