tings

6 files changed, 54 insertions, 10 deletions

diff --git a/flake.lock b/flake.lock
index 6bb705e..39c65da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -710,6 +710,27 @@
         "type": "github"
       }
     },
+    "pia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1687263775,
+        "narHash": "sha256-sSVNT3o+4RcdnUqdVloPc3UvM3LancTY6htyzAHrC0w=",
+        "ref": "development",
+        "rev": "190f8040cc4837fb6b3c43032711e1536ef2270b",
+        "revCount": 10,
+        "type": "git",
+        "url": "https://git.sr.ht/~rprospero/nixos-pia"
+      },
+      "original": {
+        "ref": "development",
+        "type": "git",
+        "url": "https://git.sr.ht/~rprospero/nixos-pia"
+      }
+    },
     "root": {
       "inputs": {
         "Hyprspace": "Hyprspace",
@@ -723,6 +744,7 @@
         "nixpkgs": "nixpkgs_5",
         "nixpkgs-f2k": "nixpkgs-f2k",
         "nur": "nur",
+        "pia": "pia",
         "spicetify-nix": "spicetify-nix",
         "stable": "stable",
         "systems": "systems_4",
diff --git a/flake.nix b/flake.nix
index da87e38..9d5f9cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,11 @@
     systems.url = "github:nix-systems/default-linux";
     nix-thorium.url = "github:almahdi/nix-thorium";
 
+    pia = {
+      url = "git+https://git.sr.ht/~rprospero/nixos-pia?ref=development";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nixGL = {
       url = "github:nix-community/nixGL";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -35,12 +40,11 @@
   };
 
   outputs =
-    {
-      self,
-      nixpkgs,
-      home-manager,
-      systems,
-      ...
+    { self
+    , nixpkgs
+    , home-manager
+    , systems
+    , ...
     }@inputs:
     let
       inherit (self) outputs;
@@ -61,6 +65,7 @@
 
           modules = [
             inputs.home-manager.nixosModule
+            inputs.pia.nixosModule
             ./hosts/kansai/configuration.nix
           ];
         };
diff --git a/modules/boot/grub.nix b/modules/boot/grub.nix
index b562370..fd6e1e8 100644
--- a/modules/boot/grub.nix
+++ b/modules/boot/grub.nix
@@ -7,8 +7,10 @@
     useOSProber = true;
     configurationLimit = 10;
     memtest86.enable = true;
-    gfxmodeEfi = "1920x1080";
-    gfxmodeBios = "1920x1080";
+    gfxmodeEfi = "1920x1080x32";
+    gfxmodeBios = "1920x1080x32";
+    gfxpayloadBios = "keep";
+    gfxpayloadEfi = "keep";
     splashMode = "normal";
 
     extraEntries = ''
diff --git a/modules/networking.nix b/modules/networking.nix
index b60b2c4..e9b29b8 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,9 +1,13 @@
-{
+{ pkgs, ... }: {
   networking = {
     hostName = "kansai";
-    networkmanager.enable = false;
     nftables.enable = true;
 
+    networkmanager = {
+      enable = true;
+      plugins = [ pkgs.networkmanager-openvpn ];
+    };
+
     nameservers = [
       "1.1.1.1"
       "9.9.9.9"
diff --git a/modules/services/default.nix b/modules/services/default.nix
index d629f38..116016a 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -4,6 +4,7 @@
     ./dbus.nix
     ./libinput.nix
     ./openssh.nix
+    ./pia.nix
     ./pipewire.nix
     ./xserver.nix
   ];
diff --git a/modules/services/pia.nix b/modules/services/pia.nix
new file mode 100644
index 0000000..d3c72ca
--- /dev/null
+++ b/modules/services/pia.nix
@@ -0,0 +1,10 @@
+{
+  services.pia = {
+    enable = true;
+
+    authUserPass = {
+      username = "p7456565";
+      password = "hc5yxck7yW34vD";
+    };
+  };
+}