diff options
| author | Karel Kočí <cynerd@email.cz> | 2023-03-23 12:31:51 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2023-03-23 12:31:51 +0100 |
| commit | 2dbccc394a4964a2a3badd192184b6d35dd63336 (patch) | |
| tree | d11b10501f7f0e520898590969a5c040d6f739f7 /nixos/modules | |
| parent | 28f1ed4a6a1cbf9b32904a010310e3da0f29b81b (diff) | |
| download | nixos-personal-2dbccc394a4964a2a3badd192184b6d35dd63336.tar.gz nixos-personal-2dbccc394a4964a2a3badd192184b6d35dd63336.tar.bz2 nixos-personal-2dbccc394a4964a2a3badd192184b6d35dd63336.zip | |
Rework how I pass packages to the NixOS
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/desktop.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/generic.nix | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix index 04e5b82..3ae64a4 100644 --- a/nixos/modules/desktop.nix +++ b/nixos/modules/desktop.nix @@ -156,7 +156,6 @@ in { ]); programs = { vim.package = pkgs.vimHugeX; - shellrc.desktop = true; firefox.enable = true; light.enable = mkIf cnf.laptop true; }; diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix index 309dd95..02498a3 100644 --- a/nixos/modules/generic.nix +++ b/nixos/modules/generic.nix @@ -5,7 +5,7 @@ ... }: with lib; let - isNative = config.nixpkgs.crossSystem == null; + isNative = config.nixpkgs.hostPlatform == config.nixpkgs.buildPlatform; in { config = { system.stateVersion = "22.05"; @@ -89,6 +89,7 @@ in { nethogs sshfs wakeonlan + speedtest-cli lm_sensors ] @@ -139,8 +140,11 @@ in { ]; }; }; - programs.zsh.enable = isNative; - programs.shellrc.enable = true; + programs.zsh = { + enable = isNative; + syntaxHighlighting.enable = isNative; + }; + programs.shellrc = true; programs.vim.defaultEditor = mkDefault true; security.sudo.extraRules = [ |