From de8503d9a68e133a35cadd1e7fb7bf291bb3cb97 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Sat, 10 Feb 2024 11:56:31 +0800 Subject: [PATCH] refactor: use snowfall --- flake.lock | 149 ++++++++++++------ flake.nix | 35 ++-- .../ryanccn@Ryans-Macbook-Pro}/aliases.nix | 0 .../ryanccn@Ryans-Macbook-Pro/bat/default.nix | 0 .../ryanccn@Ryans-Macbook-Pro}/default.nix | 21 --- .../direnv/default.nix | 0 .../ryanccn@Ryans-Macbook-Pro/eza/default.nix | 0 .../fish/conf.d/01_tooling.fish | 0 .../fish/conf.d/99_interactive.fish | 0 .../fish/default.nix | 4 +- .../fonts/default.nix | 0 .../ryanccn@Ryans-Macbook-Pro/fzf/default.nix | 0 .../ryanccn@Ryans-Macbook-Pro/git/default.nix | 0 .../glamour/default.nix | 0 .../ryanccn@Ryans-Macbook-Pro/go/default.nix | 0 .../helix/default.nix | 0 .../rust/default.nix | 13 ++ .../starship/default.nix | 0 .../tealdeer/default.nix | 0 .../variables/default.nix | 0 .../vscode/default.nix | 12 +- .../zoxide/default.nix | 0 .../ryanccn@Ryans-Macbook-Pro/zsh/default.nix | 6 +- .../zsh/envExtra.zsh | 0 .../zsh/initExtra.zsh | 0 modules/darwin/activation/default.nix | 8 + .../homebrew/default.nix} | 0 modules/{nix.nix => darwin/nix/default.nix} | 17 +- .../{packages.nix => packages/default.nix} | 13 -- overlays/default.nix | 4 - .../{ibm-plex.nix => ibm-plex/default.nix} | 2 +- .../default.nix} | 2 +- system.nix | 58 ------- system/aarch64-darwin/Ryans-Macbook-Pro.nix | 31 ++++ 34 files changed, 181 insertions(+), 194 deletions(-) rename {home/programs => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro}/aliases.nix (100%) rename home/programs/bat.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/bat/default.nix (100%) rename {home => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro}/default.nix (50%) rename home/programs/direnv.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/direnv/default.nix (100%) rename home/programs/eza.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/eza/default.nix (100%) rename {home/programs => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro}/fish/conf.d/01_tooling.fish (100%) rename {home/programs => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro}/fish/conf.d/99_interactive.fish (100%) rename home/programs/fish.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fish/default.nix (92%) rename home/fonts.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fonts/default.nix (100%) rename home/programs/fzf.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fzf/default.nix (100%) rename home/programs/git.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/git/default.nix (100%) rename home/programs/glamour.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/glamour/default.nix (100%) rename home/programs/go.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/go/default.nix (100%) rename home/programs/helix.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/helix/default.nix (100%) rename home/programs/rust.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/rust/default.nix (58%) rename home/programs/starship.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/starship/default.nix (100%) rename home/programs/tealdeer.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/tealdeer/default.nix (100%) rename home/variables.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/variables/default.nix (100%) rename home/apps/vscode.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/vscode/default.nix (97%) rename home/programs/zoxide.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zoxide/default.nix (100%) rename home/programs/zsh.nix => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zsh/default.nix (84%) rename {home/programs => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro}/zsh/envExtra.zsh (100%) rename {home/programs => homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro}/zsh/initExtra.zsh (100%) create mode 100644 modules/darwin/activation/default.nix rename modules/{homebrew.nix => darwin/homebrew/default.nix} (100%) rename modules/{nix.nix => darwin/nix/default.nix} (62%) rename modules/{packages.nix => packages/default.nix} (78%) delete mode 100644 overlays/default.nix rename overlays/{ibm-plex.nix => ibm-plex/default.nix} (98%) rename overlays/{ryan-mono-bin.nix => ryan-mono-bin/default.nix} (98%) delete mode 100644 system.nix create mode 100644 system/aarch64-darwin/Ryans-Macbook-Pro.nix diff --git a/flake.lock b/flake.lock index 148fbfc..c686dbb 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1705399930, - "narHash": "sha256-JZG+pAe78RYnp9dYegalSwUTZqbNcSRmJjPnDZRl+JI=", + "lastModified": 1707355110, + "narHash": "sha256-S3mesqNxuY4kEHrTaqX5zVs8u31/YcpZ52GGl7sq7PE=", "owner": "ryanccn", "repo": "am", - "rev": "a68d35ca256622db496e1e5d8165c6dfd08d2469", + "rev": "75deb936a48ad74c647d3890893a601d91f1f04d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1705010618, - "narHash": "sha256-7mFUoNL0Ty/akEcXtAKueZbYbeDy0IOAS02w7ufgslU=", + "lastModified": 1707140582, + "narHash": "sha256-Wzq2W08mSfJ/M1yRQWGwvuEEwQn3+xDx82/9FrouDzw=", "owner": "Stonks3141", "repo": "ctp-nix", - "rev": "310ab70d9e690b641005ceafc6582305195c8711", + "rev": "948fe713ea548764a0a3f122975b8d79c44b7054", "type": "github" }, "original": { @@ -78,11 +78,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1706595721, - "narHash": "sha256-nf5/lPawM20WO1gHAlsUwDEJ4v+InC3BYYV1EBsBJZk=", + "lastModified": 1706941198, + "narHash": "sha256-t6/qloMYdknVJ9a3QzjylQIZnQfgefJ5kMim50B7dwA=", "owner": "nix-community", "repo": "fenix", - "rev": "46a368edf5f1cc16573157797e5acead834d5b2c", + "rev": "28dbd8b43ea328ee708f7da538c63e03d5ed93c8", "type": "github" }, "original": { @@ -96,9 +96,7 @@ "fenix": [ "fenix" ], - "flake-compat": [ - "flake-compat" - ], + "flake-compat": [], "naersk": [ "naersk" ], @@ -119,22 +117,6 @@ "url": "https://flakehub.com/f/DeterminateSystems/fh/0.%2A.tar.gz" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -153,6 +135,42 @@ "type": "github" } }, + "flake-utils-plus": { + "inputs": { + "flake-utils": "flake-utils_2" + }, + "locked": { + "lastModified": 1696331477, + "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -160,11 +178,11 @@ ] }, "locked": { - "lastModified": 1706473109, - "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", + "lastModified": 1707467182, + "narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d634c3abafa454551f2083b054cd95c3f287be61", + "rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af", "type": "github" }, "original": { @@ -220,11 +238,11 @@ ] }, "locked": { - "lastModified": 1706581965, - "narHash": "sha256-1H7dRdK9LJ7+2X1XQtbwXr+QMqtVVo/ZF0/LIvkjdK8=", + "lastModified": 1706833576, + "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "91b9daf672c957ef95a05491a75f62e6a01d5aaf", + "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", "type": "github" }, "original": { @@ -235,11 +253,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "lastModified": 1707451808, + "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", "type": "github" }, "original": { @@ -256,11 +274,11 @@ ] }, "locked": { - "lastModified": 1706444613, - "narHash": "sha256-DeLsDDC+AyKeQ7YPk1nUyVMXTELm7np55sri0DYy4xE=", + "lastModified": 1707057654, + "narHash": "sha256-WrpyT5h+eoCu7cspf9KGaM0FgLmnBm8tOHIWbj8sYpo=", "owner": "ryanccn", "repo": "nrr", - "rev": "8d846528c5e71702fedb2c675d7a18ff3330da23", + "rev": "73d2e8e419498cca910a41a32ce933b1fb0d043c", "type": "github" }, "original": { @@ -291,11 +309,11 @@ "ohmyzsh": { "flake": false, "locked": { - "lastModified": 1706646978, - "narHash": "sha256-5vbO9OsIMfnTDL7tUOV8EUcQ512jQpxaVmoF10hAKyU=", + "lastModified": 1707403294, + "narHash": "sha256-7S6UZCcUgBguoVaDWG4xGGQI2ePIVjz2L8aketzYbOw=", "owner": "ohmyzsh", "repo": "ohmyzsh", - "rev": "e195c7cb438224e8bcea20bdbc2e4b8a6bb3949b", + "rev": "fff073b55defed72a0a1aac4e853b165f208735b", "type": "github" }, "original": { @@ -312,7 +330,6 @@ "darwin-custom-icons": "darwin-custom-icons", "fenix": "fenix", "fh": "fh", - "flake-compat": "flake-compat", "flake-utils": "flake-utils", "home-manager": "home-manager", "naersk": "naersk", @@ -322,17 +339,18 @@ "nrr": "nrr", "nyoom": "nyoom", "ohmyzsh": "ohmyzsh", + "snowfall-lib": "snowfall-lib", "vivid-zsh": "vivid-zsh" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1706540258, - "narHash": "sha256-6RTztJE21l0hfWHp0qMWBurWnoFmUxYEDCvaGTnQYcA=", + "lastModified": 1706875368, + "narHash": "sha256-KOBXxNurIU2lEmO6lR2A5El32X9x8ITt25McxKZ/Ew0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d13951f25c4cb880bff09a3c02a796ecc51f69ac", + "rev": "8f6a72871ec87ed53cfe43a09fb284168a284e7e", "type": "github" }, "original": { @@ -342,6 +360,28 @@ "type": "github" } }, + "snowfall-lib": { + "inputs": { + "flake-compat": [], + "flake-utils-plus": "flake-utils-plus", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696432959, + "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", + "owner": "snowfallorg", + "repo": "lib", + "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "repo": "lib", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -357,6 +397,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "vivid-zsh": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index b71af0a..6d252b4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,4 @@ { - description = "Ryan's MacBook Pro flake"; - inputs = { nixpkgs = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; @@ -16,6 +14,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + snowfall-lib = { + url = "github:snowfallorg/lib"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-compat.follows = ""; + }; + catppuccin = { url = "github:Stonks3141/ctp-nix"; }; @@ -50,7 +54,7 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.fenix.follows = "fenix"; inputs.naersk.follows = "naersk"; - inputs.flake-compat.follows = "flake-compat"; + inputs.flake-compat.follows = ""; }; naersk = { @@ -80,29 +84,16 @@ flake-utils = { url = "github:numtide/flake-utils"; }; - - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; }; - outputs = { - nix-darwin, - home-manager, - darwin-custom-icons, - ... - } @ inputs: { - darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem { - modules = [ + outputs = inputs: + inputs.snowfall-lib.mkFlake { + inherit inputs; + src = ./.; + + system.modules.darwin = with inputs; [ home-manager.darwinModules.home-manager darwin-custom-icons.darwinModules.default - ./system.nix ]; - - specialArgs = { - inherit inputs; - }; }; - }; } diff --git a/home/programs/aliases.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/aliases.nix similarity index 100% rename from home/programs/aliases.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/aliases.nix diff --git a/home/programs/bat.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/bat/default.nix similarity index 100% rename from home/programs/bat.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/bat/default.nix diff --git a/home/default.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/default.nix similarity index 50% rename from home/default.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/default.nix index b71cbd9..25d5052 100644 --- a/home/default.nix +++ b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/default.nix @@ -8,27 +8,6 @@ imports = [ inputs.catppuccin.homeManagerModules.catppuccin inputs.am.homeManagerModules.default - - ./variables.nix - ./fonts.nix - - ./apps/vscode.nix - - ./programs/zsh.nix - ./programs/fish.nix - ./programs/starship.nix - ./programs/fzf.nix - ./programs/zoxide.nix - ./programs/direnv.nix - - ./programs/git.nix - ./programs/bat.nix - ./programs/helix.nix - ./programs/go.nix - ./programs/eza.nix - ./programs/rust.nix - ./programs/glamour.nix - ./programs/tealdeer.nix ]; services.am-discord-rich-presence = { diff --git a/home/programs/direnv.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/direnv/default.nix similarity index 100% rename from home/programs/direnv.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/direnv/default.nix diff --git a/home/programs/eza.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/eza/default.nix similarity index 100% rename from home/programs/eza.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/eza/default.nix diff --git a/home/programs/fish/conf.d/01_tooling.fish b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fish/conf.d/01_tooling.fish similarity index 100% rename from home/programs/fish/conf.d/01_tooling.fish rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fish/conf.d/01_tooling.fish diff --git a/home/programs/fish/conf.d/99_interactive.fish b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fish/conf.d/99_interactive.fish similarity index 100% rename from home/programs/fish/conf.d/99_interactive.fish rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fish/conf.d/99_interactive.fish diff --git a/home/programs/fish.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fish/default.nix similarity index 92% rename from home/programs/fish.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fish/default.nix index 3e2c8d2..fd59d8e 100644 --- a/home/programs/fish.nix +++ b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fish/default.nix @@ -1,5 +1,5 @@ {lib, ...}: let - aliases = import ./aliases.nix; + aliases = import ../aliases; shellAbbrs = builtins.mapAttrs (_: a: a.command) (lib.filterAttrs (_: b: !(b.fishAlias or false)) aliases); shellAliases = builtins.mapAttrs (_: a: a.command) (lib.filterAttrs (_: b: builtins.hasAttr "fishAlias" b && b.fishAlias) aliases); in { @@ -29,7 +29,7 @@ in { }; home.file.".config/fish/conf.d" = { - source = ./fish/conf.d; + source = ./conf.d; recursive = true; }; } diff --git a/home/fonts.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fonts/default.nix similarity index 100% rename from home/fonts.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fonts/default.nix diff --git a/home/programs/fzf.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fzf/default.nix similarity index 100% rename from home/programs/fzf.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/fzf/default.nix diff --git a/home/programs/git.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/git/default.nix similarity index 100% rename from home/programs/git.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/git/default.nix diff --git a/home/programs/glamour.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/glamour/default.nix similarity index 100% rename from home/programs/glamour.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/glamour/default.nix diff --git a/home/programs/go.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/go/default.nix similarity index 100% rename from home/programs/go.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/go/default.nix diff --git a/home/programs/helix.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/helix/default.nix similarity index 100% rename from home/programs/helix.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/helix/default.nix diff --git a/home/programs/rust.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/rust/default.nix similarity index 58% rename from home/programs/rust.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/rust/default.nix index 527dd83..6e75fe9 100644 --- a/home/programs/rust.nix +++ b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/rust/default.nix @@ -10,6 +10,19 @@ in { }; home.packages = with pkgs; [ + (fenix.combine ( + with fenix; + with stable; [ + cargo + rustc + rustfmt + clippy + rust-src + llvm-tools-preview + targets.wasm32-unknown-unknown.stable.rust-std + ] + )) + cargo-bloat cargo-cache cargo-deny diff --git a/home/programs/starship.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/starship/default.nix similarity index 100% rename from home/programs/starship.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/starship/default.nix diff --git a/home/programs/tealdeer.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/tealdeer/default.nix similarity index 100% rename from home/programs/tealdeer.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/tealdeer/default.nix diff --git a/home/variables.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/variables/default.nix similarity index 100% rename from home/variables.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/variables/default.nix diff --git a/home/apps/vscode.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/vscode/default.nix similarity index 97% rename from home/apps/vscode.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/vscode/default.nix index dea148f..d2f06f9 100644 --- a/home/apps/vscode.nix +++ b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/vscode/default.nix @@ -3,14 +3,14 @@ lib, ... }: let - extensions = [ + extensions = builtins.map lib.strings.toLower [ "antfu.icons-carbon" "antfu.unocss" "astro-build.astro-vscode" "bierner.lit-html" "bmalehorn.vscode-fish" "bradlc.vscode-tailwindcss" - "Catppuccin.catppuccin-vsc" + # "Catppuccin.catppuccin-vsc" # "Catppuccin.catppuccin-vsc-icons" "charliermarsh.ruff" "dbaeumer.vscode-eslint" @@ -19,7 +19,7 @@ "DotJoshJohnson.xml" "eamodio.gitlens" "EditorConfig.EditorConfig" - "enkia.tokyo-night" + # "enkia.tokyo-night" "esbenp.prettier-vscode" "github.vscode-github-actions" "GraphQL.vscode-graphql" @@ -27,7 +27,7 @@ "golang.go" "griimick.vhs" "LeonardSSH.vscord" - # "jdinhlife.gruvbox" + "jdinhlife.gruvbox" "jnoortheen.nix-ide" "miguelsolorio.symbols" "ms-python.isort" @@ -54,7 +54,7 @@ in { enable = true; package = pkgs.stdenv.mkDerivation { pname = "vscode"; - version = "1.85.2"; + version = "1.86.0"; src = pkgs.emptyDirectory; installPhase = '' mkdir -p $out @@ -65,7 +65,7 @@ in { mutableExtensionsDir = true; userSettings = { - "workbench.colorTheme" = "Tokyo Night"; + "workbench.colorTheme" = "Gruvbox Dark Hard"; "workbench.iconTheme" = "symbols"; "workbench.productIconTheme" = "icons-carbon"; "workbench.sideBar.location" = "left"; diff --git a/home/programs/zoxide.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zoxide/default.nix similarity index 100% rename from home/programs/zoxide.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zoxide/default.nix diff --git a/home/programs/zsh.nix b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zsh/default.nix similarity index 84% rename from home/programs/zsh.nix rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zsh/default.nix index 72f8bef..d5251b6 100644 --- a/home/programs/zsh.nix +++ b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zsh/default.nix @@ -3,7 +3,7 @@ inputs, ... }: let - shellAliases = builtins.mapAttrs (_: alias: alias.command) (import ./aliases.nix); + shellAliases = builtins.mapAttrs (_: alias: alias.command) (import ../aliases); in { programs.zsh = { enable = true; @@ -13,9 +13,9 @@ in { syntaxHighlighting.enable = true; - envExtra = builtins.readFile ./zsh/envExtra.zsh; + envExtra = builtins.readFile ./envExtra.zsh; # initExtraBeforeCompInit = builtins.readFile ./zsh/initExtraBeforeCompInit.zsh; - initExtra = builtins.readFile ./zsh/initExtra.zsh; + initExtra = builtins.readFile ./initExtra.zsh; inherit shellAliases; diff --git a/home/programs/zsh/envExtra.zsh b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zsh/envExtra.zsh similarity index 100% rename from home/programs/zsh/envExtra.zsh rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zsh/envExtra.zsh diff --git a/home/programs/zsh/initExtra.zsh b/homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zsh/initExtra.zsh similarity index 100% rename from home/programs/zsh/initExtra.zsh rename to homes/aarch64-darwin/ryanccn@Ryans-Macbook-Pro/zsh/initExtra.zsh diff --git a/modules/darwin/activation/default.nix b/modules/darwin/activation/default.nix new file mode 100644 index 0000000..1f61194 --- /dev/null +++ b/modules/darwin/activation/default.nix @@ -0,0 +1,8 @@ +{pkgs}: { + system.activationScripts.extraActivation = { + text = '' + set -eo pipefail + HOME="/var/root" ${pkgs.lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" + ''; + }; +} diff --git a/modules/homebrew.nix b/modules/darwin/homebrew/default.nix similarity index 100% rename from modules/homebrew.nix rename to modules/darwin/homebrew/default.nix diff --git a/modules/nix.nix b/modules/darwin/nix/default.nix similarity index 62% rename from modules/nix.nix rename to modules/darwin/nix/default.nix index d553e1f..7ca5623 100644 --- a/modules/nix.nix +++ b/modules/darwin/nix/default.nix @@ -3,9 +3,7 @@ inputs, config, ... -}: let - flakeOverlays = import ../overlays; -in { +}: { services.nix-daemon.enable = true; nix.package = pkgs.nix; @@ -26,17 +24,6 @@ in { trusted-users = ["ryanccn"]; sandbox = true; - extra-substituters = [ - "https://nix-community.cachix.org" - "https://crane.cachix.org" - "https://cache.garnix.io" - ]; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - ]; - nix-path = config.nix.nixPath; }; @@ -49,8 +36,6 @@ in { inputs.choirpack.overlays.default inputs.nyoom.overlays.default inputs.fh.overlays.default - flakeOverlays.ryan-mono-bin - flakeOverlays.ibm-plex ]; config.allowUnfree = true; diff --git a/modules/packages.nix b/modules/packages/default.nix similarity index 78% rename from modules/packages.nix rename to modules/packages/default.nix index b7e8bfb..b1534e9 100644 --- a/modules/packages.nix +++ b/modules/packages/default.nix @@ -15,19 +15,6 @@ nix-melt # fh - (fenix.combine ( - with fenix; - with stable; [ - cargo - rustc - rustfmt - clippy - rust-src - rust-docs - targets.wasm32-unknown-unknown.stable.rust-std - ] - )) - fnm deno bun diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index ee064dd..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - ibm-plex = import ./ibm-plex.nix; - ryan-mono-bin = import ./ryan-mono-bin.nix; -} diff --git a/overlays/ibm-plex.nix b/overlays/ibm-plex/default.nix similarity index 98% rename from overlays/ibm-plex.nix rename to overlays/ibm-plex/default.nix index 34ec3d6..f1553ca 100644 --- a/overlays/ibm-plex.nix +++ b/overlays/ibm-plex/default.nix @@ -1,4 +1,4 @@ -(_: prev: { +_: (_: prev: { ibm-plex = prev.ibm-plex.overrideAttrs (_: { postInstall = '' set -eo pipefail diff --git a/overlays/ryan-mono-bin.nix b/overlays/ryan-mono-bin/default.nix similarity index 98% rename from overlays/ryan-mono-bin.nix rename to overlays/ryan-mono-bin/default.nix index 6866e20..cb6fe74 100644 --- a/overlays/ryan-mono-bin.nix +++ b/overlays/ryan-mono-bin/default.nix @@ -1,4 +1,4 @@ -(_: prev: let +_: (_: prev: let version = "2023.11.26"; mkFontVariant = { diff --git a/system.nix b/system.nix deleted file mode 100644 index 2a6ad93..0000000 --- a/system.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - pkgs, - inputs, - ... -}: { - imports = [ - ./modules/nix.nix - ./modules/packages.nix - ./modules/homebrew.nix - ]; - - system.activationScripts.extraActivation = { - text = '' - set -eo pipefail - HOME="/var/root" ${pkgs.lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" - ''; - }; - - security.pam.enableSudoTouchIdAuth = true; - - environment.customIcons = { - enable = true; - icons = [ - { - path = "/Applications/Notion.app"; - icon = ./icons/notion.icns; - } - { - path = "/Applications/Things.app"; - icon = ./icons/things.icns; - } - { - path = "/Applications/Obsidian.app"; - icon = ./icons/obsidian.icns; - } - ]; - }; - - programs.fish.enable = true; - programs.zsh.enable = true; - - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - - extraSpecialArgs = { - inherit inputs; - }; - - users.ryanccn = import ./home; - }; - - users.users.ryanccn = { - home = "/Users/ryanccn"; - }; - - system.stateVersion = 4; -} diff --git a/system/aarch64-darwin/Ryans-Macbook-Pro.nix b/system/aarch64-darwin/Ryans-Macbook-Pro.nix new file mode 100644 index 0000000..fa9793e --- /dev/null +++ b/system/aarch64-darwin/Ryans-Macbook-Pro.nix @@ -0,0 +1,31 @@ +{...}: { + security.pam.enableSudoTouchIdAuth = true; + + environment.customIcons = { + enable = true; + icons = [ + { + path = "/Applications/Notion.app"; + icon = ../../icons/notion.icns; + } + { + path = "/Applications/Things.app"; + icon = ../../icons/things.icns; + } + { + path = "/Applications/Obsidian.app"; + icon = ../../icons/obsidian.icns; + } + ]; + }; + + programs.fish.enable = true; + programs.zsh.enable = true; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + }; + + system.stateVersion = 4; +}