put dotfiley stuff in dotfiles

BrianHicks · Jul 19, 2019 · c5cc878 · c5cc878
1 parent 60db706
commit c5cc878
Show file tree

Hide file tree

Showing 60 changed files with 9 additions and 9 deletions.
diff --git a/darwin.nix b/darwin.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  dotfiles = import ./dotfiles.nix;
+  dotfiles = import ./dotfiles;
 in
   {
     imports = [

diff --git a/dotfiles.nix → dotfiles/default.nix b/dotfiles.nix → dotfiles/default.nix
@@ -2,13 +2,13 @@
 
 {
   imports = [
-    ./config/direnv.nix
-    ./config/emacs.nix
-    ./config/fzf.nix
-    ./config/git.nix
-    ./config/neovim.nix
-    ./config/ssh.nix
-    ./config/zsh.nix
+    ./direnv.nix
+    ./emacs.nix
+    ./fzf.nix
+    ./git.nix
+    ./neovim.nix
+    ./ssh.nix
+    ./zsh.nix
   ];
 
   home.packages = [
@@ -22,7 +22,7 @@
     # local packages. I know I could use overlays for these (cf
     # https://github.com/jwoudenberg/dotfiles/commit/12bd31b269b82f0dc661140b8df275ef24f41b81)
     # but I don't want to have to symlink into the overlays directory manually.
-    (pkgs.callPackage ./pkgs/lorri.nix { })
+    (pkgs.callPackage ../pkgs/lorri.nix { })
   ];
 
   programs.man.enable = true;

diff --git a/config/direnv.nix → dotfiles/direnv.nix b/config/direnv.nix → dotfiles/direnv.nix
diff --git a/config/emacs-snippets/elm-mode/cas → dotfiles/emacs-snippets/elm-mode/cas b/config/emacs-snippets/elm-mode/cas → dotfiles/emacs-snippets/elm-mode/cas
diff --git a/config/emacs-snippets/elm-mode/fun → dotfiles/emacs-snippets/elm-mode/fun b/config/emacs-snippets/elm-mode/fun → dotfiles/emacs-snippets/elm-mode/fun
diff --git a/config/emacs-snippets/elm-mode/imp → dotfiles/emacs-snippets/elm-mode/imp b/config/emacs-snippets/elm-mode/imp → dotfiles/emacs-snippets/elm-mode/imp
diff --git a/config/emacs-snippets/elm-mode/mod → dotfiles/emacs-snippets/elm-mode/mod b/config/emacs-snippets/elm-mode/mod → dotfiles/emacs-snippets/elm-mode/mod
diff --git a/config/emacs-snippets/enh-ruby-mode/rspec → dotfiles/emacs-snippets/enh-ruby-mode/rspec b/config/emacs-snippets/enh-ruby-mode/rspec → dotfiles/emacs-snippets/enh-ruby-mode/rspec
diff --git a/config/emacs.nix → dotfiles/emacs.nix b/config/emacs.nix → dotfiles/emacs.nix
diff --git a/config/emacs/basics.el → dotfiles/emacs/basics.el b/config/emacs/basics.el → dotfiles/emacs/basics.el
diff --git a/config/emacs/compilation.el → dotfiles/emacs/compilation.el b/config/emacs/compilation.el → dotfiles/emacs/compilation.el
diff --git a/config/emacs/completion.el → dotfiles/emacs/completion.el b/config/emacs/completion.el → dotfiles/emacs/completion.el
diff --git a/config/emacs/diffing.el → dotfiles/emacs/diffing.el b/config/emacs/diffing.el → dotfiles/emacs/diffing.el
diff --git a/config/emacs/direnv.el → dotfiles/emacs/direnv.el b/config/emacs/direnv.el → dotfiles/emacs/direnv.el
diff --git a/config/emacs/display.el → dotfiles/emacs/display.el b/config/emacs/display.el → dotfiles/emacs/display.el
diff --git a/config/emacs/eshell-config.el → dotfiles/emacs/eshell-config.el b/config/emacs/eshell-config.el → dotfiles/emacs/eshell-config.el
diff --git a/config/emacs/evil.el → dotfiles/emacs/evil.el b/config/emacs/evil.el → dotfiles/emacs/evil.el
diff --git a/config/emacs/folding.el → dotfiles/emacs/folding.el b/config/emacs/folding.el → dotfiles/emacs/folding.el
diff --git a/config/emacs/git.el → dotfiles/emacs/git.el b/config/emacs/git.el → dotfiles/emacs/git.el
diff --git a/config/emacs/helm-config.el → dotfiles/emacs/helm-config.el b/config/emacs/helm-config.el → dotfiles/emacs/helm-config.el
diff --git a/config/emacs/icons.el → dotfiles/emacs/icons.el b/config/emacs/icons.el → dotfiles/emacs/icons.el
diff --git a/config/emacs/init.el → dotfiles/emacs/init.el b/config/emacs/init.el → dotfiles/emacs/init.el
diff --git a/config/emacs/jumping.el → dotfiles/emacs/jumping.el b/config/emacs/jumping.el → dotfiles/emacs/jumping.el
diff --git a/config/emacs/lang/coffeescript.el → dotfiles/emacs/lang/coffeescript.el b/config/emacs/lang/coffeescript.el → dotfiles/emacs/lang/coffeescript.el
diff --git a/config/emacs/lang/csv.el → dotfiles/emacs/lang/csv.el b/config/emacs/lang/csv.el → dotfiles/emacs/lang/csv.el
diff --git a/config/emacs/lang/dockerfile.el → dotfiles/emacs/lang/dockerfile.el b/config/emacs/lang/dockerfile.el → dotfiles/emacs/lang/dockerfile.el
diff --git a/config/emacs/lang/elixir.el → dotfiles/emacs/lang/elixir.el b/config/emacs/lang/elixir.el → dotfiles/emacs/lang/elixir.el
diff --git a/config/emacs/lang/elm.el → dotfiles/emacs/lang/elm.el b/config/emacs/lang/elm.el → dotfiles/emacs/lang/elm.el
diff --git a/config/emacs/lang/graphviz.el → dotfiles/emacs/lang/graphviz.el b/config/emacs/lang/graphviz.el → dotfiles/emacs/lang/graphviz.el
diff --git a/config/emacs/lang/haml.el → dotfiles/emacs/lang/haml.el b/config/emacs/lang/haml.el → dotfiles/emacs/lang/haml.el
diff --git a/config/emacs/lang/haskell.el → dotfiles/emacs/lang/haskell.el b/config/emacs/lang/haskell.el → dotfiles/emacs/lang/haskell.el
diff --git a/config/emacs/lang/html.el → dotfiles/emacs/lang/html.el b/config/emacs/lang/html.el → dotfiles/emacs/lang/html.el
diff --git a/config/emacs/lang/idris.el → dotfiles/emacs/lang/idris.el b/config/emacs/lang/idris.el → dotfiles/emacs/lang/idris.el
diff --git a/config/emacs/lang/javascript.el → dotfiles/emacs/lang/javascript.el b/config/emacs/lang/javascript.el → dotfiles/emacs/lang/javascript.el
diff --git a/config/emacs/lang/json.el → dotfiles/emacs/lang/json.el b/config/emacs/lang/json.el → dotfiles/emacs/lang/json.el
diff --git a/config/emacs/lang/markdown.el → dotfiles/emacs/lang/markdown.el b/config/emacs/lang/markdown.el → dotfiles/emacs/lang/markdown.el
diff --git a/config/emacs/lang/nix.el → dotfiles/emacs/lang/nix.el b/config/emacs/lang/nix.el → dotfiles/emacs/lang/nix.el
diff --git a/config/emacs/lang/org-mode-config.el → dotfiles/emacs/lang/org-mode-config.el b/config/emacs/lang/org-mode-config.el → dotfiles/emacs/lang/org-mode-config.el
diff --git a/config/emacs/lang/ruby.el → dotfiles/emacs/lang/ruby.el b/config/emacs/lang/ruby.el → dotfiles/emacs/lang/ruby.el
diff --git a/config/emacs/lang/rust.el → dotfiles/emacs/lang/rust.el b/config/emacs/lang/rust.el → dotfiles/emacs/lang/rust.el
diff --git a/config/emacs/lang/terraform.el → dotfiles/emacs/lang/terraform.el b/config/emacs/lang/terraform.el → dotfiles/emacs/lang/terraform.el
diff --git a/config/emacs/lang/toml.el → dotfiles/emacs/lang/toml.el b/config/emacs/lang/toml.el → dotfiles/emacs/lang/toml.el
diff --git a/config/emacs/lang/yaml.el → dotfiles/emacs/lang/yaml.el b/config/emacs/lang/yaml.el → dotfiles/emacs/lang/yaml.el
diff --git a/config/emacs/linting.el → dotfiles/emacs/linting.el b/config/emacs/linting.el → dotfiles/emacs/linting.el
diff --git a/config/emacs/projects.el → dotfiles/emacs/projects.el b/config/emacs/projects.el → dotfiles/emacs/projects.el
diff --git a/config/emacs/snippets.el → dotfiles/emacs/snippets.el b/config/emacs/snippets.el → dotfiles/emacs/snippets.el
diff --git a/config/fzf.nix → dotfiles/fzf.nix b/config/fzf.nix → dotfiles/fzf.nix
diff --git a/config/git.nix → dotfiles/git.nix b/config/git.nix → dotfiles/git.nix
diff --git a/config/neovim.nix → dotfiles/neovim.nix b/config/neovim.nix → dotfiles/neovim.nix
diff --git a/config/ssh.nix → dotfiles/ssh.nix b/config/ssh.nix → dotfiles/ssh.nix
diff --git a/config/zsh.nix → dotfiles/zsh.nix b/config/zsh.nix → dotfiles/zsh.nix
diff --git a/config/zsh/elm.zsh → dotfiles/zsh/elm.zsh b/config/zsh/elm.zsh → dotfiles/zsh/elm.zsh
diff --git a/config/zsh/emacs.zsh → dotfiles/zsh/emacs.zsh b/config/zsh/emacs.zsh → dotfiles/zsh/emacs.zsh
diff --git a/config/zsh/jetpack.zsh → dotfiles/zsh/jetpack.zsh b/config/zsh/jetpack.zsh → dotfiles/zsh/jetpack.zsh
diff --git a/config/zsh/jump.zsh → dotfiles/zsh/jump.zsh b/config/zsh/jump.zsh → dotfiles/zsh/jump.zsh
diff --git a/config/zsh/kill-process.zsh → dotfiles/zsh/kill-process.zsh b/config/zsh/kill-process.zsh → dotfiles/zsh/kill-process.zsh
diff --git a/config/zsh/lorri.zsh → dotfiles/zsh/lorri.zsh b/config/zsh/lorri.zsh → dotfiles/zsh/lorri.zsh
diff --git a/config/zsh/nixify.sh → dotfiles/zsh/nixify.sh b/config/zsh/nixify.sh → dotfiles/zsh/nixify.sh
diff --git a/config/zsh/rubofix.zsh → dotfiles/zsh/rubofix.zsh b/config/zsh/rubofix.zsh → dotfiles/zsh/rubofix.zsh
diff --git a/config/zsh/scripts.zsh → dotfiles/zsh/scripts.zsh b/config/zsh/scripts.zsh → dotfiles/zsh/scripts.zsh