added proton vpn to john-p14s

modules/features/desktop.nix

@@ -10,7 +10,6 @@
     home.packages = with pkgs; [
       mangohud
       sublime4
-      proton-vpn
     ];
   };
 }

modules/hosts/janus/default.nix

@@ -95,13 +95,6 @@ in
     ];
   };
 
-  flake-file.inputs = {
-    wrappers = {
-      url = "github:lassulus/wrappers";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
   perSystem = { system, pkgs, lib, ... }: {
     packages.janus-ca = inputs.wrappers.lib.wrapPackage {
       inherit pkgs;

modules/hosts/john-p14s/configuration.nix

@@ -125,6 +125,7 @@
             bash
             discord
             my-neovim
+            proton-vpn
           ];
           ssh.certificates.enable = true;
           ssh.matchSets = {

modules/hosts/john-pc/default.nix

@@ -1,4 +1,4 @@
-{ self, inputs, ... }:
+{ withSystem, self, inputs, ... }:
 let
   username = "john";
   hostname = "john-pc-ubuntu";
@@ -46,7 +46,7 @@ in
       test-push
       selfPkgs.neovim-min
       # ${selfPkgs}.my-neovim
-      selfPkgs.richPrinter
+      # selfPkgs.richPrinter
       selfPkgs.janus-ca
     ];
 
@@ -109,10 +109,9 @@ in
     };
   };
 
-  flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
+  flake.homeConfigurations."john@john-pc-ubuntu" = withSystem "x86_64-linux" (ctx@{ config, inputs', ...}:
-    pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+    inputs.home-manager.lib.homeManagerConfiguration {
-    modules = with inputs.self.modules; [
+      pkgs = inputs'.nixpkgs.legacyPackages;
-      homeManager."${hostname}"
+      modules = [ inputs.self.modules.homeManager."${hostname}" ];
-    ];
+  });
-  };
 }

modules/nix-tools/wrappers.nix

@@ -0,0 +1,12 @@
+{ self, inputs, ... }: {
+  flake-file.inputs = {
+    wrapper-modules = {
+      url = "github:BirdeeHub/nix-wrapper-modules";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    wrappers = {
+      url = "github:lassulus/wrappers";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+}

modules/programs/eza.nix

@@ -1,14 +1,24 @@
-{ inputs, pkgs, lib, ... }:
+{ self, inputs, ... }:
 {
-  flake.modules.homeManager.eza = { pkgs, lib, ... }: {
+  flake.modules.homeManager.eza = { config, pkgs, lib, ... }: {
     programs.eza = {
       enable = true;
-      package = pkgs.eza;
       enableBashIntegration = true;
       enableZshIntegration = true;
-    };
+      git = true;
-    home.shellAliases = {
+      icons = "auto";
-      ls = "${lib.getExe pkgs.eza} -algos type --follow-symlinks --all --all";
+      colors = "auto";
+      extraOptions = [
+        "--all"
+        "--long"
+        "--group-directories-first"
+        "--sort=type"
+        "--dereference"
+        "--octal-permissions"
+        "--smart-group"
+        "--no-time"
+        "--git"
+      ];
     };
   };
 }

modules/programs/niri.nix

@@ -1,9 +1,4 @@
 { self, inputs, ... }: {
-  flake-file.inputs = {
-    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
-    # wrapper-modules.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
   flake.modules.nixos.niri = { pkgs, lib, ... }: {
     programs.niri = {
       enable = true;