profiles: cleaned up profiles, removed obsolete

12 files changed, 37 insertions, 33 deletions

diff --git a/modules/profiles/cosmic/default.nix b/modules/profiles/cosmic/default.nix
index 7859a18..7feb1f5 100644
--- a/modules/profiles/cosmic/default.nix
+++ b/modules/profiles/cosmic/default.nix
@@ -1,4 +1,8 @@
-{ inputs, pkgs, ... }:
+{
+  inputs,
+  pkgs,
+  ...
+}:
 {
   imports = [
     inputs.nixos-cosmic.nixosModules.default
diff --git a/modules/profiles/fstrim/default.nix b/modules/profiles/fstrim/default.nix
index 03da691..c49c570 100644
--- a/modules/profiles/fstrim/default.nix
+++ b/modules/profiles/fstrim/default.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   services.fstrim = {
     enable = true;
diff --git a/modules/profiles/libvirtd/default.nix b/modules/profiles/libvirtd/default.nix
index f10a5ce..6802938 100644
--- a/modules/profiles/libvirtd/default.nix
+++ b/modules/profiles/libvirtd/default.nix
@@ -1,4 +1,7 @@
-{ config, ... }:
+{
+  config,
+  ...
+}:
 {
   virtualisation.libvirtd = {
     enable = true;
diff --git a/modules/profiles/nvidia/default.nix b/modules/profiles/nvidia/default.nix
index 50e0f6f..30c7d0c 100644
--- a/modules/profiles/nvidia/default.nix
+++ b/modules/profiles/nvidia/default.nix
@@ -1,5 +1,9 @@
-{ config, ... }:
 {
+  config,
+  ...
+}:
+{
+  services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia = {
     package = config.boot.kernelPackages.nvidiaPackages.stable;
     open = false;
@@ -11,6 +15,4 @@
       finegrained = false;
     };
   };
-
-  services.xserver.videoDrivers = [ "nvidia" ];
 }
diff --git a/modules/profiles/podman/default.nix b/modules/profiles/podman/default.nix
index 1ec3406..267bc00 100644
--- a/modules/profiles/podman/default.nix
+++ b/modules/profiles/podman/default.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   virtualisation = {
     containers.enable = true;
diff --git a/modules/profiles/share/default.nix b/modules/profiles/share/default.nix
deleted file mode 100644
index c4ee4ff..0000000
--- a/modules/profiles/share/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-{
-  users = {
-    users.share = {
-      uid = 994;
-      isSystemUser = true;
-      group = "share";
-    };
-    groups.share.gid = 994;
-  };
-}
diff --git a/modules/profiles/steam/default.nix b/modules/profiles/steam/default.nix
index c8008f9..a661434 100644
--- a/modules/profiles/steam/default.nix
+++ b/modules/profiles/steam/default.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   programs.steam = {
     enable = true;
diff --git a/modules/profiles/upgrade/default.nix b/modules/profiles/upgrade/default.nix
index 80fd3e3..31de7a2 100644
--- a/modules/profiles/upgrade/default.nix
+++ b/modules/profiles/upgrade/default.nix
@@ -1,4 +1,8 @@
-{ inputs, config, ... }:
+{
+  inputs,
+  config,
+  ...
+}:
 {
   system.autoUpgrade = {
     enable = true;
diff --git a/modules/profiles/vpn/default.nix b/modules/profiles/vpn/default.nix
index 0482c31..e3fc316 100644
--- a/modules/profiles/vpn/default.nix
+++ b/modules/profiles/vpn/default.nix
@@ -1,13 +1,14 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  ...
+}:
 {
   networking.nameservers = [ "9.9.9.9" ];
-
   services = {
     mullvad-vpn = {
       enable = true;
       package = pkgs.mullvad-vpn;
     };
-
     resolved = {
       enable = true;
       dnssec = "true";
diff --git a/modules/profiles/wireguard/default.nix b/modules/profiles/wireguard/default.nix
index 8c25d7a..ef0a6b2 100644
--- a/modules/profiles/wireguard/default.nix
+++ b/modules/profiles/wireguard/default.nix
@@ -1,14 +1,12 @@
-{ ... }:
 let
-  port = 51820;
+  listenPort = 51820;
 in
 {
   networking = {
-    firewall.allowedUDPPorts = [ port ];
-
+    firewall.allowedUDPPorts = [ listenPort ];
     wg-quick.interfaces.wg0 = {
+      inherit listenPort;
       autostart = true;
-      listenPort = port;
       configFile = "/etc/wireguard/wg0.conf";
     };
   };
diff --git a/modules/profiles/wireshark/default.nix b/modules/profiles/wireshark/default.nix
index 6b3dd3d..1312188 100644
--- a/modules/profiles/wireshark/default.nix
+++ b/modules/profiles/wireshark/default.nix
@@ -1,4 +1,8 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  ...
+}:
 {
   programs.wireshark = {
     enable = true;
diff --git a/modules/profiles/zfs/default.nix b/modules/profiles/zfs/default.nix
index 8344450..f79e91c 100644
--- a/modules/profiles/zfs/default.nix
+++ b/modules/profiles/zfs/default.nix
@@ -1,4 +1,8 @@
-{ lib, pkgs, ... }:
+{
+  lib,
+  pkgs,
+  ...
+}:
 {
   boot = {
     zfs.forceImportRoot = false;
@@ -22,7 +26,5 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    zfs
-  ];
+  environment.systemPackages = with pkgs; [ zfs ];
 }