diff --git a/flake.lock b/flake.lock index ae90403..6005685 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1735979091, - "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=", + "lastModified": 1736204492, + "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=", "owner": "nix-community", "repo": "home-manager", - "rev": "11ab08541e61ac3bbf2ab27229f68622629401df", + "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1736002328, - "narHash": "sha256-anoVvML2D+nLfHlBfhEcCMjTou/9SRrrlqQN+Ug39ws=", + "lastModified": 1736085891, + "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a464e5ba8cfb10a81599dbd422f30f5d37997916", + "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735915915, - "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", + "lastModified": 1736134818, + "narHash": "sha256-30sOEZ8CFK2nTTMdkhaNrfVlIi3rWTNV0Z5z+NmpFNI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", + "rev": "3df3c47c19dc90fec35359e89ffb52b34d2b0e94", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 65f18bb..f505260 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,7 @@ url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; + # nur.url = "github:nix-community/nur"; }; outputs = inputs @ { @@ -30,9 +31,8 @@ ]; inherit (self) outputs; in { - # Custom packages and modifications + # own packages and some modifications packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - overlays = import ./overlays {inherit inputs;}; # darwin-rebuild switch --flake .#mba diff --git a/hosts/mba/default.nix b/hosts/mba/default.nix index 82b274a..7023316 100644 --- a/hosts/mba/default.nix +++ b/hosts/mba/default.nix @@ -1,4 +1,10 @@ -{inputs, outputs, username, email, ...}: { +{ + inputs, + outputs, + username, + email, + ... +}: { imports = [ inputs.home-manager.darwinModules.home-manager @@ -7,6 +13,7 @@ ./nix.nix ./users.nix ]; + nixpkgs = { overlays = [ outputs.overlays.additions @@ -18,6 +25,7 @@ home-manager = { backupFileExtension = "hnm"; + useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = {inherit username email outputs;}; users.${username} = import ./home.nix; diff --git a/hosts/mba/home.nix b/hosts/mba/home.nix index 7e04e5f..d0cb316 100644 --- a/hosts/mba/home.nix +++ b/hosts/mba/home.nix @@ -6,7 +6,7 @@ ... }: { imports = [ - # ../../modules/alacritty.nix + ../../home-modules/alacritty.nix ../../home-modules/git.nix ../../home-modules/kitty.nix ../../home-modules/nvim.nix @@ -21,6 +21,14 @@ pkgs.go pkgs.nodejs_23 pkgs.pnpm + + pkgs.discord + # pkgs.firefox + # pkgs.ghostty + pkgs.obsidian + pkgs.spotify + pkgs.redis + pkgs.telegram-desktop ]; nixpkgs = { diff --git a/hosts/mba/mac-apps.nix b/hosts/mba/mac-apps.nix index 5dc43c7..113c829 100644 --- a/hosts/mba/mac-apps.nix +++ b/hosts/mba/mac-apps.nix @@ -34,11 +34,7 @@ brews = []; casks = [ - "discord" - "obsidian" "raycast" - "spotify" - "telegram-desktop" # CORPO "mongodb-compass" diff --git a/overlays/default.nix b/overlays/default.nix index d6fe8f2..351ae93 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,9 +2,8 @@ additions = final: _prev: import ../pkgs {pkgs = final;}; modifications = final: prev: { - # ghostty = inputs.ghostty.packages.aarch64-darwin.default; - discord = prev.discord.override { + withOpenASAR = true; withVencord = true; }; }; diff --git a/pkgs/default.nix b/pkgs/default.nix index 41265fa..3e5bc04 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,3 @@ {pkgs, ...}: { lilj-nvim-config = pkgs.callPackage ./nvim-conf {}; - # firefox = pkgs.callPackage ./firefox-mod-blur {}; }