diff --git a/alex/core.nix b/alex/core.nix index e52468c..371e747 100644 --- a/alex/core.nix +++ b/alex/core.nix @@ -35,25 +35,19 @@ nnn # terminal file manager # archives - zip xz - unzip # p7zip # utils - ripgrep # recursively searches directories for a regex pattern - bat jq # A lightweight and flexible command-line JSON processor # yq-go # yaml processor https://github.com/mikefarah/yq eza # A modern replacement for ‘ls’ fzf # A command-line fuzzy finder - fd xclip trash-cli # networking tools dig - mtr # A network diagnostic tool # iperf3 # dnsutils # `dig` + `nslookup` # ldns # replacement of `dig`, it provide the command `drill` diff --git a/hosts/modules/home.nix b/alex/personal.nix similarity index 83% rename from hosts/modules/home.nix rename to alex/personal.nix index e18729d..edeb32f 100644 --- a/hosts/modules/home.nix +++ b/alex/personal.nix @@ -1,16 +1,11 @@ { config, pkgs, inputs, ... }: -{ - # Mullvad vpn - services.mullvad-vpn = { - enable = true; - }; - environment.systemPackages = with pkgs; [ +{ + home.packages = with pkgs; [ foliate inputs.locutus.packages.${pkgs.system}.default jrnl mullvad-browser - mullvad-vpn tor-browser exiftool digikam diff --git a/flake.nix b/flake.nix index 35119da..2ed59db 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ modules = [ ./hosts/case/configuration.nix home-manager.nixosModules.home-manager - (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ]; }) + (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ./alex/personal.nix ]; }) ]; }; @@ -45,7 +45,7 @@ modules = [ ./hosts/count/configuration.nix home-manager.nixosModules.home-manager - (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ]; }) + (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ./alex/personal.nix ]; }) ]; }; @@ -81,4 +81,4 @@ # other hosts... }; }; -} \ No newline at end of file +} diff --git a/hosts/case/configuration.nix b/hosts/case/configuration.nix index 7373cda..8a331cb 100644 --- a/hosts/case/configuration.nix +++ b/hosts/case/configuration.nix @@ -10,7 +10,7 @@ ./hardware-configuration.nix ../modules/base.nix ../modules/desktop.nix - ../modules/home.nix + ../modules/personal.nix ../modules/laptop.nix ../modules/sway.nix ]; diff --git a/hosts/count/configuration.nix b/hosts/count/configuration.nix index 907496d..6bb804f 100644 --- a/hosts/count/configuration.nix +++ b/hosts/count/configuration.nix @@ -11,7 +11,7 @@ ../modules/base.nix ../modules/desktop.nix ../modules/brother-printer.nix - ../modules/home.nix + ../modules/personal.nix ../modules/sway.nix ../modules/syncthing.nix ]; diff --git a/hosts/modules/desktop.nix b/hosts/modules/desktop.nix index 27f4cbc..76fed3b 100644 --- a/hosts/modules/desktop.nix +++ b/hosts/modules/desktop.nix @@ -40,7 +40,6 @@ }; environment.systemPackages = with pkgs; [ - bitwarden-desktop libreoffice-fresh meld ]; diff --git a/hosts/modules/personal.nix b/hosts/modules/personal.nix new file mode 100644 index 0000000..f948889 --- /dev/null +++ b/hosts/modules/personal.nix @@ -0,0 +1,8 @@ +{ config, pkgs, inputs, ... }: +{ + # Mullvad vpn + services.mullvad-vpn = { + enable = true; + package = pkgs.mullvad-vpn; + }; +} \ No newline at end of file