diff --git a/nix/os/devices/steveej-t14/pkg.nix b/nix/os/devices/steveej-t14/pkg.nix index 621dc8c..7f16eac 100644 --- a/nix/os/devices/steveej-t14/pkg.nix +++ b/nix/os/devices/steveej-t14/pkg.nix @@ -1,4 +1,10 @@ -{pkgs, lib, repoFlake, nodeFlake, ...}: { +{ + pkgs, + lib, + repoFlake, + nodeFlake, + ... +}: { home-manager.users.steveej = _: { imports = [ ../../../home-manager/configuration/graphical-fullblown.nix @@ -19,37 +25,36 @@ }; # TODO: fix the following errors with regreet - # + # # Failed to create /var/empty/.cache for shader cache (Operation not permitted)---disabling. # amdgpu: amdgpu_cs_ctx_create2 failed. (-13) # Failed to create /var/empty/.cache for shader cache (Operation not permitted)---disabling. # ERROR: Couldn't create log file '/var/log/regreet/log': Permission denied (os error 13) # 2023-05-22T10:31:42.52900769+02:00 WARN regreet::tomlutils: Missing TOML file: /var/cache/regreet/cache.toml # 2023-05-22T10:31:42.52902325+02:00 WARN regreet::tomlutils: Missing TOML file: /etc/greetd/regreet.toml - # + # # (regreet:505614): Gtk-WARNING **: 10:31:42.532: Theme parser warning: :6:17-18: Empty declaration # Failed to create /var/empty/.cache for shader cache (Operation not permitted)---disabling. - services.greetd = - let - # exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l; swaymsg exit" - swayConfig = pkgs.writeText "greetd-sway-config" '' - # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet. - exec "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK; ${pkgs.greetd.regreet}/bin/regreet; swaymsg exit" - bindsym Mod4+shift+e exec swaynag \ - -t warning \ - -m 'What do you want to do?' \ - -b 'Poweroff' 'systemctl poweroff' \ - -b 'Reboot' 'systemctl reboot' - ''; - in { - enable = false; - settings = { - vt = 1; - default_session = { - command = "${pkgs.sway}/bin/sway --config ${swayConfig}"; - }; + services.greetd = let + # exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l; swaymsg exit" + swayConfig = pkgs.writeText "greetd-sway-config" '' + # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet. + exec "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK; ${pkgs.greetd.regreet}/bin/regreet; swaymsg exit" + bindsym Mod4+shift+e exec swaynag \ + -t warning \ + -m 'What do you want to do?' \ + -b 'Poweroff' 'systemctl poweroff' \ + -b 'Reboot' 'systemctl reboot' + ''; + in { + enable = false; + settings = { + vt = 1; + default_session = { + command = "${pkgs.sway}/bin/sway --config ${swayConfig}"; }; }; + }; environment.etc."greetd/environments".text = '' sway @@ -68,7 +73,7 @@ # # monospace = { family = "Jetbrains Mono"; package = pkgs.jetbrains-mono; }; # fallback = { family = "Font Awesome 5 Free"; package = pkgs.font-awesome; }; # emoji = { family = "Noto Color Emoji"; package = pkgs.noto-fonts-emoji; }; - # + # # allPackages = (map (p: p.package) # [ # default @@ -115,7 +120,7 @@ # required by swaywm security.polkit.enable = true; - security.pam.services.swaylock = { }; + security.pam.services.swaylock = {}; # test these on https://mozilla.github.io/webrtc-landing/gum_test.html xdg.portal = { @@ -129,7 +134,7 @@ pkgs.xdg-desktop-portal-gtk # repoFlake.inputs.nixpkgs-wayland.packages.${pkgs.system}.xdg-desktop-portal-wlr - # (pkgs.xdg-desktop-portal-gtk.override (_: { + # (pkgs.xdg-desktop-portal-gtk.override (_: { # buildPortalsInGnome = false; # })) ];