1 files changed, 20 insertions, 16 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index c7588e2f..23525791 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -160,7 +160,7 @@ in {
             yaml-mode json-mode shakespeare-mode smart-mode-line
             highlight-parentheses highlight-symbol ag sass-mode lua-mode
             fira-code-mode use-package wanderlust # notmuch
-            use-package-ensure-system-package git-gutter emacsScratch
+            git-gutter emacsScratch
             edit-server mediawiki editorconfig typescript-mode
             markdown-mode nftables-mode rustic lsp-mode lsp-ui
             direnv company projectile tomorrow-night-paradise-theme
@@ -209,6 +209,7 @@ in {
           flk = "$HOME/projects/machines";
           rz = "$HOME/projects/rz";
           pro = "$HOME/projects/pro";
+          media = "$HOME/media";
         };
 
         obs-studio = {
@@ -227,7 +228,7 @@ in {
         kitty = {
           enable = true;
           font = {
-            package = pkgs.fira;
+            package = pkgs.nerd-fonts.fira-mono;
             name = "Fira Mono";
             size = 10;
           };
@@ -270,13 +271,14 @@ in {
               output = [ "eDP-1" "DP-2" "DP-3" ];
               modules-left = [ "hyprland/workspaces" ];
               modules-center = [ "hyprland/window" ];
-              modules-right = [ "custom/worktime" "custom/worktime-today" "custom/weather" "custom/keymap" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
+              modules-right = [ # "custom/worktime" "custom/worktime-today"
+                "custom/weather" "custom/keymap" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
 
               "custom/weather" = {
                 format = "{}";
                 tooltip = true;
                 interval = 3600;
-                exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\"";
+                exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\"";
                 return-type = "json";
               };
               "custom/keymap" = {
@@ -696,19 +698,19 @@ in {
 
       home = {
         packages = with pkgs; [
-          fira fira-code powerline-fonts nerdfonts pwvucontrol
-          wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl
-          pamixer libnotify screen-message wrappedYTMDesktop
-          libsForQt5.qt5ct playerctl evince thunderbird zoom-us steam
-          steam-run wireshark virt-manager rclone cached-nix-shell
-          worktime fira-code-symbols libreoffice xournalpp
-          google-chrome nixos-shell virt-viewer freerdp
-          gnome-icon-theme paper-icon-theme sshpassSecret weechat
-          element-desktop matrix-synapse-tools.synadm
+          fira fira-code pwvucontrol wrappedKeepassxc wl-clipboard-rs
+          mumble pulseaudio-ctl pamixer libnotify screen-message
+          wrappedYTMDesktop libsForQt5.qt5ct playerctl evince
+          thunderbird zoom-us steam steam-run wireshark virt-manager
+          rclone cached-nix-shell worktime fira-code-symbols
+          libreoffice xournalpp google-chrome nixos-shell virt-viewer
+          freerdp gnome-icon-theme paper-icon-theme sshpassSecret
+          weechat element-desktop matrix-synapse-tools.synadm
           flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
           sieve-connect gimp inkscape udiskie glab nitrokey-app
           pynitrokey gtklock wlrctl remmina openscad spice-record
-          libguestfs-with-appliance
+          libguestfs-with-appliance nerd-fonts.fira-mono
+          nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
         ];
 
         file = {
@@ -768,6 +770,8 @@ in {
               idle-hide = true;
               follow-focus = true;
               start-hidden = true;
+              time-format = "%H:%M:%S";
+              date-format = "%Y-%m-%d";
             };
           };
         };
@@ -931,10 +935,10 @@ in {
         xdgOpenUsePortal = true;
         config = {
           common.default = [ "gtk" ];
-          hyprland.default = [ "gtk" "hyprland" ];
+          hyprland.default = [ "gtk" "kde" "hyprland" ];
         };
         extraPortals = with pkgs; [
-          xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-desktop-portal-hyprland
+          xdg-desktop-portal-kde xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-desktop-portal-hyprland
         ];
       };
     };