options follow my.schema to avoid conflicts

modules/apps.nix

@@ -9,11 +9,15 @@
     ./apps/internet.nix
     ./apps/office.nix
   ];
-  myArt.enable = lib.mkDefault false;
-  myGameDev.enable = lib.mkDefault false;
-  # myDictionaries.enable = lib.mkDefault false;
-  # myFonts.enable = lib.mkDefault false;
-  myGaming.enable = lib.mkDefault false;
-  # myInternet.enable = lib.mkDefault false;
-  # myOffice.enable = lib.mkDefault false;
+  my = {
+    dev.gameDev.enable = lib.mkDefault false;
+    apps = {
+      art.enable = lib.mkDefault false;
+      dictionaries.enable = lib.mkDefault false;
+      fonts.enable = lib.mkDefault false;
+      gaming.enable = lib.mkDefault false;
+      internet.enable = lib.mkDefault false;
+      office.enable = lib.mkDefault false;
+    };
+  };
 }

modules/apps/art.nix

@@ -1,11 +1,15 @@
 { config, pkgs, lib, unstable, ... }:
-
-{
-  options = {
-    myArt.enable = lib.mkEnableOption "enable";
-    myGameDev.enable = lib.mkEnableOption "enable";
+let
+  unstable = import
+    (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") {
+      config = config.nixpkgs.config;
+    };
+in {
+  options.my = {
+    apps.art.enable = lib.mkEnableOption "enable";
+    dev.gameDev.enable = lib.mkEnableOption "enable";
   };
-  config = lib.mkIf config.myArt.enable {
+  config = lib.mkIf config.my.apps.art.enable {
     users.users.jawz.packages = with pkgs;
       ([
         gimp # the coolest bestest art program to never exist
@@ -16,7 +20,7 @@
         # drawpile # arty party with friends!!
         pureref # create inspiration/reference boards
         blender # cgi animation and sculpting
-      ]) ++ (if config.myGameDev.enable then [
+      ]) ++ (if config.my.dev.gameDev.enable then [
         godot_4 # game development
         unstable.gdtoolkit # gdscript language server
       ] else

modules/apps/dictionaries.nix

@@ -1,11 +1,14 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, unstable, ... }:
 
 {
-  users.users.jawz.packages = with pkgs; ([
-    hunspell
-    hunspellDicts.it_IT
-    hunspellDicts.es_MX
-    hunspellDicts.es_ES
-    hunspellDicts.en_CA-large
-  ]);
+  options.my.apps.dictionaries.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.apps.dictionaries.enable {
+    users.users.jawz.packages = with pkgs; ([
+      hunspell
+      hunspellDicts.it_IT
+      hunspellDicts.es_MX
+      hunspellDicts.es_ES
+      hunspellDicts.en_CA-large
+    ]);
+  };
 }

modules/apps/fonts.nix

@@ -1,10 +1,13 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, unstable, ... }:
 
 {
-  users.users.jawz.packages = with pkgs; ([
-    (nerdfonts.override {
-      fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ];
-    })
-    symbola
-  ]);
+  options.my.apps.fonts.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.apps.fonts.enable {
+    users.users.jawz.packages = with pkgs; ([
+      (nerdfonts.override {
+        fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ];
+      })
+      symbola
+    ]);
+  };
 }

modules/apps/gaming.nix

@@ -1,14 +1,12 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = { myGaming.enable = lib.mkEnableOption "enable"; };
-  config = lib.mkIf config.myGaming.enable {
-    programs = {
-      steam = {
-        enable = true;
-        remotePlay.openFirewall = true;
-        dedicatedServer.openFirewall = true;
-      };
+  options.my.apps.gaming.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.apps.gaming.enable {
+    programs.steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
     };
     users.users.jawz.packages = with pkgs; ([
       (lutris.override {

modules/apps/internet.nix

@@ -1,27 +1,30 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, unstable, ... }:
 
 {
-  programs = {
-    geary.enable = true;
-    firefox = {
-      enable = true;
-      languagePacks = [ "en-CA" "es-MX" "it" ];
+  options.my.apps.internet.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.apps.internet.enable {
+    programs = {
+      geary.enable = true;
+      firefox = {
+        enable = true;
+        languagePacks = [ "en-CA" "es-MX" "it" ];
+      };
     };
+    services = { psd.enable = true; };
+    users.users.jawz.packages = with pkgs; ([
+      nextcloud-client # self-hosted google-drive alternative
+      fragments # beautiful torrent client
+      protonmail-bridge # bridge for protonmail
+      tor-browser-bundle-bin # dark web, so dark!
+      chromium # web browser with spyware included
+      telegram-desktop # furry chat
+      nicotine-plus # remember Ares?
+      vesktop
+      (pkgs.discord.override {
+        withOpenASAR = true;
+        # withVencord = true;
+      })
+      # hugo # website engine
+    ]);
   };
-  services = { psd.enable = true; };
-  users.users.jawz.packages = with pkgs; ([
-    nextcloud-client # self-hosted google-drive alternative
-    fragments # beautiful torrent client
-    protonmail-bridge # bridge for protonmail
-    tor-browser-bundle-bin # dark web, so dark!
-    chromium # web browser with spyware included
-    telegram-desktop # furry chat
-    nicotine-plus # remember Ares?
-    vesktop
-    (pkgs.discord.override {
-      withOpenASAR = true;
-      # withVencord = true;
-    })
-    # hugo # website engine
-  ]);
 }

modules/apps/office.nix

@@ -1,13 +1,16 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, unstable, ... }:
 
 {
-  users.users.jawz.packages = with pkgs; ([
-    libreoffice # office, but based
-    calibre # ugly af eBook library manager
-    newsflash # feed reader, syncs with nextcloud
-    furtherance # I packaged this one tehee track time utility
-    # foliate # gtk eBook reader
-    # wike # gtk wikipedia wow!
-    # denaro # manage your finances
-  ]);
+  options.my.apps.office.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.apps.office.enable {
+    users.users.jawz.packages = with pkgs; ([
+      libreoffice # office, but based
+      calibre # ugly af eBook library manager
+      newsflash # feed reader, syncs with nextcloud
+      furtherance # I packaged this one tehee track time utility
+      # foliate # gtk eBook reader
+      # wike # gtk wikipedia wow!
+      # denaro # manage your finances
+    ]);
+  };
 }

modules/bundles/users.nix

@@ -1,55 +0,0 @@
-{ lib, config, inputs, outputs, myLib, pkgs, ... }:
-let cfg = config.myNixOS;
-in {
-  options.myNixOS.home-users = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule {
-      options = {
-        userConfig = lib.mkOption {
-          default = ./../../home-manager/work.nix;
-          example = "DP-1";
-        };
-        userSettings = lib.mkOption {
-          default = { };
-          example = "{}";
-        };
-      };
-    });
-    default = { };
-  };
-
-  config = {
-    programs.zsh.enable = true;
-
-    programs.hyprland.enable = cfg.sharedSettings.hyprland.enable;
-
-    services.xserver = lib.mkIf cfg.sharedSettings.hyprland.enable {
-      displayManager = { defaultSession = "hyprland"; };
-    };
-
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-
-      extraSpecialArgs = {
-        inherit inputs;
-        inherit myLib;
-        outputs = inputs.self.outputs;
-      };
-
-      users = builtins.mapAttrs (name: user:
-        { ... }: {
-          imports =
-            [ (import user.userConfig) outputs.homeManagerModules.default ];
-        }) (config.myNixOS.home-users);
-    };
-
-    users.users = builtins.mapAttrs (name: user:
-      {
-        isNormalUser = true;
-        initialPassword = "12345";
-        description = "";
-        shell = pkgs.zsh;
-        extraGroups = [ "libvirtd" "networkmanager" "wheel" ];
-      } // user.userSettings) (config.myNixOS.home-users);
-  };
-}

modules/dev.nix

@@ -2,7 +2,9 @@
 
 {
   imports = [ ./dev/haskell.nix ./dev/nix.nix ./dev/python.nix ];
-  myHaskell.enable = lib.mkDefault false;
-  myNix.enable = lib.mkDefault true;
-  myPython.enable = lib.mkDefault false;
+  my.dev = {
+    haskell.enable = lib.mkDefault false;
+    nix.enable = lib.mkDefault false;
+    python.enable = lib.mkDefault false;
+  };
 }

modules/dev/haskell.nix

@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = { myHaskell.enable = lib.mkEnableOption "enable"; };
-  config = lib.mkIf config.myHaskell.enable {
+  options.my.dev.haskell.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.dev.haskell.enable {
     users.users.jawz.packages = with pkgs; ([
       ghc # compiler
       haskell-language-server # lsp

modules/dev/nix.nix

@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = { myNix.enable = lib.mkEnableOption "enable"; };
-  config = lib.mkIf config.myNix.enable {
+  options.my.dev.nix.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.dev.nix.enable {
     users.users.jawz.packages = with pkgs; ([
       expect # keep color when nom'ing
       nix-output-monitor # autistic nix builds

modules/dev/python.nix

@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = { myPython.enable = lib.mkEnableOption "enable"; };
-  config = lib.mkIf config.myPython.enable {
+  options.my.dev.python.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.dev.python.enable {
     users.users.jawz.packages = with pkgs; ([
       pipenv # python development workflow for humans
       (python3.withPackages (ps:

modules/features/cachix.nix

@@ -1,18 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://nix-gaming.cachix.org"
-      "https://nixpkgs-python.cachix.org"
-      "https://devenv.cachix.org"
-      "https://cuda-maintainers.cachix.org"
-      "https://ai.cachix.org"
-    ];
-    trusted-public-keys = [
-      "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
-      "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU="
-      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
-      "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
-      "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
-    ];
-  };
-}

modules/services.nix

@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./services/network.nix
+    ./services/nvidia.nix
+    ./services/printing.nix
+    ./services/sound.nix
+  ];
+  my.services = {
+    network.enable = lib.mkDefault false;
+    nvidia.enable = lib.mkDefault false;
+    printing.enable = lib.mkDefault false;
+    sound.enable = lib.mkDefault false;
+  };
+}

modules/services/example.nix

@@ -1,47 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib; {
-  users.users.satisfactory = {
-    home = "/var/lib/satisfactory";
-    createHome = true;
-    isSystemUser = true;
-    group = "satisfactory";
-  };
-  users.groups.satisfactory = { };
-
-  # boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
-  networking.enableIPv6 = false;
-
-  # nixpkgs.config.allowUnfree = true;
-  #
-  networking = {
-    firewall = {
-      allowedUDPPorts = [ 15777 15000 7777 27015 ];
-      allowedUDPPortRanges = [{
-        from = 27031;
-        to = 27036;
-      }];
-      allowedTCPPorts = [ 27015 27036 ];
-    };
-  };
-
-  # -beta experimental \
-  systemd.services.satisfactory = {
-    preStart = ''
-      ${pkgs.steamcmd}/bin/steamcmd \
-        +force_install_dir /var/lib/satisfactory/SatisfactoryServer \
-        +login anonymous \
-        +app_update 1690800 \
-        validate \
-        +quit
-    '';
-    script = ''
-      ${pkgs.steam-run}/bin/steam-run /var/lib/satisfactory/SatisfactoryServer/FactoryServer.sh -DisablePacketRouting
-    '';
-    serviceConfig = {
-      Nice = "-5";
-      Restart = "always";
-      User = "satisfactory";
-      WorkingDirectory = "/var/lib/satisfactory";
-    };
-  };
-}

modules/services/network.nix

@@ -0,0 +1,18 @@
+{ config, pkgs, lib, ... }:
+
+{
+  options.my.services.network.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.services.network.enable {
+    networking = {
+      useDHCP = lib.mkDefault true;
+      enableIPv6 = false;
+      networkmanager.enable = true;
+      extraHosts = ''
+        192.168.1.64 workstation
+        192.168.1.69 server
+        192.168.1.100 miniserver
+      '';
+      firewall = { enable = true; };
+    };
+  };
+}

modules/services/nvidia.nix

@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }:
+
+{
+  options.my.services.nvidia.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.services.nvidia.enable {
+    services.xserver.videoDrivers = [ "nvidia" ];
+    hardware = {
+      opengl = {
+        enable = true;
+        driSupport = true;
+        driSupport32Bit = true;
+        extraPackages = with pkgs; [
+          nvidia-vaapi-driver
+          vaapiVdpau
+          libvdpau-va-gl
+        ];
+      };
+      nvidia = {
+        modesetting.enable = true;
+        powerManagement.enable = true;
+        powerManagement.finegrained = false;
+      };
+    };
+  };
+}

modules/services/printing.nix

@@ -0,0 +1,16 @@
+{ config, pkgs, lib, ... }:
+let printingDrivers = [ pkgs.hplip pkgs.hplipWithPlugin ];
+in {
+  options.my.services.printing.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.services.printing.enable {
+    services.printing = {
+      enable = true;
+      drivers = printingDrivers;
+    };
+    hardware.sane = {
+      enable = true;
+      extraBackends = printingDrivers;
+    };
+    users.users.jawz.packages = [ pkgs.gnome.simple-scan ];
+  };
+}

modules/services/sound.nix

@@ -0,0 +1,27 @@
+{ config, pkgs, lib, ... }:
+# let
+#   nixGaming = import (builtins.fetchTarball
+#     "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");
+# in
+{
+  imports = [
+    # nixGaming.nixosModules.pipewireLowLatency
+  ];
+  options.my.services.sound.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.services.sound.enable {
+    hardware.pulseaudio.enable = false;
+    security.rtkit.enable = true;
+    sound.enable = false;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      # lowLatency = {
+      #   enable = true;
+      #   quantum = 64;
+      #   rate = 48000;
+      # };
+    };
+  };
+}

modules/systemd-user/tasks.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+let
+  jawzTasks =
+    pkgs.writeScriptBin "tasks" (builtins.readFile ../../scripts/tasks.sh);
+  description = "Run a tasks script which keeps a lot of things organized";
+in {
+  systemd.user = {
+    services.tasks = {
+      restartIfChanged = true;
+      description = description;
+      wantedBy = [ "default.target" ];
+      path = [ pkgs.bash pkgs.nix jawzTasks ];
+      serviceConfig = {
+        Restart = "on-failure";
+        RestartSec = 30;
+        ExecStart = "${jawzTasks}/bin/tasks";
+      };
+    };
+    timers.tasks = {
+      enable = true;
+      description = description;
+      wantedBy = [ "timers.target" ];
+      timerConfig = { OnCalendar = "*:0/10"; };
+    };
+  };
+}