...

1 files changed, 11 insertions, 161 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 3a051a7a..231913d9 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -4,13 +4,6 @@ with lib;
 
 let
   cfg = config.home-manager.users.${userName};
-  deHaskell = flakeInputs.nixpkgs-stable.legacyPackages.x86_64-linux.haskell.packages.ghc92.override (oldAttrs: {
-    overrides = pkgs.lib.composeExtensions (oldAttrs.overrides or (_: _: {}))
-      (hself: hsuper: {
-        dbus = pkgs.haskell.lib.doJailbreak hsuper.dbus;
-      });
-  });
-  xmonad = import ./xmonad deHaskell;
   emacsScratch = pkgs.stdenv.mkDerivation (sources.emacs-scratch_el // rec {
     phases = [ "installPhase" ];
 
@@ -151,15 +144,6 @@ in {
 
   config = {
     services.displayManager.defaultSession = "Hyprland"; # "none+xmonad";
-    services.xserver = {
-      windowManager.session = [{
-        name = "xmonad";
-        start = ''
-          ${pkgs.systemd}/bin/systemd-cat -t xmonad -- ${pkgs.coreutils}/bin/env -u SHLVL -- ${xmonad}/bin/xmonad &
-          waitPID=$!
-        '';
-      }];
-    };
 
     home-manager.users.${userName} = {
       imports = [
@@ -254,12 +238,8 @@ in {
           };
         };
 
-        alacritty = {
-          enable = true;
-          settings = import ./alacritty.nix;
-        };
-
         zathura.enable = true;
+        imv.enable = true;
 
         mpv.config = {
           demuxer-max-bytes = 1073741824;
@@ -267,24 +247,6 @@ in {
           # gpu-api = "vulkan";
         };
 
-        autorandr = {
-          enable = true;
-          hooks = {
-            preswitch = {
-              "stop-tray" = ''
-                ${pkgs.systemd}/bin/systemctl --user try-restart tray.target
-              '';
-            };
-            postswitch = {
-              # "restart-compton" = "${pkgs.systemd}/bin/systemctl --user try-restart picom";
-              "restart-tray" = ''
-                ${pkgs.systemd}/bin/systemctl --user try-restart tray.target
-              '';
-            };
-          };
-          profiles = customUtils.nixImport rec { dir = ./autorandr-profiles; _import = name: _base: import "${toString dir}/${name}" inputs; };
-        };
-
         zsh.initExtra = "source ${./zshrc}";
         zsh.dirHashes = let
           flakeHashes = mapAttrs' (n: v: nameValuePair (inputNames.${n} or n) (toString v)) flakeInputs;
@@ -333,14 +295,6 @@ in {
             # notify_on_cmd_finish = "invisible 120";
           };
         };
-        wofi = {
-          enable = true;
-          settings = {
-            location = "top";
-            run-always_parse_args = true;
-            run-show_all = false;
-          };
-        };
         waybar = {
                 enable = true;
           systemd = {
@@ -605,41 +559,6 @@ in {
             mode = "center";
           };
         };
-        hyprlock = {
-          enable = false;
-          settings = {
-            general = {
-              disable_loading_bar = false;
-              grace = 60;
-              hide_cursor = true;
-              no_fade_in = false;
-            };
-
-            background = [
-              {
-                path = "screenshot";
-                blur_passes = 3;
-                blur_size = 8;
-              }
-            ];
-
-            input-field = [
-              {
-                size = "200, 50";
-                position = "0, -80";
-                monitor = "";
-                dots_center = true;
-                fade_on_empty = false;
-                font_color = "rgb(202, 211, 245)";
-                inner_color = "rgb(91, 96, 120)";
-                outer_color = "rgb(24, 25, 38)";
-                outline_thickness = 5;
-                placeholder_text = "'<span foreground=\"##cad3f5\">Password...</span>'";
-                shadow_passes = 2;
-              }
-            ];
-          };
-        };
         fuzzel = {
           enable = true;
           settings = {
@@ -690,13 +609,7 @@ in {
             grab
           '';
         };
-        taffybar = {
-          enable = false;
-          package = import ./taffybar { haskellPackages = deHaskell; };
-        };
-        # status-notifier-watcher.enable = true;
         xembed-sni-proxy.enable = true;
-        pasystray.enable = false;
         udiskie = {
           enable = true;
           automount = false;
@@ -709,23 +622,9 @@ in {
             };
           };
         };
-        unclutter = {
-          enable = false;
-          timeout = 5;
-        };
         network-manager-applet.enable = true;
         blueman-applet.enable = true;
 
-        sxhkd = {
-          enable = true;
-          keybindings = {
-            "button8" = "${muteScript}/bin/mute unmute";
-            "@button8" = "${muteScript}/bin/mute mute";
-            "button9" = "${pkgs.pulseaudio}/bin/pacmd set-sink-mute @DEFAULT_SINK@ 1";
-            "@button9" = "${pkgs.pulseaudio}/bin/pacmd set-sink-mute @DEFAULT_SINK@ 0";
-          };
-        };
-
         unison = {
           enable = true;
           pairs = {
@@ -746,24 +645,6 @@ in {
 
         easyeffects = {
           enable = true;
-          preset = "LoudnessEqualizer";
-        };
-
-        screen-locker = {
-          enable = false;
-          lockCmd = toString (pkgs.writeShellScript "lock" ''
-            ${pkgs.playerctl}/bin/playerctl -a status | ${pkgs.gnugrep}/bin/grep -q "Playing" && exit 0
-
-            cleanup() {
-              ${cfg.services.dunst.package}/bin/dunstctl set-paused false
-            }
-            trap cleanup EXIT INT TERM
-
-            # ${pkgs.playerctl}/bin/playerctl -a pause
-            ${cfg.services.dunst.package}/bin/dunstctl set-paused true
-            ${pkgs.xsecurelock}/bin/xsecurelock
-          '');
-          xss-lock.extraOptions = ["--transfer-sleep-lock"];
         };
 
         etesync-dav = {
@@ -771,30 +652,6 @@ in {
           serverUrl = "https://etesync.yggdrasil.li";
         };
 
-        hypridle = {
-          enable = false;
-          settings = {
-            general = {
-              after_sleep_cmd = "hyprctl dispatch dpms on";
-              before_sleep_cmd = "hyprlock";
-              ignore_dbus_inhibit = false;
-              ignore_systemd_inhibit = false;
-              lock_cmd = "hyprlock";
-            };
-
-            listener = [
-              {
-                timeout = 300;
-                on-timeout = "hyprlock";
-              }
-              {
-                timeout = 600;
-                on-timeout = "hyprctl dispatch dpms off";
-                on-resume = "hyprctl dispatch dpms on";
-              }
-            ];
-          };
-        };
         swayidle = {
           enable = true;
           events = [
@@ -856,33 +713,23 @@ in {
         };
       };
 
-      xsession = {
-        enable = true;
-
-        initExtra = ''
-          ${pkgs.xorg.xinput}/bin/xinput disable 'Synaptics TM3512-010'
-          ${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keysym Caps_Lock = Multi_key'
-        '';
-
-        preferStatusNotifierItems = true;
-      };
+      xsession.preferStatusNotifierItems = true;
 
       xresources.properties = import ./xresources.nix;
 
       home = {
         packages = with pkgs; [
           fira fira-code powerline-fonts nerdfonts pavucontrol
-          wrappedKeepassxc sxiv xclip mumble pulseaudio-ctl pamixer
-          libnotify synergy xorg.xbacklight screen-message
-          wrappedYTMDesktop qt5ct playerctl evince thunderbird
-          zoom-us steam steam-run wireshark virt-manager
-          rclone cached-nix-shell xournal xmonad worktime
+          wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl
+          pamixer libnotify screen-message wrappedYTMDesktop 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 scrot nitrokey-app
+          sieve-connect gimp inkscape udiskie glab nitrokey-app
           pynitrokey gtklock wlrctl nvidiaOffloadScript
         ];
 
@@ -935,6 +782,9 @@ in {
         "gtklock/config.ini" = {
           source = (pkgs.formats.ini {}).generate "config.ini" {
             main = {
+              idle-hide = true;
+              follow-focus = true;
+              start-hidden = true;
             };
           };
         };
@@ -1035,7 +885,7 @@ in {
           doFilter = n: v: (filters.${n} or id) (filter (d: d != "emacs.desktop") v);
         in mapAttrs doFilter (cfg.lib.xdg.mimeAssociations [
           cfg.programs.zathura.package
-          pkgs.sxiv
+          cfg.programs.imv.package
           cfg.programs.emacs.package
           cfg.programs.firefox.package
         ]) // {