Further refactoring

modules/git/default.nix

@@ -0,0 +1,19 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let cfg = config.modules.git;
+
+in
+{
+  options.modules.git = { enable = mkEnableOption "git"; };
+  config = mkIf cfg.enable {
+    programs.git = {
+      enable = true;
+      userName = "Bryan Ramos";
+      userEmail = "bryan@ramos.codes";
+      extraConfig = {
+        init = { defaultBranch = "main"; };
+      };
+    };
+  };
+}

modules/system/configuration.nix

@@ -1,159 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  system.stateVersion = "23.05";
-  environment.defaultPackages = [ ];
-
-  nix = {
-    extraOptions = "experimental-features = nix-command flakes";
-    settings = {
-      allowed-users = "bryan";
-      auto-optimise-store = true;
-      system-features = [
-        "kvm"
-      ];
-    };
-    gc = {
-      automatics = true;
-      options = "weekly";
-    };
-  };
-
-  boot = {
-    loader = {
-      grub = {
-        enable = true;
-	      useOSProber = true;
-	      devices = [ "nodev" ];
-	      efiSupport = true;
-	      configurationLimit = 5;
-      };
-
-      efi = {
-        canTouchEfiVariables = true;
-      };
-    }; 
-#    extraModprobeConfig = ''
-#      options vfio-pci ids=10de:1f82,10de:10fa
-#    '';
-  };
-
-  programs = {
-    sway = {
-    enable = true;
-    extraPackages = with pkgs; [
-        rofi-wayland
-        grim
-        slurp
-        wl-clipboard
-
-        xdg-utils
-
-        fontconfig
-        qogir-icon-theme
-        emote
-
-        virt-manager
-        pavucontrol
-      ];
-    };
-    
-    bash = {
-      enable = true;
-      enableCompletion = true;
-      enableLsColors = true;
-      blesh.enable = true;
-      
-      shellInit = ''
-        
-      '';
-    };
-
-    gnupg = {
-      agent = {
-        enable = true;
-        enableSSHSupport = true;
-      };
-    };
-
-    xwayland = { 
-      enable = true;
-    };
-
-    git.enable = true;
-  };
-    
-  fonts = {
-    fonts = with pkgs; [
-      terminus_font
-      nerdfonts
-      
-      noto-fonts
-      noto-fonts-cjk
-      
-      emojione
-    ];
-  };
-
-  xdg.portal.wlr.enable = true;
-  
-  services.pipewire = {
-    enable = true;
-    audio.enable = true;
-
-    wireplumber.enable = true;
-
-    pulse.enable = true;
-    jack.enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-  };
-
-  services = {
-    trezord.enable = true;
-
-    cron = {
-      enable = true;
-      systemCronJobs = [
-        "0 0 * * *  bryan  /home/bryan/Documents/scripts/lnbackup_script.sh"
-      ];
-    };
-  };
-
-  console = {
-    font = "Lat2-Terminus16";
-    useXkbConfig = true;
-  };
-
-  time = {
-    timeZone = "America/New_York";
-  };
-  
-  services.timesyncd = {
-    enable = true;
-    servers = [
-      "0.pool.ntp.org"
-      "1.pool.ntp.org"
-      "2.pool.ntp.org"
-      "3.pool.ntp.org"
-    ];
-  };
-
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  # Networking
-  networking = {
-    hostName = "socrates";
-    useDHCP = lib.mkDefault true;
-    networkmanager.enable = true;
-    firewall.enable = true;
-  };
-
-  virtualisation.libvirtd = {
-    enable = true;
-    qemu = {
-      package = pkgs.qemu_kvm;
-      runAsRoot = true;
-      ovmf.enable = true;
-    };
-  };
-}

modules/template.nix

@@ -0,0 +1,10 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let cfg = config.modules.PROGRAM;
+
+in {
+    options.modules.PROGRAM = { enable = mkEnableOption "PROGRAM"; };
+    config = mkIf cfg.enable {
+    };
+}