From 325ba751d8cb8355f06a58659e2821dfa65c6879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 28 Jun 2024 19:28:08 -0300 Subject: [PATCH 1/5] update --- flake.lock | 18 +++++++++--------- user/fish/default.nix | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6315137..03069d6 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1718588625, - "narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", + "lastModified": 1719451710, + "narHash": "sha256-h+bFEQHQ46pBkEsOXbxmmY6QNPPGrgpDbNlHtAKG49M=", "owner": "nix-community", "repo": "disko", - "rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", + "rev": "8767dbf5d723b1b6834f4d09b217da7c31580d58", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1718507237, - "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", + "lastModified": 1719111455, + "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", + "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718437845, - "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", + "lastModified": 1719253556, + "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", + "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", "type": "github" }, "original": { diff --git a/user/fish/default.nix b/user/fish/default.nix index c28432e..4d4fccf 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -36,6 +36,7 @@ in shellAliases = { rm = "trash"; tree = "eza -T"; + kys = "shutdown now"; }; shellAbbrs = { off = "shutdown now"; From 19f1d8c1a05f91063e6a11fa171ef551ea51fb15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 28 Jun 2024 22:50:17 -0300 Subject: [PATCH 2/5] gnome: package gnome-pass-search-provider --- pkgs/default.nix | 1 + pkgs/gnome-pass-search-provider.nix | 64 +++++++++++++++++++++++++++++ system/gnome.nix | 3 ++ user/gnome.nix | 2 + user/gpg.nix | 1 - user/sway/default.nix | 2 + 6 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 pkgs/gnome-pass-search-provider.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 4bfc896..73134c7 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,4 +8,5 @@ lipsum = pkgs.callPackage ./lipsum.nix { }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; + gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; } diff --git a/pkgs/gnome-pass-search-provider.nix b/pkgs/gnome-pass-search-provider.nix new file mode 100644 index 0000000..e149505 --- /dev/null +++ b/pkgs/gnome-pass-search-provider.nix @@ -0,0 +1,64 @@ +{ + stdenv, + fetchFromGitHub, + python3Packages, + wrapGAppsHook, + gtk3, + gobject-introspection, + gnome, +}: + +let + inherit (python3Packages) + dbus-python + pygobject3 + fuzzywuzzy + levenshtein + ; +in + +stdenv.mkDerivation rec { + pname = "gnome-pass-search-provider"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "jle64"; + repo = "gnome-pass-search-provider"; + rev = version; + hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw="; + }; + + nativeBuildInputs = [ + python3Packages.wrapPython + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + dbus-python + pygobject3 + fuzzywuzzy + levenshtein + + gtk3 + gobject-introspection + ]; + + env = { + LIBDIR = builtins.placeholder "out" + "/lib"; + DATADIR = builtins.placeholder "out" + "/share"; + }; + + postPatch = '' + substituteInPlace conf/org.gnome.Pass.SearchProvider.service.{dbus,systemd} \ + --replace-fail "/usr/lib" "$LIBDIR" + ''; + + installPhase = '' + bash ./install.sh + ''; + + postFixup = '' + makeWrapperArgs=( "''${gappsWrapperArgs[@]}" ) + wrapPythonProgramsIn "$out/lib" "$out $propagatedBuildInputs" + ''; +} diff --git a/system/gnome.nix b/system/gnome.nix index 6a3509b..f56f938 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -30,6 +30,8 @@ hardware.opentabletdriver.enable = lib.mkForce false; + programs.gpaste.enable = true; + # services.xserver.displayManager.autologin.user = "lelgenio"; environment.systemPackages = with pkgs; @@ -40,5 +42,6 @@ chrome-gnome-shell gnomeExtensions.quick-settings-audio-devices-hider + gnome-pass-search-provider ]; } diff --git a/user/gnome.nix b/user/gnome.nix index 53dd630..4924158 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -49,6 +49,8 @@ lib.mkIf (config.my.desktop == "gnome") { QT_QPA_PLATFORMTHEME = "qt5ct"; }; + services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; + xdg.defaultApplications = { enable = lib.mkForce false; }; diff --git a/user/gpg.nix b/user/gpg.nix index dc39066..f1c472f 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -10,7 +10,6 @@ enable = true; defaultCacheTtl = 604800; maxCacheTtl = 604800; - pinentryPackage = pkgs.pinentry-curses; extraConfig = '' allow-preset-passphrase ''; diff --git a/user/sway/default.nix b/user/sway/default.nix index 57627d6..3e86994 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -131,6 +131,8 @@ in }; }; + services.gpg-agent.pinentryPackage = pkgs.pinentry-all; + xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; home.packages = with pkgs; [ From 278b12c0013815c87d20ad089337722d828a70ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 29 Jun 2024 01:32:47 -0300 Subject: [PATCH 3/5] fish: add poweroff alias --- user/fish/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/fish/default.nix b/user/fish/default.nix index c28432e..4d4fccf 100644 --- a/user/fish/default.nix +++ b/user/fish/default.nix @@ -36,6 +36,7 @@ in shellAliases = { rm = "trash"; tree = "eza -T"; + kys = "shutdown now"; }; shellAbbrs = { off = "shutdown now"; From 30218ca437b53bf0b325aac8adf1f2635ab35bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 28 Jun 2024 22:50:17 -0300 Subject: [PATCH 4/5] gnome: package gnome-pass-search-provider --- pkgs/default.nix | 1 + pkgs/gnome-pass-search-provider.nix | 64 +++++++++++++++++++++++++++++ system/gnome.nix | 3 ++ user/gnome.nix | 2 + user/gpg.nix | 1 - user/sway/default.nix | 2 + 6 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 pkgs/gnome-pass-search-provider.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 4bfc896..73134c7 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,4 +8,5 @@ lipsum = pkgs.callPackage ./lipsum.nix { }; emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; + gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; } diff --git a/pkgs/gnome-pass-search-provider.nix b/pkgs/gnome-pass-search-provider.nix new file mode 100644 index 0000000..e149505 --- /dev/null +++ b/pkgs/gnome-pass-search-provider.nix @@ -0,0 +1,64 @@ +{ + stdenv, + fetchFromGitHub, + python3Packages, + wrapGAppsHook, + gtk3, + gobject-introspection, + gnome, +}: + +let + inherit (python3Packages) + dbus-python + pygobject3 + fuzzywuzzy + levenshtein + ; +in + +stdenv.mkDerivation rec { + pname = "gnome-pass-search-provider"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "jle64"; + repo = "gnome-pass-search-provider"; + rev = version; + hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw="; + }; + + nativeBuildInputs = [ + python3Packages.wrapPython + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + dbus-python + pygobject3 + fuzzywuzzy + levenshtein + + gtk3 + gobject-introspection + ]; + + env = { + LIBDIR = builtins.placeholder "out" + "/lib"; + DATADIR = builtins.placeholder "out" + "/share"; + }; + + postPatch = '' + substituteInPlace conf/org.gnome.Pass.SearchProvider.service.{dbus,systemd} \ + --replace-fail "/usr/lib" "$LIBDIR" + ''; + + installPhase = '' + bash ./install.sh + ''; + + postFixup = '' + makeWrapperArgs=( "''${gappsWrapperArgs[@]}" ) + wrapPythonProgramsIn "$out/lib" "$out $propagatedBuildInputs" + ''; +} diff --git a/system/gnome.nix b/system/gnome.nix index 6a3509b..f56f938 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -30,6 +30,8 @@ hardware.opentabletdriver.enable = lib.mkForce false; + programs.gpaste.enable = true; + # services.xserver.displayManager.autologin.user = "lelgenio"; environment.systemPackages = with pkgs; @@ -40,5 +42,6 @@ chrome-gnome-shell gnomeExtensions.quick-settings-audio-devices-hider + gnome-pass-search-provider ]; } diff --git a/user/gnome.nix b/user/gnome.nix index 53dd630..4924158 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -49,6 +49,8 @@ lib.mkIf (config.my.desktop == "gnome") { QT_QPA_PLATFORMTHEME = "qt5ct"; }; + services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; + xdg.defaultApplications = { enable = lib.mkForce false; }; diff --git a/user/gpg.nix b/user/gpg.nix index dc39066..f1c472f 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -10,7 +10,6 @@ enable = true; defaultCacheTtl = 604800; maxCacheTtl = 604800; - pinentryPackage = pkgs.pinentry-curses; extraConfig = '' allow-preset-passphrase ''; diff --git a/user/sway/default.nix b/user/sway/default.nix index 57627d6..3e86994 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -131,6 +131,8 @@ in }; }; + services.gpg-agent.pinentryPackage = pkgs.pinentry-all; + xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; home.packages = with pkgs; [ From 441e591cb4696d99d07bb5ff799030514b31f3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 29 Jun 2024 01:32:00 -0300 Subject: [PATCH 5/5] sway: assign vesktop to chat workspace --- user/sway/sway-assigns.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 3822a22..65e1a97 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -44,6 +44,8 @@ in { title = "Discord"; } { class = "WebCord"; } { app_id = "WebCord"; } + { class = "vesktop"; } + { app_id = "vesktop"; } { class = "Element"; } { app_id = "Element"; } ];