From 678d731ce0a81c2ae07e99ad1acd9aef0c629bb4 Mon Sep 17 00:00:00 2001 From: Kulvir Singh Date: Thu, 13 Feb 2025 10:56:48 +0530 Subject: [PATCH] updated some packages --- flake.lock | 24 ++++++++++++------------ hosts/mba/configuration.nix | 2 +- hosts/mba/home.nix | 2 +- hosts/mba/mac-apps.nix | 8 +++++++- hosts/mba/nix.nix | 3 --- modules/shell.nix | 4 ++-- modules/starship.nix | 2 +- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 3214b66..e1672e6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1738428726, - "narHash": "sha256-OUoEgorFHBVnqQ2lITqs6MGN7MH4t/8hLEO29OKu6CM=", + "lastModified": 1739416022, + "narHash": "sha256-Af1CIT+XlXEb+Dk11sgPDzJoOUiada2Xoj5hA8TBvLY=", "owner": "nix-community", "repo": "home-manager", - "rev": "dae6d3460c8bab3ac9f38a86affe45b32818e764", + "rev": "c9d343cfa0565671cc7e8d5aefebaf61cc840abd", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1738277753, - "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", + "lastModified": 1739302241, + "narHash": "sha256-NXQXFU6HOschZ+8ZKrNOlwlHelez8vPl+dCiUaJ82/U=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", + "rev": "a6746213b138fe7add88b19bafacd446de574ca7", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738297584, - "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", + "lastModified": 1739138025, + "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9189ac18287c599860e878e905da550aa6dec1cd", + "rev": "b2243f41e860ac85c0b446eadc6930359b294e79", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738433464, - "narHash": "sha256-7FY9FFafS1NMyhL8d/SwLgLglU9vDJqWm83grbnLD2A=", + "lastModified": 1739415763, + "narHash": "sha256-cGoUtw8NeOXxizbX3ZgWIgF7s13OYCTWRM+IE1uQx+A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ab13642a5960f31c54ea25747deac406c447093", + "rev": "8f276411ff7ba4510d9158084d6b6500879614b6", "type": "github" }, "original": { diff --git a/hosts/mba/configuration.nix b/hosts/mba/configuration.nix index f870112..13d2e0b 100644 --- a/hosts/mba/configuration.nix +++ b/hosts/mba/configuration.nix @@ -79,7 +79,7 @@ }; }; - system.stateVersion = 4; + system.stateVersion = 5; time.timeZone = "Asia/Calcutta"; } diff --git a/hosts/mba/home.nix b/hosts/mba/home.nix index 82adbd3..936c99a 100644 --- a/hosts/mba/home.nix +++ b/hosts/mba/home.nix @@ -19,7 +19,7 @@ home.packages = [ pkgs.air - # pkgs.bun + pkgs.bun pkgs.go pkgs.nodejs_23 # pkgs.python314 # coz awsebcli requires python in $PATH diff --git a/hosts/mba/mac-apps.nix b/hosts/mba/mac-apps.nix index bd40aa3..8391b0d 100644 --- a/hosts/mba/mac-apps.nix +++ b/hosts/mba/mac-apps.nix @@ -24,6 +24,10 @@ homebrew = { enable = true; + brews = [ + # "bun" + ]; + caskArgs = { appdir = "/Applications"; }; @@ -50,6 +54,8 @@ cleanup = "zap"; }; - taps = []; + taps = [ + # "oven-sh/bun" + ]; }; } diff --git a/hosts/mba/nix.nix b/hosts/mba/nix.nix index a31c5b2..d459025 100644 --- a/hosts/mba/nix.nix +++ b/hosts/mba/nix.nix @@ -14,10 +14,7 @@ nixpkgs.hostPlatform = "${system}"; - services.nix-daemon.enable = true; - nix.gc = { - user = "root"; automatic = lib.mkDefault true; options = lib.mkDefault "--delete-older-than 5d"; }; diff --git a/modules/shell.nix b/modules/shell.nix index e01ad33..74c1161 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -6,8 +6,8 @@ eval "$(/opt/homebrew/bin/brew shellenv)" export PATH="/opt/homebrew/bin:$PATH" - export BUN_INSTALL="$HOME/.bun" - export PATH="$BUN_INSTALL/bin:$PATH" + # export BUN_INSTALL="$HOME/.bun" + # export PATH="$BUN_INSTALL/bin:$PATH" ''; shellAliases = { ls = "lsd"; diff --git a/modules/starship.nix b/modules/starship.nix index 42ff83e..39efc0a 100644 --- a/modules/starship.nix +++ b/modules/starship.nix @@ -60,7 +60,7 @@ }; nodejs = { - detect_files = ["!bun.lockb"]; + detect_files = ["!bun.lock"]; format = "[$symbol$version ]($style)"; version_format = "\${major}.\${minor}"; };