From 742d113deb188e7483e50330635af3a4600680ba Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Tue, 28 Nov 2023 16:12:13 +0700 Subject: [PATCH] update deps, remove tor/whois --- flake.lock | 6 +++--- nix/darwin/default.nix | 27 ++++++++++++++++----------- nix/flake.lock | 18 +++++++++--------- nix/home/common.nix | 2 +- scripts/cachix-push-m1-config | 2 +- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index f05c454..b114686 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699725108, - "narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=", + "lastModified": 1701040486, + "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e", + "rev": "45827faa2132b8eade424f6bdd48d8828754341a", "type": "github" }, "original": { diff --git a/nix/darwin/default.nix b/nix/darwin/default.nix index a19288e..053e196 100644 --- a/nix/darwin/default.nix +++ b/nix/darwin/default.nix @@ -5,7 +5,11 @@ let mode = config.igm.mode; in with lib; { - environment.systemPackages = with pkgs; [ vim tor ]; + environment.systemPackages = with pkgs; [ + vim + # Tor install is currently broken 2023-11-28 + # tor + ]; home-manager.users.igm = homeBase; home-manager.useGlobalPkgs = true; @@ -54,14 +58,15 @@ with lib; { home = "/Users/igm"; }; - launchd.user.agents.tor = { - command = with pkgs; "${tor}/bin/tor"; - serviceConfig = { - KeepAlive = true; - RunAtLoad = true; - ProcessType = "Background"; - StandardOutPath = "/var/tmp/tor.log"; - StandardErrorPath = "/var/tmp/tor.error.log"; - }; - }; + # Tor broken 2023-11-28 + # launchd.user.agents.tor = { + # command = with pkgs; "${tor}/bin/tor"; + # serviceConfig = { + # KeepAlive = true; + # RunAtLoad = true; + # ProcessType = "Background"; + # StandardOutPath = "/var/tmp/tor.log"; + # StandardErrorPath = "/var/tmp/tor.error.log"; + # }; + # }; } diff --git a/nix/flake.lock b/nix/flake.lock index fe914fd..0982081 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1699867978, - "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699725108, - "narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=", + "lastModified": 1701040486, + "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e", + "rev": "45827faa2132b8eade424f6bdd48d8828754341a", "type": "github" }, "original": { diff --git a/nix/home/common.nix b/nix/home/common.nix index c6a22e2..9de17af 100644 --- a/nix/home/common.nix +++ b/nix/home/common.nix @@ -9,7 +9,7 @@ tmux unzip wget - whois + # whois # nix language server rnix-lsp diff --git a/scripts/cachix-push-m1-config b/scripts/cachix-push-m1-config index 22e7080..3e96ee8 100755 --- a/scripts/cachix-push-m1-config +++ b/scripts/cachix-push-m1-config @@ -1,3 +1,3 @@ #!/usr/bin/env -S bash -xe -cachix-build-and-push nix/#darwinConfigurations.ci-personal-m1.system \ No newline at end of file +cachix-build-and-push "$HOME/dotfiles/nix/#darwinConfigurations.ci-personal-m1.system"