1 files changed, 202 insertions, 33 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 6574af9d..a1a694ea 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -50,9 +50,20 @@ let
   };
 
   lockCommand = "${lib.getExe' config.systemd.package "systemctl"} --user start gtklock.service";
+
+  editor = pkgs.symlinkJoin {
+    inherit (cfg.services.emacs.package) name;
+    buildInputs = with pkgs; [ makeWrapper ];
+    paths = [ cfg.services.emacs.package ];
+    postBuild = ''
+      wrapProgram $out/bin/emacsclient \
+        --inherit-argv0 \
+        --add-flags ${lib.escapeShellArg (lib.escapeShellArgs cfg.services.emacs.client.arguments)}
+    '';
+  };
 in {
   imports = with flake.nixosModules.userProfiles.${userName}; [
-    mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
+    zsh tmux mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
   ];
 
   config = {
@@ -60,16 +71,17 @@ in {
       imports = [
         ./libvirt
         ./niri
+        ./synadm
         flakeInputs.nix-index-database.hmModules.nix-index
         flakeInputs.impermanence.nixosModules.home-manager.impermanence
       ];
 
       home.stateVersion = "20.09";
 
-      nixpkgs.config = {
-        allowUnfree = true;
-        zathura.useMupdf = false;
-      };
+      # nixpkgs.config = {
+      #   allowUnfree = true;
+      #   zathura.useMupdf = false;
+      # };
 
       nix.registry = {
         "flk" = {
@@ -160,6 +172,7 @@ in {
             };
           };
         };
+        chromium.enable = true;
 
         zathura = {
           enable = true;
@@ -175,13 +188,91 @@ in {
           gpu-api = "vulkan";
         };
 
-        zsh.initExtra = ''
-          source ${./zshrc}
+        zsh.initContent = let
+          zshrc = pkgs.resholve.mkDerivation {
+            pname = "zshrc";
+            version = "0.0.0";
+
+            src = ./zshrc;
+
+            dontUnpack = true;
+            dontConfigure = true;
+            dontBuild = true;
+
+            installPhase = ''
+              mkdir -p $out/share
+              install "$src" $out/share/zshrc
+            '';
+
+            solutions = {
+              default = {
+                scripts = [ "share/zshrc" ];
+                interpreter = "none";
+                inputs = with pkgs; [
+                  coreutils
+                  rpm
+                  binutils
+                  squashfsTools
+                  unzip
+                  cfg.programs.git.package
+                  magickWrapped
+                  curl
+                  file
+                  gnutar
+                  cpio
+                  magic-wormhole
+                  cfg.programs.zsh.package
+                  fuse
+                  util-linux
+                  findutils
+                  qrencode
+                  tty-clock
+                  cfg.programs.jq.package
+                  eza
+                  less
+                  config.systemd.package
+                  config.programs.ssh.package
+                  gnused
+                  miniserve
+                ];
+                execer = with pkgs; [
+                  "cannot:${lib.getExe' rpm "rpm2cpio"}"
+                  "cannot:${lib.getExe' squashfsTools "unsquashfs"}"
+                  "cannot:${lib.getExe' unzip "unzip"}"
+                  "cannot:${lib.getExe cfg.programs.git.package}"
+                  "cannot:${lib.getExe cpio}"
+                  "cannot:${lib.getExe' magic-wormhole "wormhole"}"
+                  "cannot:${lib.getExe' fuse "fusermount"}"
+                  "cannot:${lib.getExe less}"
+                  "cannot:${lib.getExe' config.systemd.package "systemctl"}"
+                  "cannot:${lib.getExe config.programs.ssh.package}"
+                ];
+                wrapper = with pkgs; [
+                  "${lib.getExe' magickWrapped "magick"}:${lib.getExe' imagemagick "magick"}"
+                ];
+                fake = {
+                  builtin = ["print"];
+                  external = ["sudo" "umount"];
+                };
+              };
+            };
+          };
+          magickWrapped = pkgs.symlinkJoin {
+            inherit (pkgs.imagemagick) name;
+            paths = [ pkgs.imagemagick ];
+
+            buildInputs = with pkgs; [ makeWrapper ];
+            postBuild = ''
+              wrapProgram $out/bin/magick \
+                --prefix PATH : ${lib.makeBinPath (with pkgs; [ ghostscript ])}
+            '';
+          };
+        in ''
+          source ${zshrc}/share/zshrc
         '';
         zsh.dirHashes = let
           flakeHashes = mapAttrs' (n: v: nameValuePair (inputNames.${n} or n) (toString v)) flakeInputs;
           inputNames = {
-            "nixpkgs" = "nixos";
           };
         in flakeHashes // {
           u2w = "$HOME/projects/uni2work";
@@ -193,6 +284,16 @@ in {
           pro = "$HOME/projects/pro";
           media = "$HOME/media";
         };
+        jq.colors = {
+          arrays = "1;37";
+          "false" = "0;37";
+          "null" = "2;37";
+          numbers = "0;37";
+          objectKeys = "1;34";
+          objects = "1;37";
+          strings = "0;32";
+          "true" = "0;37";
+        };
 
         obs-studio = {
           enable = true;
@@ -202,7 +303,7 @@ in {
         gh = {
           enable = true;
           settings = {
-            editor = lib.getExe' config.home-manager.users.${userName}.programs.emacs.package "emacsclient";
+            editor = lib.getExe' editor "emacsclient";
             gitProtocol = "ssh";
           };
         };
@@ -228,16 +329,10 @@ in {
             # notify_on_cmd_finish = "invisible 120";
           };
           keybindings = {
-            "kitty_mod+n" = "detach_window";
+            "kitty_mod+n" = "new_os_window_with_cwd";
             "kitty_mod+m" = "detach_window ask";
-          };
-        };
-        wpaperd = {
-          enable = true;
-          settings.default = {
-            path = "~/.wallpapers";
-            duration = "15m";
-            mode = "center";
+            "kitty_mod+enter" = "new_window_with_cwd";
+            "kitty_mod+t" = "new_tab_with_cwd";
           };
         };
         fuzzel = {
@@ -250,7 +345,7 @@ in {
               font = "Fira Sans";
             };
             colors = {
-              background = "000000aa";
+              background = "000000cc";
               text = "cdd6f4ff";
               match = "94e2d5ff";
               selection = "585b70ff";
@@ -267,15 +362,28 @@ in {
           enable = true;
           extraAbbreviations = ["i.A." "d.h." "D.h." "gdw."];
         };
+        nushell = {
+          enable = true;
+          settings.show_banner = false;
+        };
+        fd.enable = true;
       };
 
       services = {
+        wpaperd = {
+          enable = true;
+          settings.default = {
+            path = "~/.wallpapers";
+            duration = "15m";
+            mode = "center";
+          };
+        };
         emacs = {
           enable = true;
           socketActivation.enable = true;
           client = {
             enable = true;
-            arguments = mkForce ["--reuse-frame" "--alternate-editor" "\"\""];
+            arguments = mkForce ["--create-frame" "--alternate-editor" (lib.getExe cfg.services.emacs.package)];
           };
         };
         gpg-agent = {
@@ -384,6 +492,13 @@ in {
         };
       };
 
+      qt.kde.settings = {
+        kwalletrc = {
+          KSecretD.Enabled = false;
+          Wallet."Default Wallet" = "store";
+        };
+      };
+
       xsession.preferStatusNotifierItems = true;
 
       xresources.properties = import ./xresources.nix;
@@ -395,15 +510,15 @@ in {
           wrappedYTMDesktop libsForQt5.qt5ct playerctl evince papers
           thunderbird zoom-us xdg-desktop-portal steam steam-run
           wireshark virt-manager rclone cached-nix-shell worktime
-          fira-code-symbols libreoffice xournalpp google-chrome
+          fira-code-symbols libreoffice xournalpp
           nixos-shell virt-viewer freerdp gnome-icon-theme
           paper-icon-theme sshpassSecret weechat element-desktop
           sieve-connect gimp3 inkscape udiskie glab nitrokey-app
           pynitrokey gtklock wlrctl remmina openscad spice-record
           libguestfs-with-appliance nerd-fonts.fira-mono
           nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
-          swtpm (hunspellWithDicts (with hunspellDicts; [en_GB-large de_DE]))
-          # synadm
+          swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE]))
+          libation libqalculate
         ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg {}) (customUtils.nixImport { dir = ./utils; });
 
         file = {
@@ -424,12 +539,9 @@ in {
           QT_QPA_PLATFORMTHEME = "qt5ct";
           LIBVIRT_DEFAULT_URI = "qemu:///system";
           STACK_XDG = 1;
-          EDITOR = pkgs.writeShellScript "editor" ''
-            args=("--reuse-frame" "--alternate-editor" "")
-            args+=("$@")
-            exec -a emacsclient ${lib.getExe' cfg.services.emacs.package "emacsclient"} "''${args[@]}"
-          '';
+          EDITOR = lib.getExe' editor "emacsclient";
           RCLONE_PASSWORD_COMMAND = "${lib.getExe' pkgs.libsecret "secret-tool"} lookup service rclone";
+          SYSTEMD_TINT_BACKGROUND = "false";
         };
 
         extraProfileCommands = ''
@@ -466,9 +578,17 @@ in {
             General = {
               dot_as_separator = 0;
             };
+            Mode = {
+              calculate_as_you_type = 1;
+            };
           };
         };
-        "emacs/init.el".source = ./emacs.el;
+        "emacs/init.el".source = pkgs.substitute {
+          src = ./emacs.el;
+          substitutions = [
+            "--subst-var-by" "ksshaskpass" (lib.getExe pkgs.kdePackages.ksshaskpass)
+          ];
+        };
         "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = ''
           [Unit]
           After=graphical-session.target
@@ -486,6 +606,8 @@ in {
       xdg.dataFile = {
         "dbus-1/services/org.keepassxc.KeePassXC.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.keepassxc.KeePassXC.service";
         "dbus-1/services/org.freedesktop.secrets.service.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.freedesktop.secrets.service.service";
+        "dbus-1/services/org.kde.kwalletd6.service".source = "${pkgs.kdePackages.kwallet}/share/dbus-1/services/org.kde.kwalletd6.service";
+        "dbus-1/services/org.kde.kwalletd5.service".source = "${pkgs.kdePackages.kwallet}/share/dbus-1/services/org.kde.kwalletd5.service";
         "emoji-data/list.txt".source = pkgs.stdenv.mkDerivation {
           inherit (sources.emoji-data) pname src;
           version = lib.removePrefix "v" sources.emoji-data.version;
@@ -573,11 +695,11 @@ in {
             exec -- \
               ${lib.getExe' config.systemd.package "systemd-run"} --wait --user --slice-inherit \
               --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \
-              --property 'Environment=DSCP=46' \
-              -- ${lib.getExe pkgs.dscp} ${lib.getExe' pkgs.google-chrome "google-chrome-stable"} \
+              -E DSCP=46 -E NIXOS_OZONE_WL \
+              -- ${lib.getExe pkgs.dscp} ${lib.getExe cfg.programs.chromium.package} \
               --class=Rainbow \
-              --kiosk "https://web.openrainbow.com" \
-              --user-data-dir=''${HOME}/.config/google-chrome-rainbow
+              --app="https://web.openrainbow.com" \
+              --user-data-dir=''${HOME}/.config/chromium-rainbow
           '');
           icon = pkgs.fetchurl {
             url = "https://web.openrainbow.com/rb/2.139.17/assets/skins/rainbow/images/homepage/logo__rainbow.svg";
@@ -587,6 +709,53 @@ in {
             StartupWMClass = "Rainbow";
           };
         };
+        kimai = {
+          name = "Kimai";
+          exec = toString (pkgs.writeShellScript "kimai" ''
+            exec -- \
+              ${lib.getExe cfg.programs.chromium.package} \
+              --class=Kimai \
+              --app="https://kimai.yggdrasil.li" \
+              --user-data-dir=''${HOME}/.config/chromium-kimai
+          '');
+          icon = pkgs.fetchurl {
+            url = "https://www.kimai.org/images/kimai_logo.png";
+            hash = "sha256-lnlOttzR2SwXA70R+egJUkeKr4U5V0avqTk8uX4bqfs=";
+          };
+          settings = {
+            StartupWMClass = "Kimai";
+            StartupNotify = "true";
+          };
+        };
+        audiobookshelf = {
+          name = "Audiobookshelf";
+          exec = toString (pkgs.writeShellScript "audiobookshelf" ''
+            exec -- \
+              ${lib.getExe cfg.programs.chromium.package} \
+              --class=Audiobookshelf \
+              --app="https://audiobookshelf.yggdrasil.li" \
+              --user-data-dir=''${HOME}/.config/chromium-audiobookshelf
+          '');
+          icon = pkgs.fetchurl {
+            url = "https://www.audiobookshelf.org/Logo.png";
+            hash = "sha256-JGPk+WNT1C4DC4lSMb0K0YmAMT5LvmSOeO0QRzkc7Lk=";
+          };
+          settings = {
+            StartupWMClass = "Audiobookshelf";
+            StartupNotify = "true";
+          };
+        };
+        thunderbird-lmu = {
+          name = "Thunderbird (LMU)";
+          exec = "thunderbird --name thunderbird -P lmu %U";
+          icon = "thunderbird";
+          genericName = "Email Client";
+          categories = [ "Network" "Chat" "Email" "Feed" "GTK" "News" ];
+          settings = {
+            StartupWMClass = "thunderbird";
+            StartupNotify = "true";
+          };
+        };
       };
 
       fonts = {