Fixed sway, waybar, xdg and pass

hosts/pbp/configuration.nix

@@ -1,12 +1,12 @@
 { config, lib, pkgs, profiles, pbpKernelLatest, ... }:
 
 {
-  imports = with profiles; [ mount-nas sshd dbus ];
+  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg ];
 
   boot = {
     initrd.availableKernelModules = [ "usbhid" ];
     kernelPackages = pbpKernelLatest;
-    kernelModules = [ ];
+    kernelModules = [];
     extraModulePackages = with config.boot.kernelPackages; [
       v4l2loopback
     ];
@@ -45,7 +45,7 @@
   };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/e236d328-496e-4cf8-ba54-857789ca258f"; }];
+    [ { device = "/dev/disk/by-uuid/e236d328-496e-4cf8-ba54-857789ca258f"; } ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 }

hosts/pc/configuration.nix

@@ -1,11 +1,11 @@
 { config, lib, pkgs, profiles, ... }:
 
 {
-  imports = with profiles; [ mount-nas sshd dbus avahi printing ];
+  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg ];
 
   boot = {
     initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    initrd.kernelModules = [ ];
+    initrd.kernelModules = [];
     kernelModules = [ "kvm-intel" ];
     extraModulePackages = with config.boot.kernelPackages; [
       v4l2loopback
@@ -41,7 +41,7 @@
     };
 
   swapDevices =
-    [{ device = "/dev/disk/by-label/swap"; }];
+    [ { device = "/dev/disk/by-label/swap"; } ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

profiles/core/default.nix

@@ -46,10 +46,6 @@ in
   time.timeZone = "Europe/Rome";
   location.provider = "geoclue2";
 
-  xdg.portal.enable = true; # is this needed?
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ];
-  xdg.portal.gtkUsePortal = true;
-
   nix = {
     autoOptimiseStore = true;
     gc.automatic = true;

profiles/xdg/default.nix

@@ -0,0 +1,11 @@
+{
+  xdg.portal.enable = true;
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ];
+  xdg.portal.gtkUsePortal = true;
+  services.pipewire.enable = true;
+  environment.sessionVariables = {
+    MOZ_ENABLE_WAYLAND = "1";
+    XDG_CURRENT_DESKTOP = "sway"; # https://github.com/emersion/xdg-desktop-portal-wlr/issues/20
+    XDG_SESSION_TYPE = "wayland"; # https://github.com/emersion/xdg-desktop-portal-wlr/pull/11
+  };
+}

secrets/.gitattributes

@@ -1,4 +0,0 @@
-* filter=git-crypt diff=git-crypt
-.gitattributes !filter !diff
-secrets.nix !filter !diff
-README.md !filter !diff

secrets/secrets.nix

@@ -1,9 +0,0 @@
-let
-  # set ssh public keys here for your system and user
-  system = "";
-  user = "";
-  allKeys = [ system user ];
-in
-{
-  "secret.age".publicKeys = allKeys;
-}

users/profiles/foot/default.nix

@@ -1,7 +1,7 @@
 {
   programs.foot = {
     enable = true;
-    server.enable = true;
+    server.enable = false; # server is executed by sway without systemd integration
     settings = {
       main = {
         term = "xterm-256color";
@@ -14,5 +14,6 @@
         hide-when-typing = "yes";
       };
     };
+
   };
 }

users/profiles/password-store/default.nix

@@ -1,5 +1,9 @@
 {
-  services.pass-secret-service.enable = true;
   services.password-store-sync.enable = true;
-  programs.password-store.enable = true;
+  programs.password-store = {
+    enable = true;
+    settings = {
+      PASSWORD_STORE_DIR = "/home/ccr/.password-store";
+    };
+  };
 }

users/profiles/sway/default.nix

@@ -6,47 +6,47 @@
       let
         modifier = "Mod4";
       in
-      {
-        enable = true;
-        config = {
-          modifier = modifier;
-          menu = "${pkgs.bemenu}/bin/bemenu-run -b -m 1 -p 'λ'";
-          output = {
-            HDMI-A-2 = {
-              #bg = "~/dotfiles/dotfiles/xorg/wallpaper.jpg fill";
-            };
-          };
-          #fonts = [ "Font Awesome" "Fira Code" ];
-          terminal = "${pkgs.foot}/bin/footclient";
-          bars = [
-            {
-              command = "${pkgs.waybar}/bin/waybar";
-            }
-          ];
-          #startup = [{
-          #command = "systemctl --user restart redshift";
-          # always = true;
-          #}];
-          window.commands = [
-            { criteria = { app_id = "mpv"; }; command = "sticky enable"; }
-            { criteria = { app_id = "mpv"; }; command = "floating enable"; }
-            { criteria = { title = "MetaMask Notification.*"; }; command = "floating enable"; }
-          ];
-          input = {
-            "*" = {
-              xkb_layout = "us";
-              xkb_variant = "intl";
+        {
+          enable = true;
+          config = {
+            modifier = modifier;
+            menu = "${pkgs.bemenu}/bin/bemenu-run -b -m 1 -p 'λ'";
+            output = {
+              HDMI-A-2 = {
+                #bg = "~/dotfiles/dotfiles/xorg/wallpaper.jpg fill";
+              };
+            };
+            #fonts = [ "Font Awesome" "Fira Code" ];
+            terminal = "${pkgs.foot}/bin/footclient";
+            bars = [
+              {
+                command = "${pkgs.waybar}/bin/waybar";
+              }
+            ];
+            startup = [
+              {
+                command = "foot --server";
+                always = true;
+              }
+            ];
+            window.commands = [
+              { criteria = { app_id = "mpv"; }; command = "sticky enable"; }
+              { criteria = { app_id = "mpv"; }; command = "floating enable"; }
+              { criteria = { title = "MetaMask Notification.*"; }; command = "floating enable"; }
+            ];
+            input = {
+              "*" = {
+                xkb_layout = "us";
+                xkb_variant = "intl";
+              };
             };
           };
+          extraConfig = ''
+            bindsym ${modifier}+p move workspace to output right
+          '';
+          xwayland = true;
+          systemdIntegration = true;
         };
-        extraConfig = ''
-          bindsym ${modifier}+p move workspace to output right
-          #exec systemctl --user import-environment
-          #exec systemctl --user start graphical-session.target
-        '';
-        xwayland = true;
-        systemdIntegration = true;
-      };
   };
 
   programs.waybar = {
@@ -62,7 +62,7 @@
           "sway/mode"
           "sway/workspaces"
         ];
-        modules-center = [ ];
+        modules-center = [];
         modules-right = [
           "idle_inhibitor"
           "tray"

users/profiles/zsh/default.nix

@@ -54,5 +54,6 @@
       NIX_BUILD_SHELL = "${pkgs.zsh-nix-shell}/scripts/buildShellShim.zsh";
       PROMPT = "\\\${IN_NIX_SHELL:+[nix-shell] }$PROMPT";
     };
+    loginExtra = "[[ -z $DISPLAY && $TTY = /dev/tty1 ]] && exec sway";
   };
 }