Merge remote-tracking branch 'gum/master'

5 files changed, 17 insertions, 2 deletions

diff --git a/makefu/2configs/home-manager/default.nix b/makefu/2configs/home-manager/default.nix
index 2a4574cc8..f68b1092f 100644
--- a/makefu/2configs/home-manager/default.nix
+++ b/makefu/2configs/home-manager/default.nix
@@ -2,7 +2,9 @@
   imports = [
     <home-manager/nixos>
   ];
+  home-manager.useUserPackages = true;
   home-manager.users.makefu = {
+    home.stateVersion = "19.03";
   };
   environment.variables = {
     GTK_DATA_PREFIX = "/run/current-system/sw";
diff --git a/makefu/2configs/home-manager/desktop.nix b/makefu/2configs/home-manager/desktop.nix
index 63a5cdbef..406f7f0d1 100644
--- a/makefu/2configs/home-manager/desktop.nix
+++ b/makefu/2configs/home-manager/desktop.nix
@@ -5,7 +5,10 @@
   home-manager.users.makefu = {
     systemd.user.services.network-manager-applet.Service.Environment = ''XDG_DATA_DIRS=/run/current-system/sw/share:${pkgs.networkmanagerapplet}/share GDK_PIXBUF_MODULE_FILE=${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'';
     programs.browserpass = { browsers = [ "firefox" ] ; enable = true; };
-    programs.firefox.enable = true;
+    programs.firefox = {
+      enable = true;
+      enableIcedTea = true;
+    };
     programs.obs-studio.enable = true;
     xdg.enable = true;
     services.network-manager-applet.enable = true;
@@ -20,7 +23,6 @@
       filenamePattern=%F_%T_shot
     '';
 
-    systemd.user.services.pasystray.Service.Environment = "PATH=" + (lib.makeBinPath (with pkgs;[ pavucontrol paprefs /* pavumeter  */  /* paman */ ]) );
     programs.chromium = {
       enable = true;
       extensions = [
diff --git a/makefu/2configs/home-manager/recording.nix b/makefu/2configs/home-manager/recording.nix
new file mode 100644
index 000000000..31ca77b2b
--- /dev/null
+++ b/makefu/2configs/home-manager/recording.nix
@@ -0,0 +1,4 @@
+{pkgs, ... }:
+{
+    home-manager.users.makefu.programs.obs-studio.enable = true;
+}
diff --git a/makefu/2configs/home-manager/taskwarrior.nix b/makefu/2configs/home-manager/taskwarrior.nix
index 8ad16dcf2..57ba1a08d 100644
--- a/makefu/2configs/home-manager/taskwarrior.nix
+++ b/makefu/2configs/home-manager/taskwarrior.nix
@@ -3,6 +3,12 @@ let
   loc = "/home/makefu/.task";
 in {
   state = [ "${loc}/keys" ];
+  environment.shellAliases = {
+    tshack = "task tags:shack";
+    tkrebs = "task tags:krebs";
+    thome = "task tags:home";
+    t = "task project: ";
+  };
   home-manager.users.makefu.programs.taskwarrior = {
     enable = true;
     dataLocation = loc;
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 6c7b632e1..267a2e878 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -67,6 +67,7 @@
       home-manager.users.makefu.programs.zsh.shellAliases = {
         cat = "bat";
         catn = "${pkgs.coreutils}/bin/cat";
+        ncat = "${pkgs.coreutils}/bin/cat";
       };
     }
   ];