From 6402e70d2301d488a49d5759f2f15022817f8c0a Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Thu, 22 Aug 2024 10:08:28 -0400
Subject: [PATCH] add bitwarden-rofi

---
 flake.nix                       |   4 +-
 lib/systems.nix                 |  17 +++++-
 modules/base.nix                |   3 +-
 pkgs/bitwarden-rofi/default.nix |   2 +-
 users/alice/non-server.nix      | 102 +++++++++++++++++---------------
 5 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0f0e4ba..e5e2f4b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -153,7 +153,7 @@
       hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; };
       formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
 
-      nixosConfigurations = genSystems inputs src (src + "/systems");
+      nixosConfigurations = genSystems inputs outputs src (src + "/systems");
       images = {
         install-iso = getImages nixosConfigurations "install-iso";
         iso = getImages nixosConfigurations "iso";
@@ -164,7 +164,7 @@
       devShells = import ./shell.nix { inherit inputs forEachSystem checks; };
 
       packages.bitwarden-rofi =
-        inputs.nixpkgs.legacyPackages.x86-64_linux.callPackage ./pkgs/bitwarden-rofi
+        inputs.nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/bitwarden-rofi
           { };
     };
 }
diff --git a/lib/systems.nix b/lib/systems.nix
index 656bc20..a3188f2 100644
--- a/lib/systems.nix
+++ b/lib/systems.nix
@@ -149,6 +149,7 @@ rec {
       configPath,
       hostname,
       inputs,
+      outputs,
       src,
       users,
       home ? true,
@@ -160,7 +161,12 @@ rec {
     lib.nixosSystem {
       inherit system;
       specialArgs = {
-        inherit inputs server system;
+        inherit
+          inputs
+          outputs
+          server
+          system
+          ;
       };
       modules =
         [
@@ -194,7 +200,7 @@ rec {
   # type:
   # genSystems :: AttrSet -> Path -> Path -> AttrSet
   genSystems =
-    inputs: src: path:
+    inputs: outputs: src: path:
     builtins.listToAttrs (
       map (
         name:
@@ -205,7 +211,12 @@ rec {
           inherit name;
           value = constructSystem (
             {
-              inherit inputs src configPath;
+              inherit
+                inputs
+                outputs
+                src
+                configPath
+                ;
               hostname = name;
             }
             // import configPath { inherit inputs; }
diff --git a/modules/base.nix b/modules/base.nix
index 85d886b..d9882ba 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -1,6 +1,7 @@
 {
   lib,
   inputs,
+  outputs,
   server,
   system,
   ...
@@ -26,7 +27,7 @@
     useUserPackages = true;
     sharedModules = [ inputs.sops-nix.homeManagerModules.sops ];
     extraSpecialArgs = {
-      inherit inputs;
+      inherit inputs outputs;
       machineConfig = {
         inherit server system;
       };
diff --git a/pkgs/bitwarden-rofi/default.nix b/pkgs/bitwarden-rofi/default.nix
index c99fdc8..50c49bc 100644
--- a/pkgs/bitwarden-rofi/default.nix
+++ b/pkgs/bitwarden-rofi/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     owner = "mattydebie";
     repo = "bitwarden-rofi";
     rev = "8be76fdd647c2bdee064e52603331d8e6ed5e8e2";
-    sha256 = "";
+    sha256 = "1h5d21kv8g5g725chn3n0i1frvmsrk3pm67lfxqcg50kympg0wwd";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/users/alice/non-server.nix b/users/alice/non-server.nix
index b171b2d..d4421ef 100644
--- a/users/alice/non-server.nix
+++ b/users/alice/non-server.nix
@@ -1,62 +1,66 @@
-{ pkgs, ... }:
+{ pkgs, outputs, ... }:
 
 {
   programs.emacs = {
     enable = true;
     package = pkgs.emacs29-pgtk;
   };
-  home.packages = with pkgs; [
-    cmake
-    shellcheck
-    glslang
-    pipenv
-    python312Packages.isort
-    python312Packages.pytest
+  home.packages =
+    with pkgs;
+    [
+      cmake
+      shellcheck
+      glslang
+      pipenv
+      python312Packages.isort
+      python312Packages.pytest
 
-    # rust tools
-    trunk
-    wasm-pack
-    cargo-tarpaulin
-    cargo-watch
-    cargo-generate
-    diesel-cli
-    cargo-audit
-    gitoxide
+      # rust tools
+      trunk
+      wasm-pack
+      cargo-tarpaulin
+      cargo-watch
+      cargo-generate
+      diesel-cli
+      cargo-audit
+      gitoxide
 
-    # nix tools
-    nil
-    nixfmt-rfc-style
-    nix-init
+      # nix tools
+      nil
+      nixfmt-rfc-style
+      nix-init
 
-    # markdown
-    nodePackages.markdownlint-cli
+      # markdown
+      nodePackages.markdownlint-cli
 
-    # doom emacs dependencies
-    yaml-language-server
-    nodePackages.typescript-language-server
-    nodePackages.bash-language-server
-    pyright
-    cmake-language-server
-    multimarkdown
-    rustc
-    cargo
-    rust-analyzer
-    clang
-    clang-tools
-    wakatime
-    enchant
-    nuspell
-    hunspellDicts.en-us
-    languagetool
+      # doom emacs dependencies
+      yaml-language-server
+      nodePackages.typescript-language-server
+      nodePackages.bash-language-server
+      pyright
+      cmake-language-server
+      multimarkdown
+      rustc
+      cargo
+      rust-analyzer
+      clang
+      clang-tools
+      wakatime
+      enchant
+      nuspell
+      hunspellDicts.en-us
+      languagetool
 
-    # dependencies for nix-dotfiles/hydra-check-action
-    nodejs_20
-    nodePackages.prettier
-    treefmt
+      # dependencies for nix-dotfiles/hydra-check-action
+      nodejs_20
+      nodePackages.prettier
+      treefmt
 
-    nextcloud-client
-    bitwarden-cli
-    bitwarden-menu
-    wtype
-  ];
+      nextcloud-client
+      bitwarden-cli
+      bitwarden-menu
+      wtype
+
+    ]
+    ++ [ outputs.packages.bitwarden-rofi ];
 }