profiles/workstation: move sway to the workstation profile

6 files changed, 24 insertions, 36 deletions

diff --git a/home/profiles/workstation.nix b/home/profiles/workstation.nix
index acbbccb..6c589b6 100644
--- a/home/profiles/workstation.nix
+++ b/home/profiles/workstation.nix
@@ -107,7 +107,6 @@ in
     PASSAGE_AGE = "${pkgs.rage}/bin/rage";
   };
 
-
   # enable bluetooth
   services.blueman-applet.enable = true;
 }
diff --git a/hosts/aptos/default.nix b/hosts/aptos/default.nix
index ac71f50..faa4cd8 100644
--- a/hosts/aptos/default.nix
+++ b/hosts/aptos/default.nix
@@ -9,9 +9,6 @@
     "${self}/profiles/hardware/xps9300.nix"
   ];
 
-  # install and configure sway
-  my.programs.sway.enable = true;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/default.nix b/modules/default.nix
index d08b890..b248c51 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 
 {
-  imports = [ ./system ./services ./programs ./secrets ];
+  imports = [ ./system ./services ./secrets ];
 
   options.my = with lib; {
     user = {
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
deleted file mode 100644
index 2de6855..0000000
--- a/modules/programs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  imports = [ ./sway ];
-}
diff --git a/modules/programs/sway/default.nix b/modules/programs/sway/default.nix
deleted file mode 100644
index afb3204..0000000
--- a/modules/programs/sway/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs, config, lib, ... }:
-let cfg = config.my.programs.sway;
-in
-{
-  options.my.programs.sway = with lib; {
-    enable = mkEnableOption "sway configuration";
-  };
-
-  config = lib.mkIf cfg.enable {
-    programs.sway = {
-      enable = true;
-      wrapperFeatures.gtk = true;
-      extraPackages = with pkgs; [
-        brightnessctl
-        polkit_gnome
-        xsettingsd
-        swaylock
-        swayidle
-        wl-clipboard
-      ];
-      extraSessionCommands = ''
-        export MOZ_ENABLE_WAYLAND=1
-      '';
-    };
-  };
-}
diff --git a/profiles/workstation.nix b/profiles/workstation.nix
index 3b422a6..7ed2a3f 100644
--- a/profiles/workstation.nix
+++ b/profiles/workstation.nix
@@ -87,4 +87,27 @@
   # Use systemd-resolved
   services.resolved.enable = true;
   services.resolved.dnssec = "false";
+
+  xdg.portal = {
+    enable = true;
+    wlr.enable = true;
+    extraPortals =
+      [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ];
+  };
+
+  programs.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+    extraPackages = with pkgs; [
+      brightnessctl
+      polkit_gnome
+      xsettingsd
+      swaylock
+      swayidle
+      wl-clipboard
+    ];
+    extraSessionCommands = ''
+      export MOZ_ENABLE_WAYLAND=1
+    '';
+  };
 }