From f72bb6b51e68b1062b333143ab0dfcc9a57fafc0 Mon Sep 17 00:00:00 2001 From: sefidel Date: Wed, 2 Feb 2022 23:26:42 +0900 Subject: chore: move sway packages to home-manager --- home/profiles/base/default.nix | 22 ++++++++++++++++++++++ nixos/alpha/configuration.nix | 22 ++-------------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index 4af56cd..ab84648 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -65,8 +65,25 @@ in home.keyboard.layout = "us"; home.packages = [ + # Sway + pkgs.autotiling + pkgs.swaylock-effects + pkgs.swayidle + pkgs.swaybg + pkgs.wayland-utils + pkgs.wl-clipboard + pkgs.grim + pkgs.slurp + pkgs.sway-contrib.grimshot + pkgs.waybar + pkgs.bemenu + pkgs.qt5.qtwayland + pkgs.xdg_utils + + # Normal pkgs.bottom pkgs.hydra-check + pkgs.libnotify pkgs.nix-tree pkgs.procs pkgs.sops @@ -78,6 +95,11 @@ in wayland.windowManager.sway = { enable = true; + wrapperFeatures = { + base = true; + gtk = true; + }; + config = { bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; keybindings = { }; diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix index f75b254..1ebddb3 100644 --- a/nixos/alpha/configuration.nix +++ b/nixos/alpha/configuration.nix @@ -175,26 +175,8 @@ }; programs = { - sway = { - enable = true; - wrapperFeatures.gtk = true; - - extraPackages = with pkgs; [ - autotiling - swaylock - swayidle - swaybg - wayland-utils - wl-clipboard - grim - slurp - sway-contrib.grimshot - waybar - bemenu - qt5.qtwayland - xdg_utils - ]; - }; + sway.enable = true; + sway.extraPackages = lib.mkForce []; zsh.enable = true; zsh.enableCompletion = false; -- cgit 1.4.1