From 670965e5f57136b144e920f9192a817c04f94511 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Sun, 9 Aug 2020 20:15:18 +0000 Subject: [PATCH 1/4] Updating the readme a bit --- README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c97668d..10355c9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,19 @@ # Simplify -I'm going all in on home-manager. Wish me luck. +I'm going all in on [Nix](https://nixos.org/) & [home-manager](https://github.com/rycee/home-manager). Wish me luck. + +## Nix home-manager files + +- **home-cli**: terminal-only settings +- **home-gui**: cross-platform settings for Linux, Mac, & Windows +- **home-mail**: eamil, contacts & calendar settings +- **home-mac**: Mac-only settings +- **home-linux**: Linux-only settigs + +## Systems + +I'm currently using Nix on: + +- my Samsung S9+ (via [nix-on-droid](https://github.com/t184256/nix-on-droid)) +- my Raspberry Pi 4 (running NixOS) +- my work Macbook Pro \ No newline at end of file From c20b8eea3e81bff7720cfb95e00440fcbf537163 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Sun, 9 Aug 2020 20:29:45 +0000 Subject: [PATCH 2/4] Clarifications --- README.md | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 10355c9..130e9a1 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,16 @@ -# Simplify - I'm going all in on [Nix](https://nixos.org/) & [home-manager](https://github.com/rycee/home-manager). Wish me luck. -## Nix home-manager files - -- **home-cli**: terminal-only settings -- **home-gui**: cross-platform settings for Linux, Mac, & Windows -- **home-mail**: eamil, contacts & calendar settings -- **home-mac**: Mac-only settings -- **home-linux**: Linux-only settigs +### Files -## Systems +- **home-cli**: terminal-only +- **home-gui**: cross-platform gui +- **home-mail**: eamil, contacts & calendar +- **home-mac**: Mac-only +- **home-linux**: Linux-only -I'm currently using Nix on: +### Systems -- my Samsung S9+ (via [nix-on-droid](https://github.com/t184256/nix-on-droid)) -- my Raspberry Pi 4 (running NixOS) -- my work Macbook Pro \ No newline at end of file +- **Samsung S9+**: Android & [Samsung Dex](https://www.samsung.com/us/explore/dex/) & [nix-on-droid](https://github.com/t184256/nix-on-droid) +- **Raspberry Pi 4**: NixOS +- **[Vultr](https://www.vultr.com/) VPS ([dustinswan.com](http://dustinswan.com))**: NixOS +- **Apple Macbook Pro (work laptop)**: MacOS & [nix-darwin](https://github.com/LnL7/nix-darwin) \ No newline at end of file From 55f19d0dd62ee57e80f867b67dd70ca4207ba64c Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Mon, 10 Aug 2020 00:58:43 +0000 Subject: [PATCH 3/4] Eh giving up trying nix-darwin --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 130e9a1..75af8f6 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ I'm going all in on [Nix](https://nixos.org/) & [home-manager](https://github.co - **Samsung S9+**: Android & [Samsung Dex](https://www.samsung.com/us/explore/dex/) & [nix-on-droid](https://github.com/t184256/nix-on-droid) - **Raspberry Pi 4**: NixOS - **[Vultr](https://www.vultr.com/) VPS ([dustinswan.com](http://dustinswan.com))**: NixOS -- **Apple Macbook Pro (work laptop)**: MacOS & [nix-darwin](https://github.com/LnL7/nix-darwin) \ No newline at end of file +- **Apple Macbook Pro (work laptop)**: MacOS & Nix \ No newline at end of file From 1c68c87c351e30ecb0054d87a1d3b4601e2098ee Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Mon, 31 Aug 2020 21:17:21 -0400 Subject: [PATCH 4/4] Minor changes to mac home-manager confs --- home-cli.nix | 2 +- home-gui.nix | 4 ++++ home-mac.nix | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/home-cli.nix b/home-cli.nix index 892015c..7b1c085 100644 --- a/home-cli.nix +++ b/home-cli.nix @@ -114,7 +114,7 @@ userName = "Dustin Swan"; userEmail = "dustin@dustinswan.com"; signing = { - signByDefault = true; + # signByDefault = true; key = "AD11750151C10881970BD943AB49BD6B2B3A6377"; }; aliases = { diff --git a/home-gui.nix b/home-gui.nix index f363b27..6f6f50c 100644 --- a/home-gui.nix +++ b/home-gui.nix @@ -1,4 +1,8 @@ +{ pkgs, ... }: + { + home.packages = with pkgs; [ iosevka-bin ]; # syncthing ]; + programs.alacritty = { enable = true; settings = { diff --git a/home-mac.nix b/home-mac.nix index 8958ee0..0a94e86 100644 --- a/home-mac.nix +++ b/home-mac.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { - home.packages = with pkgs; [ pinentry_mac terminal-notifier syncthing ]; + home.packages = with pkgs; [ pinentry_mac terminal-notifier ]; # syncthing ]; home.file.gpg-agent = { target = ".gnupg/gpg-agent.conf"; @@ -15,5 +15,5 @@ programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh"; # programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh"; - imports = [ ./home-cli.nix ./home-gui.nix ./home-mail.nix ]; + imports = [ ./home-cli.nix ./home-gui.nix ]; # ./home-mail.nix ]; }