Merge branch 'master' of https://git.nathanreiner.xyz/nix/system

3 files changed, 44 insertions, 11 deletions

diff --git a/common/home/default.nix b/common/home/default.nix
index 4e341ba..44b562c 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -13,6 +13,7 @@ let
     "hyprlock"
     "waybar"
     "zsh"
+    "bash"
     "btop"
     "wofi"
     "password-store"
@@ -23,6 +24,7 @@ let
     "msmtp"
     "direnv"
     "zathura"
+    "mpv"
   ];
   services = [
     "syncthing"
@@ -32,12 +34,14 @@ let
     "mbsync"
   ];
   packages = [
+    pkgs.pinentry-qt
     pkgs.networkmanagerapplet
     pkgs.pavucontrol
     pkgs.wl-clipboard
     pkgs.virt-manager
     pkgs.wev
     pkgs.signal-desktop
+    pkgs.unzip
   ];
 in
 {
@@ -110,22 +114,38 @@ in
       };
     };
 
-    xdg.userDirs = {
-      enable = true;
-      download = "${config.home-manager.users.n8.home.homeDirectory}";
-      desktop = null;
-      documents = "${config.home-manager.users.n8.home.homeDirectory}/global/docs";
-      music = "${config.home-manager.users.n8.home.homeDirectory}/global/media/audio";
-      pictures = "${config.home-manager.users.n8.home.homeDirectory}/global/media/photos";
-      publicShare = null;
-      templates = null;
-      videos = "${config.home-manager.users.n8.home.homeDirectory}/global/media/videos";
+    xdg = {
+      portal = {
+        enable = true;
+        xdgOpenUsePortal = true;
+        config = {
+          common = {
+            default = [ "hyprland" ];
+          };
+        };
+        configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
+        extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
+      };
+
+      userDirs = {
+        enable = true;
+        download = "${config.home-manager.users.n8.home.homeDirectory}";
+        desktop = null;
+        documents = "${config.home-manager.users.n8.home.homeDirectory}/global/docs";
+        music = "${config.home-manager.users.n8.home.homeDirectory}/global/media/audio";
+        pictures = "${config.home-manager.users.n8.home.homeDirectory}/global/media/photos";
+        publicShare = null;
+        templates = null;
+        videos = "${config.home-manager.users.n8.home.homeDirectory}/global/media/videos";
+      };
     };
 
     home.stateVersion = "24.05";
 
   };
 
+  useGlobalPkgs = true;
+  useUserPackages = true;
   backupFileExtension = "backup";
   sharedModules = [ nixvim.homeManagerModules.nixvim ];
 }
diff --git a/common/home/hyprland/default.nix b/common/home/hyprland/default.nix
index 9d9749f..0cef02b 100644
--- a/common/home/hyprland/default.nix
+++ b/common/home/hyprland/default.nix
@@ -1,6 +1,9 @@
 {
   enable = true;
-  systemd.variables = [ "--all" ];
+  systemd = {
+    enable = true;
+    variables = [ "--all" ];
+  };
   xwayland.enable = true;
   settings = {
     "$mod" = "SUPER";
@@ -8,6 +11,8 @@
       "$mod+Shift, Return, exec, alacritty"
       "$mod+Shift, Q, exit"
       "$mod+Shift, B, exec, firefox"
+      "$mod+Shift, P, exec, wofi-pass"
+      "$mod+Shift, O, exec, wofi-pass otp"
       "$mod, Escape, exec, hyprlock"
       "$mod, Space, exec, wofi --show run"
       "$mod, C, killactive,"
diff --git a/common/home/programs/bash/default.nix b/common/home/programs/bash/default.nix
new file mode 100644
index 0000000..31677af
--- /dev/null
+++ b/common/home/programs/bash/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+  enable = true;
+
+  bashrcExtra = ''
+    . "/home/n8/.nix-profile/etc/profile.d/hm-session-vars.sh"
+  '';
+}