From 132956970ff35f70e92660eb5273013d3da963d9 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Tue, 15 Aug 2023 11:25:16 +0800 Subject: [PATCH] rm: revert NixOS --- flake.lock | 36 ++++++------- flake.nix | 19 ++----- home.nix | 33 +++++------- nixos.nix | 135 ------------------------------------------------ programs/go.nix | 10 +--- 5 files changed, 38 insertions(+), 195 deletions(-) delete mode 100644 nixos.nix diff --git a/flake.lock b/flake.lock index 64627b5..fdcf02a 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ ] }, "locked": { - "lastModified": 1689457600, - "narHash": "sha256-1XLn2ZZMaqQx+Ys3eel5hQRkgUn3DeHcVb2JT8WYU0A=", + "lastModified": 1691972610, + "narHash": "sha256-01X6GZ7nGZIvqzjM7zfnRemNXwgx5kneMldbTqRnPTU=", "owner": "zhaofengli", "repo": "attic", - "rev": "4902d57f5dae8ec660ee9ee14c45c2192f9fe8b1", + "rev": "f4cf5704d64303ad11cc6918fbc6ab3cab6ca333", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1691882297, - "narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=", + "lastModified": 1691998815, + "narHash": "sha256-HuFgb+W1Dvd0mjjudpTf0hVg/YKKiMRpX14t7dJeTm8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c3ab5ea047e6dc73df530948f7367455749d8906", + "rev": "da6874e8bb82204323b94154585a1471c739f73e", "type": "github" }, "original": { @@ -165,11 +165,11 @@ ] }, "locked": { - "lastModified": 1691640097, - "narHash": "sha256-6vPsJYjtt2hs4mkiR46yt8c/Spdm/UiUKoSCIlc7iJw=", + "lastModified": 1691963303, + "narHash": "sha256-zqvt4N4Ic06BrGo02itCIPTEKzVnGT0BtGbIr+aUGqE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "426d38710b656b0a31f8eaae6e0002206a3b96d7", + "rev": "3fcd83783a1e2ddad0f14821da4186a95bc76c50", "type": "github" }, "original": { @@ -180,11 +180,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691853136, - "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=", + "lastModified": 1692007866, + "narHash": "sha256-X8w0vPZjZxMm68VCwh/BHDoKRGp+BgzQ6w7Nkif6IVM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0451844bbdf545f696f029d1448de4906c7f753", + "rev": "de2b8ddf94d6cc6161b7659649594c79bd66c13b", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1691816321, - "narHash": "sha256-QaOKS7VZAXb/3jtF8e2xKM5twU16PDudTg2zJ4xgA4g=", + "lastModified": 1692027995, + "narHash": "sha256-x4/8/aBu4naA+24PQhNoUZ6w0leHk1LY9MhSTobom9U=", "owner": "ryanccn", "repo": "nyoom", - "rev": "b2fe3bfdcce64df0a076f68cae07b7de96853000", + "rev": "9af65efd16ff3f1ac6794099ffe3b2998315ed7b", "type": "github" }, "original": { @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1691892594, - "narHash": "sha256-Lt9/WUnI/ZqBYnHOC3n6Lg5jTfd/ZI+39jZx5HmolSQ=", + "lastModified": 1692065371, + "narHash": "sha256-1uKLJT89aDS2IlT5oM9vOe6yL34teNvs+b6DZNA5RAM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c638e10caf94caaa97fb1df74e3bb467dc9b92db", + "rev": "4ea85def89eceac6b5e327fd3628dcb9ba5add2e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bc6e113..fe974fc 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ }; }; - outputs = inputs @ { + outputs = { self, nixpkgs, nix-darwin, @@ -75,24 +75,13 @@ nyoom, discord-applemusic-rich-presence, ... - }: let - darwinConfiguration = {pkgs, ...}: - import ./system.nix (nixpkgs.lib.recursiveUpdate inputs {inherit pkgs;}); - linuxConfiguration = {pkgs, ...}: - import ./nixos.nix (nixpkgs.lib.recursiveUpdate inputs {inherit pkgs;}); - in { + } @ inputs: { darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem { modules = [ - darwinConfiguration - home-manager.darwinModules.home-manager - ]; - }; - - nixosConfigurations.Ryans-MacBook-Pro = nixpkgs.lib.nixosSystem { - modules = [ - linuxConfiguration + ./system.nix home-manager.darwinModules.home-manager ]; + specialArgs = inputs; }; }; } diff --git a/home.nix b/home.nix index 9fc3ade..f59d1af 100644 --- a/home.nix +++ b/home.nix @@ -4,25 +4,20 @@ ctpModule, discord-applemusic-rich-presence, ... -}: let - inherit (pkgs) lib stdenv; -in { +}: { home.stateVersion = "23.05"; - imports = - [ - ctpModule - ./programs/zsh.nix - ./programs/fish.nix - ./programs/starship.nix - ./programs/git.nix - ./programs/bat.nix - ./programs/helix.nix - ./programs/go.nix - ./programs/exa.nix - ] - ++ lib.optional stdenv.isDarwin [ - discord-applemusic-rich-presence.overlays.default - ]; + imports = [ + ctpModule + discord-applemusic-rich-presence + ./programs/zsh.nix + ./programs/fish.nix + ./programs/starship.nix + ./programs/git.nix + ./programs/bat.nix + ./programs/helix.nix + ./programs/go.nix + ./programs/exa.nix + ]; programs.home-manager.enable = true; home.packages = with pkgs; [ @@ -30,7 +25,7 @@ in { ryan-term-bin ]; - services.discord-applemusic-rich-presence = lib.optionalAttrs stdenv.isDarwin { + services.discord-applemusic-rich-presence = { enable = true; logFile = "${config.home.homeDirectory}/Library/Logs/discord-applemusic-rich-presence.log"; }; diff --git a/nixos.nix b/nixos.nix deleted file mode 100644 index 0abcd25..0000000 --- a/nixos.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ - pkgs, - attic, - catppuccin, - discord-applemusic-rich-presence, - nyoom, - ... -}: { - environment.systemPackages = with pkgs; [ - nil - alejandra - nixpkgs-fmt - attic-client - cachix - direnv - - rustc - cargo - - ccache - deno - fnm - bun - - (python311.withPackages (ps: - with ps; [ - pip - yt-dlp - xkcdpass - ])) - libffi - openssl - - rust-analyzer - nodePackages.typescript-language-server - rustfmt - clippy - - pkgs.nyoom - - age - asciinema - bat - btop - cloudflared - doggo - doppler - du-dust - exiftool - fd - ffmpeg - flyctl - fzf - gh - gen-license - gum - hyperfine - jq - just - spicetify-cli - mkcert - nerdfix - pscale - railway - silicon - tealdeer - tokei - vhs - vivid - xh - zoxide - - typst - packwiz - - catppuccin-catwalk - packwiz - ]; - - services.nix-daemon.enable = true; - nix.package = pkgs.nix; - - nix.settings = { - experimental-features = "nix-command flakes"; - build-users-group = "nixbld"; - trusted-users = ["ryanccn"]; - auto-optimise-store = true; - extra-platforms = ["x86_64-linux" "aarch64-linux"]; - - extra-substituters = [ - "https://nix-community.cachix.org" - ]; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; - - nixpkgs = { - overlays = [ - attic.overlays.default - nyoom.overlays.default - (import ./overlays/ryan-mono-bin.nix) - ]; - - config.allowUnfree = true; - hostPlatform = "x86_64-linux"; - }; - - system.activationScripts.extraActivation = { - text = '' - set -eo pipefail - ${pkgs.lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" - ''; - }; - - programs.fish.enable = true; - programs.zsh.enable = true; - - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = { - ctpModule = catppuccin.homeManagerModules.catppuccin; - discord-applemusic-rich-presence = discord-applemusic-rich-presence.homeManagerModules.default; - }; - }; - - users.users.ryanccn = { - home = "/home/ryanccn"; - }; - - home-manager.users.ryanccn = import ./home.nix; - - system.stateVersion = 4; -} diff --git a/programs/go.nix b/programs/go.nix index c78eec5..414ffbe 100644 --- a/programs/go.nix +++ b/programs/go.nix @@ -1,16 +1,10 @@ -{ - lib, - stdenv, - ... -}: let - inherit (stdenv) isDarwin; -in { +{...}: { programs.go = { enable = true; goPath = ".go"; }; - home.file."Library/Application Support/go/env".text = lib.optionalString isDarwin '' + home.file."Library/Application Support/go/env".text = '' GOTOOLCHAIN=path GOPROXY=direct '';