Merge branch 'master' of https://git.dodsorf.as/Dandellion/nix-dotfiles

config/xsession/xsession.nix

@@ -84,6 +84,7 @@ export QT_STYLE_OVERRIDE="breeze"
   home.packages = [
     pkgs.xorg.xbacklight
     pkgs.pavucontrol
+    pkgs.xorg.xkill
 
     pkgs.dunst
     pkgs.libnotify

config/xsession/zsh/zsh.nix

@@ -47,6 +47,10 @@ export ***REMOVED***
 export FV_KUBECONFIG="$HOME/.kube/config-fv"
 
 
+export FV_KUBECONFIG="$HOME/.kube/config-fv"
+
+
+
 eval "$(ntfy shell-integration)"
 AUTO_NTFY_DONE_IGNORE="vim nano screen tmux man mpv nmtui"
     '';

home.nix

@@ -12,9 +12,11 @@
   home.packages = [
     pkgs.libguestfs
     pkgs.virtmanager
+    pkgs.virt-viewer
     pkgs.ansible
     pkgs.nixops
     pkgs.ldns
+    pkgs.jq
 
     pkgs.steam
     pkgs.dolphinEmuMaster

overlays/ntfy.nix

@@ -4,9 +4,9 @@ self: super:
     packageOverrides = python-self: python-super: {
       ntfy = python-super.ntfy.overrideAttrs (oldAttrs: {
         src = super.fetchgit {
-          url = "https://github.com/dali99/ntfy";
-          rev = "7b51d148bf1649cb95bf819b57e3b89b12c2e294";
-          sha256 = "0rzmc95ybpxbjp36jhssgs2f4c1c32f9a7s4hkwyin67131v9v8k";
+          url = "https://github.com/dschep/ntfy";
+          rev = "1f6721cb6e41d3fd0de6ddb7a4f1302551e1c783";
+          sha256 = "1n08w6h1narq3jwhd4k1p23hyysn6knaij0r1gpnakx9437h6yk4";
         };
         propagatedBuildInputs = with python-self; [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil dbus-python matrix-client ];
         preBuild = ''