Merge pull request #26 from kmein/update_flake_lock_action

flake.lock: Update
fix(rofi-pass): generate passwords, correct default user
2026-03-23 05:11:08 +01:00 · 2022-10-05 22:49:37 +02:00 · 2022-10-05 17:09:34 +02:00 · 2022-10-05 17:08:58 +02:00 · 2022-10-05 16:50:27 +02:00 · 2022-10-02 01:16:36 +00:00
5 changed files with 35 additions and 39 deletions
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -31,12 +31,6 @@ in {
            tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
            iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
            ix = pkgs.callPackage <niveum/packages/ix.nix> {};
-            rofi-pass = pkgs.rofi-pass.overrideAttrs (final: previous: {
-              patches = [
-                # password store androi
-                <niveum/packages/rofi-pass.patch>
-              ];
-            });
          };
        };
      };
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -231,7 +231,7 @@ in {
        "${modifier}+0" = "exec ${scripts.menu-calc}/bin/=";

        "${modifier}+Shift+w" = "exec ${scripts.k-lock}/bin/k-lock";
-        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec ${pkgs.rofi}/bin/rofi -modi run,window,ssh,filebrowser -show run''}";
+        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
        "${modifier}+Shift+d" = "exec ${
          pkgs.writers.writeDash "notemenu" ''
            set -efu
@@ -251,7 +251,8 @@ in {
            fi
          ''
        }";
-        "${modifier}+p" = "exec --no-startup-id ${pkgs.rofi-pass}/bin/rofi-pass";
+        "${modifier}+p" = "exec --no-startup-id rofi-pass";
+        "${modifier}+Shift+p" = "exec --no-startup-id rofi-pass --insert";
        "${modifier}+u" = "exec ${scripts.unicodmenu}/bin/unicodmenu";

        "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
