From 37346c49e01259e2b71d7794a9e7c18d289774f0 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Mon, 30 Jun 2025 21:21:44 -0600 Subject: [PATCH] moved --- {modules => hosts/modules}/audio.nix | 0 {modules => hosts/modules}/bluetooth.nix | 0 {modules => hosts/modules}/boot.nix | 0 {modules => hosts/modules}/cups.nix | 0 {modules => hosts/modules}/docker.nix | 0 {modules => hosts/modules}/env.nix | 0 {modules => hosts/modules}/fonts.nix | 0 {modules => hosts/modules}/i3-xfce.nix | 6 ++++ {modules => hosts/modules}/ld.nix | 0 {modules => hosts/modules}/net.nix | 6 ++++ {modules => hosts/modules}/nixos.nix | 0 {modules => hosts/modules}/npm.nix | 0 {modules => hosts/modules}/nvidia.nix | 0 {modules => hosts/modules}/ollama.nix | 0 {modules => hosts/modules}/python.nix | 0 {modules => hosts/modules}/rust.nix | 0 {modules => hosts/modules}/steam.nix | 0 {modules => hosts/modules}/tailscale.nix | 0 {modules => hosts/modules}/timezone.nix | 0 {modules => hosts/modules}/user.nix | 0 {modules => hosts/modules}/x11.nix | 0 modules/default.nix | 36 ------------------------ modules/udiskie.nix | 3 -- 23 files changed, 12 insertions(+), 39 deletions(-) rename {modules => hosts/modules}/audio.nix (100%) rename {modules => hosts/modules}/bluetooth.nix (100%) rename {modules => hosts/modules}/boot.nix (100%) rename {modules => hosts/modules}/cups.nix (100%) rename {modules => hosts/modules}/docker.nix (100%) rename {modules => hosts/modules}/env.nix (100%) rename {modules => hosts/modules}/fonts.nix (100%) rename {modules => hosts/modules}/i3-xfce.nix (98%) rename {modules => hosts/modules}/ld.nix (100%) rename {modules => hosts/modules}/net.nix (93%) rename {modules => hosts/modules}/nixos.nix (100%) rename {modules => hosts/modules}/npm.nix (100%) rename {modules => hosts/modules}/nvidia.nix (100%) rename {modules => hosts/modules}/ollama.nix (100%) rename {modules => hosts/modules}/python.nix (100%) rename {modules => hosts/modules}/rust.nix (100%) rename {modules => hosts/modules}/steam.nix (100%) rename {modules => hosts/modules}/tailscale.nix (100%) rename {modules => hosts/modules}/timezone.nix (100%) rename {modules => hosts/modules}/user.nix (100%) rename {modules => hosts/modules}/x11.nix (100%) delete mode 100644 modules/default.nix delete mode 100644 modules/udiskie.nix diff --git a/modules/audio.nix b/hosts/modules/audio.nix similarity index 100% rename from modules/audio.nix rename to hosts/modules/audio.nix diff --git a/modules/bluetooth.nix b/hosts/modules/bluetooth.nix similarity index 100% rename from modules/bluetooth.nix rename to hosts/modules/bluetooth.nix diff --git a/modules/boot.nix b/hosts/modules/boot.nix similarity index 100% rename from modules/boot.nix rename to hosts/modules/boot.nix diff --git a/modules/cups.nix b/hosts/modules/cups.nix similarity index 100% rename from modules/cups.nix rename to hosts/modules/cups.nix diff --git a/modules/docker.nix b/hosts/modules/docker.nix similarity index 100% rename from modules/docker.nix rename to hosts/modules/docker.nix diff --git a/modules/env.nix b/hosts/modules/env.nix similarity index 100% rename from modules/env.nix rename to hosts/modules/env.nix diff --git a/modules/fonts.nix b/hosts/modules/fonts.nix similarity index 100% rename from modules/fonts.nix rename to hosts/modules/fonts.nix diff --git a/modules/i3-xfce.nix b/hosts/modules/i3-xfce.nix similarity index 98% rename from modules/i3-xfce.nix rename to hosts/modules/i3-xfce.nix index 0a58d77..940b4a5 100644 --- a/modules/i3-xfce.nix +++ b/hosts/modules/i3-xfce.nix @@ -47,6 +47,12 @@ in { polybar i3-auto-layout xsettingsd + mpv + yt-dlp + flameshot + imagemagick + slop + ghostscript ]; extraSessionCommands = '' if [ -f /var/lib/lightdm-background/.last-wallpaper ]; then diff --git a/modules/ld.nix b/hosts/modules/ld.nix similarity index 100% rename from modules/ld.nix rename to hosts/modules/ld.nix diff --git a/modules/net.nix b/hosts/modules/net.nix similarity index 93% rename from modules/net.nix rename to hosts/modules/net.nix index 9dee852..f793a28 100644 --- a/modules/net.nix +++ b/hosts/modules/net.nix @@ -1,6 +1,12 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ networkmanagerapplet + wget + curl + cloudflared + nmap + httpie + socat ]; networking.firewall.allowedTCPPorts = [57621]; diff --git a/modules/nixos.nix b/hosts/modules/nixos.nix similarity index 100% rename from modules/nixos.nix rename to hosts/modules/nixos.nix diff --git a/modules/npm.nix b/hosts/modules/npm.nix similarity index 100% rename from modules/npm.nix rename to hosts/modules/npm.nix diff --git a/modules/nvidia.nix b/hosts/modules/nvidia.nix similarity index 100% rename from modules/nvidia.nix rename to hosts/modules/nvidia.nix diff --git a/modules/ollama.nix b/hosts/modules/ollama.nix similarity index 100% rename from modules/ollama.nix rename to hosts/modules/ollama.nix diff --git a/modules/python.nix b/hosts/modules/python.nix similarity index 100% rename from modules/python.nix rename to hosts/modules/python.nix diff --git a/modules/rust.nix b/hosts/modules/rust.nix similarity index 100% rename from modules/rust.nix rename to hosts/modules/rust.nix diff --git a/modules/steam.nix b/hosts/modules/steam.nix similarity index 100% rename from modules/steam.nix rename to hosts/modules/steam.nix diff --git a/modules/tailscale.nix b/hosts/modules/tailscale.nix similarity index 100% rename from modules/tailscale.nix rename to hosts/modules/tailscale.nix diff --git a/modules/timezone.nix b/hosts/modules/timezone.nix similarity index 100% rename from modules/timezone.nix rename to hosts/modules/timezone.nix diff --git a/modules/user.nix b/hosts/modules/user.nix similarity index 100% rename from modules/user.nix rename to hosts/modules/user.nix diff --git a/modules/x11.nix b/hosts/modules/x11.nix similarity index 100% rename from modules/x11.nix rename to hosts/modules/x11.nix diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index 9404ed7..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{pkgs, ...}: { - imports = [ - ./audio.nix - ./bluetooth.nix - ./boot.nix - ./docker.nix - ./env.nix - ./fonts.nix - ./net.nix - ./nixos.nix - ./nvidia.nix - ./steam.nix - ./timezone.nix - ./user.nix - ./python.nix - ./npm.nix - ./tailscale.nix - ./udiskie.nix - ./ld.nix - ./x11.nix - ./i3-xfce.nix - ./ollama.nix - ./cups.nix - ./rust.nix - ]; - - npm.enable = true; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; -} diff --git a/modules/udiskie.nix b/modules/udiskie.nix deleted file mode 100644 index d4422c1..0000000 --- a/modules/udiskie.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - services.udisks2.enable = true; -}