diff --git a/README.md b/README.md index bda83be..3bbc0ca 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ +# Install Nix/Lix +`curl --proto '=https' --tlsv1.2 -sSf -L https://install.lix.systems/lix | sh -s -- install --no-confirm` + # Bootstrap home-manager ``` -nix-shell -p git -p home-manager -cd .config -# git clone ssh://git@git.mlaga97.space:2222/mlaga97/home-manager -git clone https://git.mlaga97.space/mlaga97/home-manager -home-manager switch +nix run nixpkgs#git https://git.mlaga97.space/mlaga97/mlaga97-nix +cd mlaga97-nix +./home.sh ``` diff --git a/flake.nix b/flake.nix index 6275372..64469ed 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,7 @@ home.homeDirectory = "/home/lauren_lagarde"; nixpkgs.config.allowUnfree = true; + home.stateVersion = pkgs.lib.mkDefault "25.05"; } ./home-manager/base.nix diff --git a/home-manager/programs/bash.nix b/home-manager/programs/bash.nix index 3253aa9..0c53843 100644 --- a/home-manager/programs/bash.nix +++ b/home-manager/programs/bash.nix @@ -7,18 +7,24 @@ in { ssh-with-yubikey = "ssh_with_yubikey"; }; bashrcExtra = '' + # Load Default .bashrc if non-NixOS + if [ -e "/etc/skel/.bashrc" ]; then + source /etc/skel/.bashrc + fi + + # Helper Functions ssh_with_yubikey () { AGENT_SOCKET=$(ssh $@ gpgconf --list-dirs agent-socket) && ssh -A -R "$AGENT_SOCKET:$(gpgconf --list-dirs agent-socket)" -o "StreamLocalBindUnlink=yes" $@; } case "$(sed -n 's|^NAME=||p' /etc/os-release)" in - "Alpine Linux") - DISTRO_SYMBOL="" - ;; - "Ubuntu") - DISTRO_SYMBOL="" - ;; "NixOS") DISTRO_SYMBOL="" ;; + "Ubuntu"|'"Ubuntu"') + DISTRO_SYMBOL="" + ;; + "Alpine Linux") + DISTRO_SYMBOL="" + ;; "Arch Linux") DISTRO_SYMBOL="" ;;