move zsh stuff from backup

BrianHicks · Aug 23, 2021 · dc3d012 · dc3d012
1 parent bbf24bd
commit dc3d012
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 17 deletions.
diff --git a/dotfiles/default.nix b/dotfiles/default.nix
@@ -14,5 +14,6 @@
     ./xmonad
     ./xsession
     ./zoom
+    ./zsh
   ];
 }
diff --git a/backup/dotfiles/zsh.nix → dotfiles/zsh/default.nix b/backup/dotfiles/zsh.nix → dotfiles/zsh/default.nix
@@ -1,21 +1,18 @@
 { pkgs, ... }:
-
 let
-  sources = import ../nix/sources.nix;
-
   extras = [
-    ./zsh/elm.zsh
-    ./zsh/find-and-edit.zsh
-    ./zsh/git.zsh
-    ./zsh/jetpack.zsh
-    ./zsh/jump.zsh
-    ./zsh/kill.zsh
-    ./zsh/nix.zsh
-    ./zsh/nixify.sh
-    ./zsh/root.zsh
-    ./zsh/rubofix.zsh
-    ./zsh/scripts.zsh
-    ./zsh/search.zsh
+    ./elm.zsh
+    ./find-and-edit.zsh
+    ./git.zsh
+    ./jetpack.zsh
+    ./jump.zsh
+    ./kill.zsh
+    ./nix.zsh
+    ./nixify.sh
+    ./root.zsh
+    ./rubofix.zsh
+    ./scripts.zsh
+    ./search.zsh
   ];
 
   extraInitExtra =
@@ -32,7 +29,7 @@ in {
 
     plugins = [{
       name = "fzf-tab";
-      src = sources.fzf-tab;
+      src = pkgs.fzf-tab;
     }];
 
     initExtra = ''

diff --git a/backup/dotfiles/zsh/elm.zsh → dotfiles/zsh/elm.zsh b/backup/dotfiles/zsh/elm.zsh → dotfiles/zsh/elm.zsh
diff --git a/backup/dotfiles/zsh/find-and-edit.zsh → dotfiles/zsh/find-and-edit.zsh b/backup/dotfiles/zsh/find-and-edit.zsh → dotfiles/zsh/find-and-edit.zsh
diff --git a/backup/dotfiles/zsh/git.zsh → dotfiles/zsh/git.zsh b/backup/dotfiles/zsh/git.zsh → dotfiles/zsh/git.zsh
diff --git a/backup/dotfiles/zsh/jetpack.zsh → dotfiles/zsh/jetpack.zsh b/backup/dotfiles/zsh/jetpack.zsh → dotfiles/zsh/jetpack.zsh
diff --git a/backup/dotfiles/zsh/jump.zsh → dotfiles/zsh/jump.zsh b/backup/dotfiles/zsh/jump.zsh → dotfiles/zsh/jump.zsh
diff --git a/backup/dotfiles/zsh/kill.zsh → dotfiles/zsh/kill.zsh b/backup/dotfiles/zsh/kill.zsh → dotfiles/zsh/kill.zsh
diff --git a/backup/dotfiles/zsh/nix.zsh → dotfiles/zsh/nix.zsh b/backup/dotfiles/zsh/nix.zsh → dotfiles/zsh/nix.zsh
diff --git a/backup/dotfiles/zsh/nixify.sh → dotfiles/zsh/nixify.sh b/backup/dotfiles/zsh/nixify.sh → dotfiles/zsh/nixify.sh
diff --git a/backup/dotfiles/zsh/root.zsh → dotfiles/zsh/root.zsh b/backup/dotfiles/zsh/root.zsh → dotfiles/zsh/root.zsh
diff --git a/backup/dotfiles/zsh/rubofix.zsh → dotfiles/zsh/rubofix.zsh b/backup/dotfiles/zsh/rubofix.zsh → dotfiles/zsh/rubofix.zsh
diff --git a/backup/dotfiles/zsh/scripts.zsh → dotfiles/zsh/scripts.zsh b/backup/dotfiles/zsh/scripts.zsh → dotfiles/zsh/scripts.zsh
diff --git a/backup/dotfiles/zsh/search.zsh → dotfiles/zsh/search.zsh b/backup/dotfiles/zsh/search.zsh → dotfiles/zsh/search.zsh
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,6 +10,11 @@
       url = "github:tmux/tmux";
       flake = false;
     };
+
+    fzf-tab = {
+      url = "github:Aloxaf/fzf-tab";
+      flake = false;
+    };
   };
 
   outputs = inputs: {
@@ -29,6 +34,9 @@
       );
 
       git-gclone = final.callPackage ./pkgs/git-gclone {};
+
+      # is this going to cause problems by not actually being a package?
+      fzf-tab = inputs.fzf-tab;
     };
 
     nixosConfigurations.torch = inputs.nixpkgs.lib.nixosSystem {

diff --git a/nixos/brian/default.nix b/nixos/brian/default.nix
@@ -1,6 +1,7 @@
-{ ... }: {
+{ pkgs, ... }: {
   users.users.brian = {
     isNormalUser = true;
+    shell = pkgs.zsh;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
   };