1 files changed, 71 insertions, 35 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 706eb241..02241bd0 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -49,7 +49,8 @@ let
     ];
   };
 
-  lockCommand = "${lib.getExe' config.systemd.package "systemctl"} --user start gtklock.service";
+  # lockCommand = "${lib.getExe' config.systemd.package "systemctl"} --user start gtklock.service";
+  lockCommand = "${lib.getExe' cfg.programs.quickshell.package "qs"} ipc call Lockscreen setLocked true";
 
   editor = pkgs.symlinkJoin {
     inherit (cfg.services.emacs.package) name;
@@ -70,9 +71,10 @@ in {
     home-manager.users.${userName} = {
       imports = [
         ./libvirt
-        ./niri
+        ./niri.nix
+        ./shell
         ./synadm
-        flakeInputs.nix-index-database.hmModules.nix-index
+        flakeInputs.nix-index-database.homeModules.nix-index
         flakeInputs.impermanence.nixosModules.home-manager.impermanence
       ];
 
@@ -172,6 +174,7 @@ in {
             };
           };
         };
+        chromium.enable = true;
 
         zathura = {
           enable = true;
@@ -233,6 +236,7 @@ in {
                   config.programs.ssh.package
                   gnused
                   miniserve
+                  p7zip
                 ];
                 execer = with pkgs; [
                   "cannot:${lib.getExe' rpm "rpm2cpio"}"
@@ -245,6 +249,7 @@ in {
                   "cannot:${lib.getExe less}"
                   "cannot:${lib.getExe' config.systemd.package "systemctl"}"
                   "cannot:${lib.getExe config.programs.ssh.package}"
+                  "cannot:${lib.getExe' p7zip "7z"}"
                 ];
                 wrapper = with pkgs; [
                   "${lib.getExe' magickWrapped "magick"}:${lib.getExe' imagemagick "magick"}"
@@ -283,6 +288,7 @@ in {
           pro = "$HOME/projects/pro";
           media = "$HOME/media";
         };
+        nix-index.enable = true;
         jq.colors = {
           arrays = "1;37";
           "false" = "0;37";
@@ -370,7 +376,7 @@ in {
 
       services = {
         wpaperd = {
-          enable = true;
+          enable = false;
           settings.default = {
             path = "~/.wallpapers";
             duration = "15m";
@@ -445,20 +451,6 @@ in {
           serverUrl = "https://etesync.yggdrasil.li";
         };
 
-        swayidle = {
-          enable = true;
-          events = [
-            { event = "before-sleep"; command = lockCommand; }
-            { event = "lock"; command = lockCommand; }
-          ];
-          timeouts = [
-            { timeout = 600; command = lockCommand; }
-          ];
-          extraArgs = [
-            "-w"
-            "idlehint" "30"
-          ];
-        };
         poweralertd.enable = true;
       };
 
@@ -490,6 +482,8 @@ in {
           name = "Paper-Mono-Dark";
         };
       };
+      qt.enable = true;
+      qt.platformTheme.name = "gtk";
 
       qt.kde.settings = {
         kwalletrc = {
@@ -509,16 +503,16 @@ 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
+          sieve-connect gimp3 inkscape udiskie glab
+          gtklock wlrctl remmina openscad spice-record
+          nerd-fonts.fira-mono
           nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
-          swtpm (hunspellWithDicts (with hunspellDicts; [en_GB-large de_DE]))
+          swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE]))
           libation libqalculate
-        ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg {}) (customUtils.nixImport { dir = ./utils; });
+        ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg { inherit sources; }) (customUtils.nixImport { dir = ./utils; });
 
         file = {
           ".backup-munin".source = ./backup-patterns;
@@ -535,7 +529,7 @@ in {
         sessionVariables = {
           # GDK_SCALE = 96.0 / 282.0;
           # QT_AUTO_SCREEN_SCALE_FACTOR = 1;
-          QT_QPA_PLATFORMTHEME = "qt5ct";
+          QT_QPA_PLATFORMTHEME = lib.mkForce "gtk3";
           LIBVIRT_DEFAULT_URI = "qemu:///system";
           STACK_XDG = 1;
           EDITOR = lib.getExe' editor "emacsclient";
@@ -588,10 +582,10 @@ in {
             "--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
-        '';
+        # "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = ''
+        #   [Unit]
+        #   After=graphical-session.target
+        # '';
         "systemd/user/home-manager.service.d/before-graphical-session.conf".text = ''
           [Unit]
           Before=graphical-session-pre.target
@@ -695,10 +689,10 @@ in {
               ${lib.getExe' config.systemd.package "systemd-run"} --wait --user --slice-inherit \
               --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \
               -E DSCP=46 -E NIXOS_OZONE_WL \
-              -- ${lib.getExe pkgs.dscp} ${lib.getExe' pkgs.google-chrome "google-chrome-stable"} \
+              -- ${lib.getExe pkgs.dscp} ${lib.getExe cfg.programs.chromium.package} \
               --class=Rainbow \
               --app="https://web.openrainbow.com" \
-              --user-data-dir=''${HOME}/.config/google-chrome-rainbow
+              --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";
@@ -712,10 +706,10 @@ in {
           name = "Kimai";
           exec = toString (pkgs.writeShellScript "kimai" ''
             exec -- \
-              ${lib.getExe' pkgs.google-chrome "google-chrome-stable"} \
+              ${lib.getExe cfg.programs.chromium.package} \
               --class=Kimai \
               --app="https://kimai.yggdrasil.li" \
-              --user-data-dir=''${HOME}/.config/google-chrome-kimai
+              --user-data-dir=''${HOME}/.config/chromium-kimai
           '');
           icon = pkgs.fetchurl {
             url = "https://www.kimai.org/images/kimai_logo.png";
@@ -730,10 +724,10 @@ in {
           name = "Audiobookshelf";
           exec = toString (pkgs.writeShellScript "audiobookshelf" ''
             exec -- \
-              ${lib.getExe' pkgs.google-chrome "google-chrome-stable"} \
+              ${lib.getExe cfg.programs.chromium.package} \
               --class=Audiobookshelf \
               --app="https://audiobookshelf.yggdrasil.li" \
-              --user-data-dir=''${HOME}/.config/google-chrome-audiobookshelf
+              --user-data-dir=''${HOME}/.config/chromium-audiobookshelf
           '');
           icon = pkgs.fetchurl {
             url = "https://www.audiobookshelf.org/Logo.png";
@@ -769,6 +763,48 @@ in {
           color-scheme = "prefer-dark";
         };
       };
+
+      i18n.inputMethod = {
+        enable = true;
+        type = "fcitx5";
+        fcitx5 = {
+          waylandFrontend = true;
+          settings = {
+            globalOptions."Behavior/DisabledAddons" = {
+              "0" = "clipboard";
+            };
+            inputMethod = {
+              "Groups/0" = {
+                Name = "Default";
+                "Default Layout" = "us";
+                DefaultIM = "keyboard-us";
+              };
+              "Groups/0/Items/0" = {
+                Name = "keyboard-us";
+                Layout = "";
+              };
+              "GroupOrder"."0" = "Default";
+            };
+            addons = {
+              classicui.globalSection = {
+                "Vertical Candidate List" = "True";
+                Font = "Fira Sans 10";
+                MenuFont = "Fira Sans 10";
+                TrayFont = "Fira Sans Demi-Bold 10";
+                UseDarkTheme = "True";
+              };
+              quickphrase = {
+                globalSection = {
+                  "Choose Modifier" = "None";
+                  Spell = "True";
+                  FallbackSpellLanguage = "en";
+                };
+                sections.TriggerKey."0" = "Super+E";
+              };
+            };
+          };
+        };
+      };
     };
   };
 }