summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-05-26 13:52:19 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2023-05-26 13:52:19 +0200
commit3dbd45aa7a4ceacfac968f8a15a364d4fead522c (patch)
treebb3ec5ae2572ace62f24ff55d798d4081efeddbc
parent8d39e40bcf6da354c2e5ff2f1b4b8981c5fcf7f5 (diff)
downloadnixos-3dbd45aa7a4ceacfac968f8a15a364d4fead522c.tar
nixos-3dbd45aa7a4ceacfac968f8a15a364d4fead522c.tar.gz
nixos-3dbd45aa7a4ceacfac968f8a15a364d4fead522c.tar.bz2
nixos-3dbd45aa7a4ceacfac968f8a15a364d4fead522c.tar.xz
nixos-3dbd45aa7a4ceacfac968f8a15a364d4fead522c.zip
...
-rw-r--r--accounts/gkleen@sif/default.nix32
-rw-r--r--accounts/gkleen@sif/systemd.nix12
2 files changed, 43 insertions, 1 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index b9a9abe1..3f103b8a 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -45,6 +45,33 @@ let
45 wrappedElementDesktop = wrapElectron { package = pkgs.element-desktop; bin = "element-desktop"; outBin = "element"; }; 45 wrappedElementDesktop = wrapElectron { package = pkgs.element-desktop; bin = "element-desktop"; outBin = "element"; };
46 wrappedRocketChatDesktop = wrapElectron { package = pkgs.rocketchat-desktop; bin = "rocketchat-desktop"; outBin = "rocketchat"; }; 46 wrappedRocketChatDesktop = wrapElectron { package = pkgs.rocketchat-desktop; bin = "rocketchat-desktop"; outBin = "rocketchat"; };
47 wrappedYTMDesktop = wrapElectron { package = pkgs.ytmdesktop; sandbox = false; }; 47 wrappedYTMDesktop = wrapElectron { package = pkgs.ytmdesktop; sandbox = false; };
48
49 wrappedKeepassxc = pkgs.symlinkJoin {
50 inherit (pkgs.keepassxc) name;
51 paths = with pkgs; [
52 keepassxc
53 (pkgs.writeTextFile {
54 name = "org.keepassxc.KeePassXC";
55 destination = "/share/dbus-1/services/org.keepassxc.KeePassXC.MainWindow.service";
56 text = ''
57 [D-BUS Service]
58 Name=org.keepassxc.KeePassXC.MainWindow
59 Exec=${pkgs.coreutils}/bin/false
60 SystemdService=keepassxc.service
61 '';
62 })
63 (pkgs.writeTextFile {
64 name = "org.freedesktop.secrets";
65 destination = "/share/dbus-1/services/org.freedesktop.secrets.service";
66 text = ''
67 [D-BUS Service]
68 Name=org.freedesktop.secrets
69 Exec=${pkgs.coreutils}/bin/false
70 SystemdService=keepassxc.service
71 '';
72 })
73 ];
74 };
48in { 75in {
49 imports = with flake.nixosModules.userProfiles.${userName}; [ 76 imports = with flake.nixosModules.userProfiles.${userName}; [
50 mpv yt-dlp (args: import ./xcompose.nix (inputs // args)) 77 mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
@@ -218,6 +245,7 @@ in {
218 }; 245 };
219 emacs = { 246 emacs = {
220 enable = true; 247 enable = true;
248 socketActivation.enable = true;
221 client = { 249 client = {
222 enable = true; 250 enable = true;
223 arguments = mkForce ["-a" "\"\""]; 251 arguments = mkForce ["-a" "\"\""];
@@ -358,7 +386,7 @@ in {
358 home = { 386 home = {
359 packages = with pkgs; [ 387 packages = with pkgs; [
360 fira fira-code powerline-fonts nerdfonts pavucontrol 388 fira fira-code powerline-fonts nerdfonts pavucontrol
361 keepassxc sxiv xclip mumble pulseaudio-ctl pamixer libnotify 389 wrappedKeepassxc sxiv xclip mumble pulseaudio-ctl pamixer libnotify
362 synergy xorg.xbacklight screen-message wrappedYTMDesktop 390 synergy xorg.xbacklight screen-message wrappedYTMDesktop
363 qt5ct playerctl evince thunderbird wrappedZulip zoom-us 391 qt5ct playerctl evince thunderbird wrappedZulip zoom-us
364 steam steam-run wireshark virt-manager rclone 392 steam steam-run wireshark virt-manager rclone
@@ -434,6 +462,8 @@ in {
434 | sort | uniq >$out 462 | sort | uniq >$out
435 ''); 463 '');
436 }; 464 };
465 "dbus-1/services/org.keepassxc.KeePassXC.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.keepassxc.KeePassXC.service";
466 "dbus-1/services/org.freedesktop.secrets.service.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.freedesktop.secrets.service.service";
437 }; 467 };
438 468
439 xdg.mimeApps = { 469 xdg.mimeApps = {
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 2fba0404..fe69a757 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -143,6 +143,18 @@ in {
143 Restart = "always"; 143 Restart = "always";
144 }; 144 };
145 }; 145 };
146 keepassxc = {
147 Service = {
148 Type = "dbus";
149 BusName = "org.keepassxc.KeePassXC.MainWindow";
150 WorkingDirectory = "~";
151 ExecStart = "${pkgs.keepassxc}/bin/keepassxc";
152 };
153 Unit = {
154 Requires = ["graphical-session-pre.target"];
155 After = ["graphical-session-pre.target"];
156 };
157 };
146 xss-lock = { 158 xss-lock = {
147 Service = { 159 Service = {
148 Environment = [ "XSECURELOCK_WANT_FIRST_KEYPRESS=1" ]; 160 Environment = [ "XSECURELOCK_WANT_FIRST_KEYPRESS=1" ];