--- a/configs/rofi.nix
+++ b/configs/rofi.nix
@@ -9,5 +9,18 @@ in {
    enable = true;
    font = "Monospace 10";
    theme = "${pkgs.rofi}/share/rofi/themes/Arc.rasi";
+    pass = {
+      enable = true;
+      extraConfig = ''
+        _pwgen() {
+          ${pkgs.genpass}/bin/genpass "$@"
+        }
+
+        USERNAME_field='login'
+        default_user2=kmein
+        help_color="#FF0000"
+      ''; # help_color set by https://github.com/mrossinek/dotfiles/commit/13fc5f24caa78c8f20547bf473266879507f13bf
+    };
+    plugins = [pkgs.rofi-calc];
  };
 }
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1663932797,
-        "narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=",
+        "lastModified": 1664573442,
+        "narHash": "sha256-AovlSIuJfMf8n9QLNUVtsCul+NVHIoen7APH2fLls3k=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6",
+        "rev": "a7f0cc2d7b271b4a5df9b9e351d556c172f7e903",
        "type": "github"
      },
      "original": {
@@ -110,11 +110,11 @@
    },
    "nixos-stable": {
      "locked": {
-        "lastModified": 1663939948,
-        "narHash": "sha256-tZROWStjk7aXbM6XTbspRb9dSk/4lw7EFBOrt2A09Ag=",
+        "lastModified": 1664594436,
+        "narHash": "sha256-YHowMADGzdi7fKnGlg47qe0PIljq+11VqLarmXDuKxQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7e27b838cd7ac90fed03d0d5a8487848c4b0b6d2",
+        "rev": "9cac45850280978a21a3eb67b15a18f34cbffa2d",
        "type": "github"
      },
      "original": {
@@ -126,11 +126,11 @@
    },
    "nixos-unstable": {
      "locked": {
-        "lastModified": 1663850217,
-        "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=",
+        "lastModified": 1664538465,
+        "narHash": "sha256-EnlC7dDKX7X1wlnXkB1gmn9rBZQ0J9+biVTZHw//8us=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
+        "rev": "10ecda252ce1b3b1d6403caeadbcc8f30d5ab796",
        "type": "github"
      },
      "original": {
@@ -143,11 +143,11 @@
    "recht": {
      "flake": false,
      "locked": {
-        "lastModified": 1619583518,
-        "narHash": "sha256-3eFw6xWue9cvPxXq1ROq32ecvPOmqOedgQhyOr7N9iE=",
+        "lastModified": 1664353498,
+        "narHash": "sha256-s1MUaSOkyoAMarB4a1DgMsfVhmhAsLIjtyeT+ZCxOEE=",
        "owner": "kmein",
        "repo": "recht",
-        "rev": "d551afed23122bb3106e59eb2274394ec5555048",
+        "rev": "dc2cb407052a53965e6678fd84f0d887f887c11c",
        "type": "github"
      },
      "original": {
@@ -159,11 +159,11 @@
    "retiolum": {
      "flake": false,
      "locked": {
-        "lastModified": 1664019034,
-        "narHash": "sha256-do31QxpQtmuWclx9yhM6UslVO7XdXofLbXZ4nr3fLJ0=",
+        "lastModified": 1664394335,
+        "narHash": "sha256-7dMfkp2+cwjzgzrSCsDzdktMha+SdPOm/jr49iOOkoI=",
        "owner": "krebs",
        "repo": "retiolum",
-        "rev": "8d9b86a0ce503588bb34ae8676fdbcb0e4014119",
+        "rev": "86208b5a747d7aa661240b2d5c2f229f2ed76959",
        "type": "github"
      },
      "original": {
@@ -211,11 +211,11 @@
    "stockholm": {
      "flake": false,
      "locked": {
-        "lastModified": 1663587256,
-        "narHash": "sha256-tOwUL8UFP8H8FosYVp8WiPr0nIPhcbN79nNJJgD0cUU=",
+        "lastModified": 1664291396,
+        "narHash": "sha256-KExj21MgDoZUOFoz/5iPLrKpLntcKqDbcpnCBZVup3Q=",
        "ref": "refs/heads/master",
-        "rev": "55957c6d6adb51d2079c117c1e7309c60ee0fe0f",
-        "revCount": 10779,
+        "rev": "8f929b04b3de012a9c72306786f076b78aa9f98c",
+        "revCount": 10827,
        "type": "git",
        "url": "https://cgit.lassul.us/stockholm"
      },
--- a/packages/rofi-pass.patch
+++ b/packages/rofi-pass.patch
@@ -1,12 +0,0 @@
-diff --git a/rofi-pass b/rofi-pass
-index 48928db..13682a5 100755
--- a/rofi-pass
-+++ b/rofi-pass
-@@ -15,7 +15,7 @@ _image_viewer () {
-
- # We expect to find these fields in pass(1)'s output
- URL_field='url'
-USERNAME_field='user'
-+USERNAME_field='login'
- AUTOTYPE_field='autotype'
- OTPmethod_field='otp_method'
Author	SHA1	Message	Date
Kierán Meinhardt	84f83cb6ac	Merge pull request #26 from kmein/update_flake_lock_action flake.lock: Update	2022-10-05 22:49:37 +02:00
Kierán Meinhardt	652b7d4852	fix(rofi-pass): generate passwords, correct default user	2022-10-05 17:09:34 +02:00
Kierán Meinhardt	e73c139d69	feat(rofi-pass): allow insertion	2022-10-05 17:08:58 +02:00
Kierán Meinhardt	549282140f	fix(rofi-pass): include via home-manager also fix https://github.com/carnager/rofi-pass/issues/226	2022-10-05 16:50:27 +02:00
github-actions[bot]	be3795e957	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/de3758e31a3a1bc79d569f5deb5dac39791bf9b6' (2022-09-23) → 'github:nix-community/home-manager/a7f0cc2d7b271b4a5df9b9e351d556c172f7e903' (2022-09-30) • Updated input 'nixos-stable': 'github:NixOS/nixpkgs/7e27b838cd7ac90fed03d0d5a8487848c4b0b6d2' (2022-09-23) → 'github:NixOS/nixpkgs/9cac45850280978a21a3eb67b15a18f34cbffa2d' (2022-10-01) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90' (2022-09-22) → 'github:NixOS/nixpkgs/10ecda252ce1b3b1d6403caeadbcc8f30d5ab796' (2022-09-30) • Updated input 'recht': 'github:kmein/recht/d551afed23122bb3106e59eb2274394ec5555048' (2021-04-28) → 'github:kmein/recht/dc2cb407052a53965e6678fd84f0d887f887c11c' (2022-09-28) • Updated input 'retiolum': 'github:krebs/retiolum/8d9b86a0ce503588bb34ae8676fdbcb0e4014119' (2022-09-24) → 'github:krebs/retiolum/86208b5a747d7aa661240b2d5c2f229f2ed76959' (2022-09-28) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=refs%2fheads%2fmaster&rev=55957c6d6adb51d2079c117c1e7309c60ee0fe0f' (2022-09-19) → 'git+https://cgit.lassul.us/stockholm?ref=refs%2fheads%2fmaster&rev=8f929b04b3de012a9c72306786f076b78aa9f98c' (2022-09-27)	2022-10-02 01:16:36 +00:00