Merge branch 'main' of https://git.xenia.me.uk/pixelifytica/nixos

home/prog/default.nix

@@ -1,4 +1,5 @@
 {pkgs, ...}: {
+  xdg.configFile."ruff/pyproject.toml".source = ./ruff.toml;
   home.packages = with pkgs; [
     # Nix
     nil

home/prog/ruff.toml

@@ -0,0 +1,37 @@
+[lint]
+select = [
+  "F", "E4", "E7", "E9",       # Defaults
+  "W",                         # pycodestyle warnings
+  "B",                         # Flake8 bugbear rules
+  "PD",                        # Pandas vet rules
+  "NPY",                       # NumPy specific rules
+  "RUF",                       # Ruff specific rules
+  "PERF1", "PERF2",            # Performance lints from Perflint
+  "E101",                      # Mixed spaces and tabs
+  "E501",                      # Line too long
+  "C901",                      # Complex structure
+  "I001",                      # Import block un-sorted / un-formatted
+  "I002",                      # Missing required import
+  "N804",                      # First argument of class method should be cls
+  "N805"                       # First argument of method should be self
+]
+ignore = [
+  "W191",                 # Ignore due to conflict with ruff formatter
+  "E111",                 # Ignore due to conflict with ruff formatter
+  "E114",                 # Ignore due to conflict with ruff formatter
+  "E117",                 # Ignore due to conflict with ruff formatter
+  "D206",                 # Ignore due to conflict with ruff formatter
+  "D300",                 # Ignore due to conflict with ruff formatter
+  "Q000",                 # Ignore due to conflict with ruff formatter
+  "Q001",                 # Ignore due to conflict with ruff formatter
+  "Q002",                 # Ignore due to conflict with ruff formatter
+  "Q003",                 # Ignore due to conflict with ruff formatter
+  "COM812",               # Ignore due to conflict with ruff formatter
+  "COM819",               # Ignore due to conflict with ruff formatter
+  "ISC001",               # Ignore due to conflict with ruff formatter
+  "ISC002"                # Ignore due to conflict with ruff formatter
+]
+unfixable = ["W", "B", "PD", "NPY", "RUF", "E101", "E501", "C901", "I001", "I002"]
+
+[format]
+docstring-code-format = true

hosts/Ronin/configuration.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  lib,
-  pkgs,
-  ...
-}: {
   # Setup keyfile
   boot.initrd.secrets = {"/crypto_keyfile.bin" = null;};
 
@@ -17,5 +13,4 @@
     systemPackages = with pkgs; [openfortivpn samba];
   };
   services.ollama.enable = true;
-  programs.firefox.policies.Homepage.URL = lib.mkForce "https://nucleus.ukaea.uk";
 }

hosts/Scorch/configuration.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  lib,
-  pkgs,
-  ...
-}: {
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
   # Setup keyfile
@@ -19,5 +15,4 @@
     systemPackages = with pkgs; [openfortivpn samba];
   };
   services.ollama.enable = true;
-  programs.firefox.policies.Homepage.URL = lib.mkForce "https://nucleus.ukaea.uk";
 }

hosts/Vanguard/configuration.nix

@@ -11,4 +11,20 @@
   hardware.opengl.extraPackages = with pkgs; [amdvlk rocmPackages.clr.icd];
   hardware.opengl.extraPackages32 = [pkgs.driversi686Linux.amdvlk];
   services.ollama.enable = true;
+  networking.wg-quick.interfaces = {
+    protonvpn = {
+      address = ["10.2.0.2/32"];
+      dns = ["10.2.0.1"];
+      privateKeyFile = "/root/wireguard-keys/privatekey";
+      peers = [
+        {
+          publicKey = "ic5vxFWQEX5lRVwgx2vfE1xYKXQuwQi1TGDSkR0fsEY=";
+          # presharedKeyFile = "/root/wireguard-keys/preshared_from_peer0_key";
+          allowedIPs = ["0.0.0.0/0"];
+          endpoint = "146.70.96.66:51820";
+          persistentKeepalive = 25;
+        }
+      ];
+    };
+  };
 }

system/firefox.nix

@@ -75,9 +75,8 @@
       };
       HardwareAcceleration = true;
       Homepage = {
-        URL = "https://nixos.wiki";
         Locked = true;
-        StartPage = "homepage-locked";
+        StartPage = "none";
       };
       ManagedBookmarks = [
         # TODO update these