home, os: move user pkgs to home

2 files changed, 4 insertions, 41 deletions

diff --git a/os/cez/configuration.nix b/os/cez/configuration.nix
index c7f865d..f8c9dfe 100644
--- a/os/cez/configuration.nix
+++ b/os/cez/configuration.nix
@@ -1,9 +1,6 @@
-{ config, pkgs, ... }:
-
-let
+{ config, pkgs, ... }: let
   user = config.global.userdata.name;
-in
-{
+in {
   imports = [
     ../common/configuration.nix
     ./hardware-configuration.nix
@@ -38,7 +35,6 @@ in
   users.users.${user} = {
     extraGroups = [ "adbusers" ];
     packages = with pkgs; [
-      geoipWithDatabase
       ffmpeg
       (pass.withExtensions (exts: [ exts.pass-otp ]))
     ];
diff --git a/os/cez/modules/wayland.nix b/os/cez/modules/wayland.nix
index 338c585..872c7fb 100644
--- a/os/cez/modules/wayland.nix
+++ b/os/cez/modules/wayland.nix
@@ -6,39 +6,6 @@
   fontPackages = config.global.font.monospace.packages
     ++ config.global.font.sans.packages;
 in {
-  # pkgs
-  environment.systemPackages = with pkgs; [
-    bemenu
-    sway
-    i3status
-    swaylock
-    swayidle
-    swaybg
-    foot
-    wl-clipboard
-    mako
-    xdg-utils
-    libnotify
-  ];
-
-  users.users.${user} = {
-    extraGroups = [ "seat" ];
-    packages = with pkgs; [
-      zathura
-      mpv
-      imv
-      wtype
-      qemu
-      OVMFFull
-      grim
-      slurp
-      tor-browser-bundle-bin
-      element-desktop-wayland
-      pinentry-bemenu
-    ];
-  };
-
-  # font
   fonts = {
     packages = fontPackages;
     enableDefaultPackages = true;
@@ -53,7 +20,7 @@ in {
     };
   };
 
-  # misc
+  users.users.${user}.extraGroups = [ "seat" ];
   services = {
     seatd.enable = true;
     dbus = {
@@ -69,6 +36,6 @@ in {
     };
   };
 
-  security.pam.services.swaylock.text = "auth include login";
+  security.pam.services.swaylock = {};
   hardware.opengl.enable = true;
 }