diff --git a/bin/lyte-nixos-cleanup b/bin/lyte-nixos-cleanup index 5fc33cb..91a4f8c 100755 --- a/bin/lyte-nixos-cleanup +++ b/bin/lyte-nixos-cleanup @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# TODO: use nix-shell because it's cool? -nix-collect-garbage -d +sudo nix-collect-garbage -d +sudo nixos-rebuild switch diff --git a/env/common/machines/laptop/sway/main b/env/common/machines/laptop/sway/main index d3fc88e..a408e6e 100644 --- a/env/common/machines/laptop/sway/main +++ b/env/common/machines/laptop/sway/main @@ -1,4 +1,6 @@ exec libinput-gestures -c $HOME/.config/lytedev-dotfiles/apps/de/libinput/sway-gestures.conf +exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK DBUS_SESSION_BUS_ADDRESS +exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK DBUS_SESSION_BUS_ADDRESS bindswitch lid:toggle exec swaylock input type:keyboard { xkb_options ctrl:nocaps diff --git a/env/nix/modules/de/gnome.nix b/env/nix/modules/de/gnome.nix index 4fcb58a..02893fd 100644 --- a/env/nix/modules/de/gnome.nix +++ b/env/nix/modules/de/gnome.nix @@ -9,6 +9,7 @@ in { services = { pipewire.enable = true; xserver = { + desktopManager.gnome3.enable = true; libinput = { enable = true; tapping = true; diff --git a/env/nix/modules/de/sway.nix b/env/nix/modules/de/sway.nix index 2c2d381..832c709 100644 --- a/env/nix/modules/de/sway.nix +++ b/env/nix/modules/de/sway.nix @@ -11,6 +11,7 @@ in { sway = { enable = true; extraPackages = with pkgs; [ + unstable.pipewire swaylock swayidle unstable.mako unstable.libnotify diff --git a/env/nix/modules/users/daniel.nix b/env/nix/modules/users/daniel.nix index 85d1f28..4de9e0d 100644 --- a/env/nix/modules/users/daniel.nix +++ b/env/nix/modules/users/daniel.nix @@ -36,12 +36,13 @@ mpd # music player daemon ncmpcpp # ncurses music player client vlc # video player + google-chrome # sometimes ya gotta screenshare # TODO: work module? google-cloud-sdk # gcloud kubectl # kubernetes cli awscli # aws cli - zoom # video conferencing + zoom-us # video conferencing lastpass-cli # TODO: move this one to just laptop?