diff --git a/flake.lock b/flake.lock index 1965cda..a94c260 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1694497842, - "narHash": "sha256-z03v/m0OwcLBok97KcUgMl8ZFw5Xwsi2z+n6nL7JdXY=", + "lastModified": 1694810318, + "narHash": "sha256-LuvrVj2oj9TzdnnwtQUClqcXjpgwCP01FFVBM7azGV8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4496ab26628c5f43d2a5c577a06683c753e32fe2", + "rev": "80bb201f4925cdda5a7a3c7b1900fb26bb2af2e8", "type": "github" }, "original": { @@ -216,11 +216,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1694469544, - "narHash": "sha256-eqZng5dZnAUyb7xXyFk5z871GY/++KVv3Gyld5mVh20=", + "lastModified": 1694643239, + "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", "owner": "nix-community", "repo": "home-manager", - "rev": "5171f5ef654425e09d9c2100f856d887da595437", + "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1694432324, - "narHash": "sha256-bo3Gv6Cp40vAXDBPi2XiDejzp/kyz65wZg4AnEWxAcY=", + "lastModified": 1694710316, + "narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ca41b8a227dd235b1b308217f116c7e6e84ad779", + "rev": "570256327eb6ca6f7bebe8d93af49459092a0c43", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694183432, - "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", + "lastModified": 1694422566, + "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", + "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694501121, - "narHash": "sha256-uj7YWhs7FTv1slqb9Sj1+Q0dYtwQDC4URfOXB9XWKjs=", + "lastModified": 1694760568, + "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1ee50a29288f768c55211963be8040671814986d", + "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", "type": "github" }, "original": { diff --git a/hosts/epicurus/homebrew.nix b/hosts/epicurus/homebrew.nix index bd79cbd..9df67db 100644 --- a/hosts/epicurus/homebrew.nix +++ b/hosts/epicurus/homebrew.nix @@ -18,7 +18,6 @@ _: "gpg-suite" "plex-media-server" "stats" - "syncthing" "synology-drive" ]; diff --git a/hosts/heraclitus/homebrew.nix b/hosts/heraclitus/homebrew.nix index 2116d90..b6850fa 100644 --- a/hosts/heraclitus/homebrew.nix +++ b/hosts/heraclitus/homebrew.nix @@ -48,10 +48,8 @@ _: "spotify" "stats" "steam" - "syncthing" "synology-drive" "todoist" - "unity-hub" "visual-studio-code" "zoom" ]; diff --git a/modules/base/darwin.nix b/modules/base/darwin.nix index 7b419cf..1ced33c 100644 --- a/modules/base/darwin.nix +++ b/modules/base/darwin.nix @@ -48,16 +48,6 @@ users.walkah = import "${dotfiles}/home.nix"; }; - nixpkgs.config.packageOverrides = pkgs: { - haskellPackages = pkgs.haskellPackages.override { - overrides = _self: super: { - niv = pkgs.haskell.lib.overrideCabal super.niv (_drv: { - enableSeparateBinOutput = false; - }); - }; - }; - }; - users.users.walkah = { home = "/Users/walkah"; shell = pkgs.zsh; diff --git a/modules/dev/default.nix b/modules/dev/default.nix index 9181e65..5539aa9 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -15,7 +15,6 @@ # Nix cachix nil - niv nixpkgs-fmt # My stuff