From 0a3a2365456a9dba20ab048b3984594135d89341 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 25 Feb 2021 14:21:48 -0500 Subject: [PATCH 1/4] Add WSL --- nixpkgs/machines/wsl/config.nix | 3 +++ nixpkgs/machines/wsl/home.nix | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 nixpkgs/machines/wsl/config.nix create mode 100644 nixpkgs/machines/wsl/home.nix 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 From 3ba7757eea0f2abb39f3c6f1f958d5ccdbe6fc48 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 28 Apr 2021 13:14:26 -0400 Subject: [PATCH 2/4] Add macbook config --- nixpkgs/config.nix | 1 + nixpkgs/home.nix | 1 + nixpkgs/machines/mac/config.nix | 3 +++ nixpkgs/machines/mac/home.nix | 12 ++++++++++++ nixpkgs/modules/dev.nix | 6 ++++++ nixpkgs/modules/zsh.nix | 6 +++--- 6 files changed, 26 insertions(+), 3 deletions(-) create mode 120000 nixpkgs/config.nix create mode 120000 nixpkgs/home.nix create mode 100644 nixpkgs/machines/mac/config.nix create mode 100644 nixpkgs/machines/mac/home.nix create mode 100644 nixpkgs/modules/dev.nix 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/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..1fd261e --- /dev/null +++ b/nixpkgs/machines/mac/home.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: +{ + imports = [ + ../../modules/home-manager.nix + ../../modules/zsh.nix + ../../modules/dev.nix + ]; + + home.packages = with pkgs; [ + neofetch + ]; +} \ No newline at end of file diff --git a/nixpkgs/modules/dev.nix b/nixpkgs/modules/dev.nix new file mode 100644 index 0000000..a465e05 --- /dev/null +++ b/nixpkgs/modules/dev.nix @@ -0,0 +1,6 @@ +{ config, pkgs, libs, ... }: +{ + home.packages = with pkgs; [ + yarn + ]; +} \ No newline at end of file diff --git a/nixpkgs/modules/zsh.nix b/nixpkgs/modules/zsh.nix index 42771b7..2b5f24c 100644 --- a/nixpkgs/modules/zsh.nix +++ b/nixpkgs/modules/zsh.nix @@ -28,8 +28,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 From b273dc704ad3d4eb43a0ab0928bb9e353ffb1fe2 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 27 May 2021 13:20:52 -0400 Subject: [PATCH 3/4] Update install.sh --- nixpkgs/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 8d2616c9baf001725236e65cfe1b0030d7a05f9e Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Tue, 15 Jun 2021 15:51:44 -0400 Subject: [PATCH 4/4] Update dev module --- nixpkgs/machines/mac/home.nix | 1 + nixpkgs/modules/dev.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixpkgs/machines/mac/home.nix b/nixpkgs/machines/mac/home.nix index 1fd261e..64f4c5c 100644 --- a/nixpkgs/machines/mac/home.nix +++ b/nixpkgs/machines/mac/home.nix @@ -4,6 +4,7 @@ ../../modules/home-manager.nix ../../modules/zsh.nix ../../modules/dev.nix + ../../modules/fonts.nix ]; home.packages = with pkgs; [ diff --git a/nixpkgs/modules/dev.nix b/nixpkgs/modules/dev.nix index a465e05..4141b3c 100644 --- a/nixpkgs/modules/dev.nix +++ b/nixpkgs/modules/dev.nix @@ -1,6 +1,6 @@ { config, pkgs, libs, ... }: { home.packages = with pkgs; [ - yarn + nodePackages.yarn ]; } \ No newline at end of file