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

7 files changed, 113 insertions, 46 deletions

diff --git a/common/default.nix b/common/default.nix
index b5ad77c..8baaf5c 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -4,12 +4,14 @@
   home-manager,
   nixvim,
   webtray,
+  wofi-pass,
   ...
 }:
 {
   imports = [
     home-manager.nixosModules.default
     webtray.outputs.nixosModules.default
+    wofi-pass.outputs.nixosModules.default
   ];
 
   environment.systemPackages = with pkgs; [
@@ -49,8 +51,15 @@
 
   hardware.bluetooth.enable = true;
 
-  environment.shellAliases = {
-    dmenu-wl = "wofi --show dmenu";
+  xdg.portal = {
+    enable = true;
+    config = {
+      common = {
+        default = [ "hyprland" ];
+      };
+    };
+    configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
+    extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
   };
 
   nix.settings.experimental-features = [
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"
+  '';
+}
diff --git a/common/services/default.nix b/common/services/default.nix
index 2b1b73a..bc1c9ec 100644
--- a/common/services/default.nix
+++ b/common/services/default.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 let
   services = [
-    "greetd"
     "pipewire"
+    "greetd"
   ];
 in
 builtins.listToAttrs (
diff --git a/flake.lock b/flake.lock
index 7369ee3..4cef719 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725513492,
-        "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
+        "lastModified": 1726745158,
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
         "type": "github"
       },
       "original": {
@@ -133,11 +133,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726592409,
-        "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
+        "lastModified": 1726818100,
+        "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
+        "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726357542,
-        "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
+        "lastModified": 1726825546,
+        "narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
+        "rev": "0b052dd8119005c6ba819db48bcc657e48f401b7",
         "type": "github"
       },
       "original": {
@@ -176,11 +176,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726188813,
-        "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
+        "lastModified": 1726742753,
+        "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
+        "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726447378,
-        "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
+        "lastModified": 1726838390,
+        "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
+        "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1726463316,
-        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
+        "lastModified": 1726755586,
+        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
+        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
         "type": "github"
       },
       "original": {
@@ -236,11 +236,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1726752344,
-        "narHash": "sha256-lMFX1T1NiZ23wVFQKdAcGzt3phrmp808s970TsSwWeY=",
+        "lastModified": 1726846628,
+        "narHash": "sha256-0CH44sEwiljiN2q7eIFCvabyUm1WeEiF8ofP/z5ca0Q=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2df1bdd14d564235a55552dfc6a9dd5018cbad9b",
+        "rev": "3211ce356be612ae89a38c60799992bde8a47127",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726392886,
-        "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
+        "lastModified": 1726816132,
+        "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
+        "rev": "7733a39a1321057172d87e6251ded7cdeb67171e",
         "type": "github"
       },
       "original": {
@@ -277,7 +277,8 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
-        "webtray": "webtray"
+        "webtray": "webtray",
+        "wofi-pass": "wofi-pass"
       }
     },
     "systems": {
@@ -303,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725271838,
-        "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
+        "lastModified": 1726734507,
+        "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
+        "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
         "type": "github"
       },
       "original": {
@@ -323,11 +324,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726525937,
-        "narHash": "sha256-2MBwb5p/J8rYUV915ibWBRTQZfIwQcppDd/vopFjZZQ=",
+        "lastModified": 1726916137,
+        "narHash": "sha256-isknI2AkrBdV6Bkbm/ytbBYbm0motJvB9wPqT1sSO1k=",
         "ref": "refs/heads/master",
-        "rev": "5756b833718d8b7bc8db378dd9dbebc52aa61220",
-        "revCount": 28,
+        "rev": "21afec7d459855808444ef8157a2249b2fb2782c",
+        "revCount": 33,
         "type": "git",
         "url": "https://git.nathanreiner.xyz/webtray"
       },
@@ -335,6 +336,26 @@
         "type": "git",
         "url": "https://git.nathanreiner.xyz/webtray"
       }
+    },
+    "wofi-pass": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726842078,
+        "narHash": "sha256-KBl1YlZNpM2UXh+52Mu05l5WnFKrGB9rxwKUTbch6cA=",
+        "ref": "refs/heads/master",
+        "rev": "e0def1ed8657c2289493b77fcc06f54f0dfe1fae",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://git.nathanreiner.xyz/wofi-pass"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.nathanreiner.xyz/wofi-pass"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 97fd726..038eea2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,10 @@
       url = "git+https://git.nathanreiner.xyz/webtray";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    wofi-pass = {
+      url = "git+https://git.nathanreiner.xyz/wofi-pass";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =