diff --git a/home/darwin/core.nix b/home/darwin/core.nix index 68480402..e7249d12 100644 --- a/home/darwin/core.nix +++ b/home/darwin/core.nix @@ -1,11 +1,11 @@ # Install those apps using brew, instead of nix # because they are not available in nixpkgs with the support of darwin # ==> Brew Casks -# iglance jdk-mission-control visual-studio-code -# anki firefox iina openinterminal-lite +# jdk-mission-control +# anki firefox iina openinterminal-lite # insomnia orbstack -# clashx google-chrome intellij-idea-ce pycharm-ce -# discord google-cloud-sdk iterm2 telegram wireshark +# clashx google-chrome +# google-cloud-sdk telegram wireshark {pkgs, ...}: @@ -13,8 +13,14 @@ # MacOS specific configuration home.packages = with pkgs; [ mpv + discord ]; + # stable version of vscode + programs.vscode = { + enable = true; + }; + programs.ssh = { enable = true; diff --git a/modules/darwin/core.nix b/modules/darwin/core.nix index 894489ff..9b4d8159 100644 --- a/modules/darwin/core.nix +++ b/modules/darwin/core.nix @@ -3,6 +3,9 @@ # # enable flakes globally nix.settings.experimental-features = [ "nix-command" "flakes" ]; + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + # Auto upgrade nix package and the daemon service. services.nix-daemon.enable = true; # Use this instead of services.nix-daemon.enable if you diff --git a/modules/nixos/core-desktop.nix b/modules/nixos/core-desktop.nix index b3aaf571..0ed4c4e7 100644 --- a/modules/nixos/core-desktop.nix +++ b/modules/nixos/core-desktop.nix @@ -4,6 +4,9 @@ # enable flakes globally nix.settings.experimental-features = [ "nix-command" "flakes" ]; + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + # Set your time zone. time.timeZone = "Asia/Shanghai"; @@ -99,9 +102,6 @@ # Use `ssh-add` to add a key to the agent. programs.ssh.startAgent = true; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/core-server.nix b/modules/nixos/core-server.nix index daad9b58..c8aa7834 100644 --- a/modules/nixos/core-server.nix +++ b/modules/nixos/core-server.nix @@ -4,6 +4,9 @@ # enable flakes globally nix.settings.experimental-features = [ "nix-command" "flakes" ]; + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + # Set your time zone. time.timeZone = "Asia/Shanghai"; @@ -71,9 +74,6 @@ openFirewall = true; }; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [