...

1 files changed, 15 insertions, 16 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index b46d021e..80f03e49 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -63,7 +63,7 @@ let
   };
 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 = {
@@ -77,10 +77,10 @@ in {
 
       home.stateVersion = "20.09";
 
-      nixpkgs.config = {
-        allowUnfree = true;
-        zathura.useMupdf = false;
-      };
+      # nixpkgs.config = {
+      #   allowUnfree = true;
+      #   zathura.useMupdf = false;
+      # };
 
       nix.registry = {
         "flk" = {
@@ -186,7 +186,7 @@ in {
           gpu-api = "vulkan";
         };
 
-        zsh.initExtra = let
+        zsh.initContent = let
           zshrc = pkgs.resholve.mkDerivation {
             pname = "zshrc";
             version = "0.0.0";
@@ -219,7 +219,6 @@ in {
                   gnutar
                   cpio
                   magic-wormhole
-                  quickserve
                   cfg.programs.zsh.package
                   fuse
                   util-linux
@@ -232,6 +231,7 @@ in {
                   config.systemd.package
                   config.programs.ssh.package
                   gnused
+                  miniserve
                 ];
                 execer = with pkgs; [
                   "cannot:${lib.getExe' rpm "rpm2cpio"}"
@@ -240,7 +240,6 @@ in {
                   "cannot:${lib.getExe cfg.programs.git.package}"
                   "cannot:${lib.getExe cpio}"
                   "cannot:${lib.getExe' magic-wormhole "wormhole"}"
-                  "cannot:${lib.getExe quickserve}"
                   "cannot:${lib.getExe' fuse "fusermount"}"
                   "cannot:${lib.getExe less}"
                   "cannot:${lib.getExe' config.systemd.package "systemctl"}"
@@ -322,14 +321,6 @@ in {
             "kitty_mod+m" = "detach_window ask";
           };
         };
-        wpaperd = {
-          enable = true;
-          settings.default = {
-            path = "~/.wallpapers";
-            duration = "15m";
-            mode = "center";
-          };
-        };
         fuzzel = {
           enable = true;
           settings = {
@@ -360,6 +351,14 @@ in {
       };
 
       services = {
+        wpaperd = {
+          enable = true;
+          settings.default = {
+            path = "~/.wallpapers";
+            duration = "15m";
+            mode = "center";
+          };
+        };
         emacs = {
           enable = true;
           socketActivation.enable = true;