diff --git a/README.md b/README.md index 22f5a06..06642bb 100644 --- a/README.md +++ b/README.md @@ -2,25 +2,12 @@ [![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org) -This repo stores nix expressions to manage my machines. +This repo stores nix to manage my machines. The initial config here was heavily inspired from [here](https://gitlab.com/samuelgrf/nixos-config/-/tree/master/). ## Setup -## git - -Clone this as a bare repo to avoid the need for symlinking: - ```console -$ git clone --bare git@github.com:davegallant/nix-config.git $HOME/.dotfiles -$ alias config='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' # add alias to a .bashrc / .zshrc -$ config config --local status.showUntrackedFiles no -$ config checkout -f # this will overwrite any existing configs in the home directory -``` - -## home manager - -Install [nix](https://nixos.org/guides/install-nix.html) and [home-manager](https://github.com/nix-community/home-manager). - -```console -$ home-manager -f ~/nix/home.nix switch +$ git clone git@github.com:davegallant/nix-config.git +$ cd nix-config +$ sudo ./nixos-rebuild switch ``` diff --git a/nix/flake.lock b/flake.lock similarity index 100% rename from nix/flake.lock rename to flake.lock diff --git a/nix/flake.nix b/flake.nix similarity index 100% rename from nix/flake.nix rename to flake.nix diff --git a/nix/home/default.nix b/home/default.nix similarity index 99% rename from nix/home/default.nix rename to home/default.nix index a4c40d0..b31d7dc 100644 --- a/nix/home/default.nix +++ b/home/default.nix @@ -135,7 +135,6 @@ shellAliases = { ls = "exa -la --git"; ".." = "cd .."; - config = "git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME"; grep = "grep --color=auto --line-buffered"; k = "kubectl"; }; diff --git a/nix/lib/default.nix b/lib/default.nix similarity index 100% rename from nix/lib/default.nix rename to lib/default.nix diff --git a/nix/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix similarity index 100% rename from nix/machines/hephaestus/configuration.nix rename to machines/hephaestus/configuration.nix diff --git a/nix/machines/hephaestus/hardware.nix b/machines/hephaestus/hardware.nix similarity index 100% rename from nix/machines/hephaestus/hardware.nix rename to machines/hephaestus/hardware.nix diff --git a/nix/main/fonts.nix b/main/fonts.nix similarity index 100% rename from nix/main/fonts.nix rename to main/fonts.nix diff --git a/nix/main/general.nix b/main/general.nix similarity index 100% rename from nix/main/general.nix rename to main/general.nix diff --git a/nix/main/kernel.nix b/main/kernel.nix similarity index 100% rename from nix/main/kernel.nix rename to main/kernel.nix diff --git a/nix/main/packages.nix b/main/packages.nix similarity index 100% rename from nix/main/packages.nix rename to main/packages.nix diff --git a/nix/main/printing.nix b/main/printing.nix similarity index 100% rename from nix/main/printing.nix rename to main/printing.nix diff --git a/nix/modules/g810-led.nix b/modules/g810-led.nix similarity index 100% rename from nix/modules/g810-led.nix rename to modules/g810-led.nix diff --git a/nix/nixos-rebuild b/nixos-rebuild similarity index 100% rename from nix/nixos-rebuild rename to nixos-rebuild diff --git a/nix/overlays/default.nix b/overlays/default.nix similarity index 100% rename from nix/overlays/default.nix rename to overlays/default.nix diff --git a/nix/overlays/lastpass.nix b/overlays/lastpass.nix similarity index 100% rename from nix/overlays/lastpass.nix rename to overlays/lastpass.nix diff --git a/nix/overlays/rfd.nix b/overlays/rfd.nix similarity index 100% rename from nix/overlays/rfd.nix rename to overlays/rfd.nix diff --git a/nix/overlays/vpngate.nix b/overlays/vpngate.nix similarity index 100% rename from nix/overlays/vpngate.nix rename to overlays/vpngate.nix