From dc3d012c064302c77aa85bb06abbca35f4419b4f Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Mon, 23 Aug 2021 05:44:14 -0500 Subject: [PATCH] move zsh stuff from backup --- dotfiles/default.nix | 1 + .../zsh.nix => dotfiles/zsh/default.nix | 29 +++++++++---------- {backup/dotfiles => dotfiles}/zsh/elm.zsh | 0 .../zsh/find-and-edit.zsh | 0 {backup/dotfiles => dotfiles}/zsh/git.zsh | 0 {backup/dotfiles => dotfiles}/zsh/jetpack.zsh | 0 {backup/dotfiles => dotfiles}/zsh/jump.zsh | 0 {backup/dotfiles => dotfiles}/zsh/kill.zsh | 0 {backup/dotfiles => dotfiles}/zsh/nix.zsh | 0 {backup/dotfiles => dotfiles}/zsh/nixify.sh | 0 {backup/dotfiles => dotfiles}/zsh/root.zsh | 0 {backup/dotfiles => dotfiles}/zsh/rubofix.zsh | 0 {backup/dotfiles => dotfiles}/zsh/scripts.zsh | 0 {backup/dotfiles => dotfiles}/zsh/search.zsh | 0 flake.lock | 17 +++++++++++ flake.nix | 8 +++++ nixos/brian/default.nix | 3 +- 17 files changed, 41 insertions(+), 17 deletions(-) rename backup/dotfiles/zsh.nix => dotfiles/zsh/default.nix (65%) rename {backup/dotfiles => dotfiles}/zsh/elm.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/find-and-edit.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/git.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/jetpack.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/jump.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/kill.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/nix.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/nixify.sh (100%) rename {backup/dotfiles => dotfiles}/zsh/root.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/rubofix.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/scripts.zsh (100%) rename {backup/dotfiles => dotfiles}/zsh/search.zsh (100%) diff --git a/dotfiles/default.nix b/dotfiles/default.nix index 3cc4dce..9e255c0 100644 --- a/dotfiles/default.nix +++ b/dotfiles/default.nix @@ -14,5 +14,6 @@ ./xmonad ./xsession ./zoom + ./zsh ]; } diff --git a/backup/dotfiles/zsh.nix b/dotfiles/zsh/default.nix similarity index 65% rename from backup/dotfiles/zsh.nix rename to dotfiles/zsh/default.nix index 11dc696..40abf9e 100644 --- a/backup/dotfiles/zsh.nix +++ b/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 b/dotfiles/zsh/elm.zsh similarity index 100% rename from backup/dotfiles/zsh/elm.zsh rename to dotfiles/zsh/elm.zsh diff --git a/backup/dotfiles/zsh/find-and-edit.zsh b/dotfiles/zsh/find-and-edit.zsh similarity index 100% rename from backup/dotfiles/zsh/find-and-edit.zsh rename to dotfiles/zsh/find-and-edit.zsh diff --git a/backup/dotfiles/zsh/git.zsh b/dotfiles/zsh/git.zsh similarity index 100% rename from backup/dotfiles/zsh/git.zsh rename to dotfiles/zsh/git.zsh diff --git a/backup/dotfiles/zsh/jetpack.zsh b/dotfiles/zsh/jetpack.zsh similarity index 100% rename from backup/dotfiles/zsh/jetpack.zsh rename to dotfiles/zsh/jetpack.zsh diff --git a/backup/dotfiles/zsh/jump.zsh b/dotfiles/zsh/jump.zsh similarity index 100% rename from backup/dotfiles/zsh/jump.zsh rename to dotfiles/zsh/jump.zsh diff --git a/backup/dotfiles/zsh/kill.zsh b/dotfiles/zsh/kill.zsh similarity index 100% rename from backup/dotfiles/zsh/kill.zsh rename to dotfiles/zsh/kill.zsh diff --git a/backup/dotfiles/zsh/nix.zsh b/dotfiles/zsh/nix.zsh similarity index 100% rename from backup/dotfiles/zsh/nix.zsh rename to dotfiles/zsh/nix.zsh diff --git a/backup/dotfiles/zsh/nixify.sh b/dotfiles/zsh/nixify.sh similarity index 100% rename from backup/dotfiles/zsh/nixify.sh rename to dotfiles/zsh/nixify.sh diff --git a/backup/dotfiles/zsh/root.zsh b/dotfiles/zsh/root.zsh similarity index 100% rename from backup/dotfiles/zsh/root.zsh rename to dotfiles/zsh/root.zsh diff --git a/backup/dotfiles/zsh/rubofix.zsh b/dotfiles/zsh/rubofix.zsh similarity index 100% rename from backup/dotfiles/zsh/rubofix.zsh rename to dotfiles/zsh/rubofix.zsh diff --git a/backup/dotfiles/zsh/scripts.zsh b/dotfiles/zsh/scripts.zsh similarity index 100% rename from backup/dotfiles/zsh/scripts.zsh rename to dotfiles/zsh/scripts.zsh diff --git a/backup/dotfiles/zsh/search.zsh b/dotfiles/zsh/search.zsh similarity index 100% rename from backup/dotfiles/zsh/search.zsh rename to dotfiles/zsh/search.zsh diff --git a/flake.lock b/flake.lock index 863ac55..a3aa108 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "fzf-tab": { + "flake": false, + "locked": { + "lastModified": 1628145081, + "narHash": "sha256-vfF0uEznND3p7eWHLLrnLIw80gVXQ7Zi4Qu+3GgIAL0=", + "owner": "Aloxaf", + "repo": "fzf-tab", + "rev": "89a33154707c09789177a893e5a8ebbb131d5d3d", + "type": "github" + }, + "original": { + "owner": "Aloxaf", + "repo": "fzf-tab", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs" @@ -66,6 +82,7 @@ }, "root": { "inputs": { + "fzf-tab": "fzf-tab", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 6dd0bb6..b5675ce 100644 --- 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 index e854425..b37bb62 100644 --- 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. };