diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix new file mode 120000 index 0000000..75723f2 --- /dev/null +++ b/nixpkgs/config.nix @@ -0,0 +1 @@ +/Users/administrator/Projects/nix-dots/nixpkgs/machines/mac/config.nix \ No newline at end of file diff --git a/nixpkgs/home.nix b/nixpkgs/home.nix new file mode 120000 index 0000000..f794e03 --- /dev/null +++ b/nixpkgs/home.nix @@ -0,0 +1 @@ +/Users/administrator/Projects/nix-dots/nixpkgs/machines/mac/home.nix \ No newline at end of file diff --git a/nixpkgs/install.sh b/nixpkgs/install.sh index df7242c..441fcdd 100755 --- a/nixpkgs/install.sh +++ b/nixpkgs/install.sh @@ -1,4 +1,4 @@ -# Where first arg is directory under machines, can be one of macos, fedora, nixos +# Where first arg is directory under machines mkdir -p $HOME/.config ln -s $(pwd) $HOME/.config/nixpkgs ln -s $(pwd)/machines/$1/home.nix $HOME/.config/nixpkgs/home.nix diff --git a/nixpkgs/machines/mac/config.nix b/nixpkgs/machines/mac/config.nix new file mode 100644 index 0000000..1dd1750 --- /dev/null +++ b/nixpkgs/machines/mac/config.nix @@ -0,0 +1,3 @@ +{ + allowUnfree = true; +} diff --git a/nixpkgs/machines/mac/home.nix b/nixpkgs/machines/mac/home.nix new file mode 100644 index 0000000..64f4c5c --- /dev/null +++ b/nixpkgs/machines/mac/home.nix @@ -0,0 +1,13 @@ +{ config, pkgs, ... }: +{ + imports = [ + ../../modules/home-manager.nix + ../../modules/zsh.nix + ../../modules/dev.nix + ../../modules/fonts.nix + ]; + + home.packages = with pkgs; [ + neofetch + ]; +} \ No newline at end of file diff --git a/nixpkgs/machines/wsl/config.nix b/nixpkgs/machines/wsl/config.nix new file mode 100644 index 0000000..1dd1750 --- /dev/null +++ b/nixpkgs/machines/wsl/config.nix @@ -0,0 +1,3 @@ +{ + allowUnfree = true; +} diff --git a/nixpkgs/machines/wsl/home.nix b/nixpkgs/machines/wsl/home.nix new file mode 100644 index 0000000..124e742 --- /dev/null +++ b/nixpkgs/machines/wsl/home.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: + +{ + imports = [ + ../../modules/home-manager.nix + ../../modules/git.nix + ../../modules/zsh.nix + ]; + + home.packages = with pkgs; [ + neofetch + pfetch + fortune + ]; + + programs.zsh.shellAliases = { + code = "/mnt/c/Program\\ Files/Microsoft\\ VS\\ Code/Code.exe"; + }; + +} \ No newline at end of file diff --git a/nixpkgs/modules/dev.nix b/nixpkgs/modules/dev.nix index 5686a9b..4141b3c 100644 --- a/nixpkgs/modules/dev.nix +++ b/nixpkgs/modules/dev.nix @@ -1,6 +1,6 @@ { config, pkgs, libs, ... }: { home.packages = with pkgs; [ - docker-compose + nodePackages.yarn ]; } \ No newline at end of file diff --git a/nixpkgs/modules/zsh.nix b/nixpkgs/modules/zsh.nix index 95877ad..b94b6b9 100644 --- a/nixpkgs/modules/zsh.nix +++ b/nixpkgs/modules/zsh.nix @@ -40,8 +40,8 @@ enable = true; enableZshIntegration = true; settings = { - character.symbol = "➜"; - character.success_symbol = "[➜](bold green)"; - }; + character.symbol = "➜ "; + character.success_symbol = "[➜](green)"; + }; }; } \ No newline at end of file