Back to dwl

10 files changed, 31 insertions, 22 deletions

diff --git a/config/dwl.nix b/config/dwl.nix
index 982bde3..b5ecc3b 100644
--- a/config/dwl.nix
+++ b/config/dwl.nix
@@ -5,8 +5,8 @@ let
   dwlb = (pkgs.callPackage ../packages/dwlb.nix {});
 in {
   xdg.portal.enable = true;
-  xdg.portal.configPackages = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-hyprland ];
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-hyprland ];
+  xdg.portal.configPackages = [ pkgs.xdg-desktop-portal pkgs.xdg-desktop-portal-wlr ];
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal pkgs.xdg-desktop-portal-wlr ];
 
   home.packages = [ dwl dwlb ];
 }
diff --git a/config/themes.nix b/config/themes.nix
index 4bea0e9..58d9a6c 100644
--- a/config/themes.nix
+++ b/config/themes.nix
@@ -19,7 +19,7 @@
 
   qt = {
     enable = true;
-    platformTheme = "gtk";
+    platformTheme.name = "gtk";
     style.name = "adwaita-dark";
   };
 }
diff --git a/flake.lock b/flake.lock
index ff39a82..b24e3b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714430505,
-        "narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=",
+        "lastModified": 1714515075,
+        "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d",
+        "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
         "type": "github"
       },
       "original": {
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index 8c77d84..0b18f38 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -12,8 +12,10 @@
     "core/audio.nix"
     "core/bluetooth.nix"
     "core/fonts.nix"
+    "wm_utils.nix"
     "compromyse.nix"
     "login.nix"
+    "polkit.nix"
     "virtualization.nix"
   ]);
 
@@ -30,15 +32,6 @@
   networking.hostName = "x";
 
   home-manager.users.compromyse = import ./home.nix;
-  services.desktopManager.plasma6.enable = true;
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    konsole
-    oxygen
-    ark
-    elisa
-    gwenview
-    kate
-  ];
 
   networking.extraHosts =
   ''
diff --git a/machines/x/home.nix b/machines/x/home.nix
index dee6de3..01785f3 100644
--- a/machines/x/home.nix
+++ b/machines/x/home.nix
@@ -41,6 +41,13 @@ in {
     "dotfiles.nix"
     "git"
     "nvim"
+
+    "dwl.nix"
+    "themes.nix"
+    "way-displays"
+    "swaylock"
+    "dunst"
+
     "alacritty"
   ]);
 
diff --git a/modules/core/bluetooth.nix b/modules/core/bluetooth.nix
index fbd9b48..5e64d97 100644
--- a/modules/core/bluetooth.nix
+++ b/modules/core/bluetooth.nix
@@ -3,5 +3,5 @@
 {
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
-  # services.blueman.enable = true;
+  services.blueman.enable = true;
 }
diff --git a/modules/login.nix b/modules/login.nix
index d995501..15bb46d 100644
--- a/modules/login.nix
+++ b/modules/login.nix
@@ -10,7 +10,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "tuigreet --time --remember --cmd \"startplasma-wayland\"";
+        command = "tuigreet --time --remember --cmd \"dwl -s dwlb\"";
         user = "greeter";
       };
     };
@@ -40,9 +40,9 @@
 
   security.polkit.enable = true;
 
-  /* security.pam.services.swaylock.text = ''
+  security.pam.services.swaylock.text = ''
     auth include login
-  ''; */
+  '';
 
   services.libinput.enable = true;
 
diff --git a/modules/wm_utils.nix b/modules/wm_utils.nix
index 0fb0323..850b29e 100644
--- a/modules/wm_utils.nix
+++ b/modules/wm_utils.nix
@@ -10,5 +10,10 @@
     inotify-tools
 
     wirelesstools
+    pamixer
+    wbg
+    networkmanagerapplet
+
+    sway-launcher-desktop
   ];
 }
diff --git a/packages/dwl.nix b/packages/dwl.nix
index 3a93fc1..d816ced 100644
--- a/packages/dwl.nix
+++ b/packages/dwl.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "compromyse";
     repo = "dwl";
     rev = "master";
-    hash = "sha256-I669/sfrp0IfJ4CTKF0x3qeLX29PIjOGcpb6YfucAaI=";
+    hash = "sha256-5ibgWFc6qnpY2wPCt3bgK8qaHmebFXdKPEz35obSwpc=";
   };
 
   nativeBuildInputs = [
diff --git a/packages/dwlb.nix b/packages/dwlb.nix
index 39e601a..afc72a4 100644
--- a/packages/dwlb.nix
+++ b/packages/dwlb.nix
@@ -7,6 +7,8 @@
 , wayland-protocols
 , pixman
 , fcft
+, gtk4
+, gtk4-layer-shell
 , pkg-config
 , writeText
 }:
@@ -18,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "compromyse";
     repo = "dwlb";
-    rev = "master";
-    hash = "sha256-AI2tkPkr1BSErmDBwreFRaGMjOnmNBi2uEre6uAONPg=";
+    rev = "systray";
+    hash = "sha256-qnAWiU7O4+u0jOp659olCO7f6Pq2kgIK7BLTfnICP0o=";
   };
 
   nativeBuildInputs = [
@@ -33,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     fcft
+    gtk4
+    gtk4-layer-shell
   ];
 
   outputs = [ "out" "man" ];