From 7e7c8947fc2ff5598124c4a4c18bd28432fa017e Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Mon, 8 Sep 2025 14:01:35 -0500 Subject: rework most of config; probably broke jupiter again; working to add ganymede (non-nixos) to this repo --- modules/services/system/audio.nix | 20 ----------------- modules/services/system/bluetooth.nix | 19 ---------------- modules/services/system/default.nix | 8 ------- modules/services/system/networking/default.nix | 18 --------------- modules/services/system/networking/iwd.nix | 26 ---------------------- .../services/system/networking/networkmanager.nix | 15 ------------- modules/services/system/tailscale.nix | 15 ------------- 7 files changed, 121 deletions(-) delete mode 100644 modules/services/system/audio.nix delete mode 100644 modules/services/system/bluetooth.nix delete mode 100644 modules/services/system/default.nix delete mode 100644 modules/services/system/networking/default.nix delete mode 100644 modules/services/system/networking/iwd.nix delete mode 100644 modules/services/system/networking/networkmanager.nix delete mode 100644 modules/services/system/tailscale.nix (limited to 'modules/services/system') diff --git a/modules/services/system/audio.nix b/modules/services/system/audio.nix deleted file mode 100644 index 93f8289..0000000 --- a/modules/services/system/audio.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: let - cfg = config.collinux.services.audio; -in - lib.mkIf cfg.enable { - security.rtkit.enable = true; - services.pipewire = { - enable = true; - wireplumber.enable = true; - alsa.enable = true; - - pulse.enable = cfg.pulse.enable; - }; - - environment.systemPackages = [pkgs.pwvucontrol]; - } diff --git a/modules/services/system/bluetooth.nix b/modules/services/system/bluetooth.nix deleted file mode 100644 index a86b5b3..0000000 --- a/modules/services/system/bluetooth.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - cfg = config.collinux.services.bluetooth; -in - lib.mkIf cfg.enable { - hardware.bluetooth = { - enable = true; - powerOnBoot = true; - }; - - environment.systemPackages = [ - (lib.mkIf cfg.blueman.enable pkgs.blueman) - (lib.mkIf cfg.bluetuith.enable pkgs.bluetuith) - ]; - } diff --git a/modules/services/system/default.nix b/modules/services/system/default.nix deleted file mode 100644 index b9ae4c7..0000000 --- a/modules/services/system/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ - ./networking - ./audio.nix - ./bluetooth.nix - ./tailscale.nix - ]; -} diff --git a/modules/services/system/networking/default.nix b/modules/services/system/networking/default.nix deleted file mode 100644 index 68c794c..0000000 --- a/modules/services/system/networking/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - imports = [ - ./iwd.nix - ./networkmanager.nix - ]; - - config = { - services.resolved = { - enable = true; - domains = [ - "10.0.0.1" - "10.0.0.10" - ]; - }; - - networking.resolvconf.enable = false; - }; -} diff --git a/modules/services/system/networking/iwd.nix b/modules/services/system/networking/iwd.nix deleted file mode 100644 index d081792..0000000 --- a/modules/services/system/networking/iwd.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - config, - ... -}: let - cfg = config.collinux.services.networking; -in - lib.mkIf (cfg.enable && cfg.iwd.enable) { - networking = { - wireless.iwd = { - enable = true; - settings = { - General = { - EnableNetworkConfiguration = true; # use builtin dhcp client - AddressRandomization = "once"; - }; - Network.NameResolvingService = "systemd"; # either systemd or resolvconf - }; - }; - - # Disable default networking stuff - dhcpcd.enable = false; - useDHCP = false; - networkmanager.enable = false; - }; - } diff --git a/modules/services/system/networking/networkmanager.nix b/modules/services/system/networking/networkmanager.nix deleted file mode 100644 index f22f922..0000000 --- a/modules/services/system/networking/networkmanager.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - lib, - config, - ... -}: let - cfg = config.collinux.services.networking; -in - lib.mkIf (cfg.enable && cfg.networkmanager.enable) { - networking = { - nameservers = ["1.1.1.1" "1.0.0.1"]; - enableIPv6 = false; - - networkmanager.enable = true; - }; - } diff --git a/modules/services/system/tailscale.nix b/modules/services/system/tailscale.nix deleted file mode 100644 index 3fbd691..0000000 --- a/modules/services/system/tailscale.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - cfg = config.collinux.services.networking.tailscale; -in - lib.mkIf cfg.enable { - services.tailscale = { - enable = true; - useRoutingFeatures = "both"; - }; - environment.systemPackages = [pkgs.tailscale]; - } -- cgit v1.3.1