cleanup

flake.nix

@@ -33,6 +33,18 @@
                 (self: super: {
                   planify = pkgsU.planify;
                   gdtoolkit = pkgsU.gdtoolkit;
+                  lutris = super.lutris.override {
+                    extraPkgs = pkgs: [
+                      pkgs.winetricks
+                      pkgs.wine64Packages.stable
+                      pkgs.wineWowPackages.stable
+                    ];
+                  };
+                  nerdfonts = super.nerdfonts.override {
+                    fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ];
+                  };
+                  handbrake = super.handbrake.override { useGtk = true; };
+                  discord = super.discord.override { withOpenASAR = true; };
                 })
               ];
             })

modules/apps.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   imports = [
     ./apps/art.nix
     ./apps/dictionaries.nix

modules/apps/art.nix

@@ -5,16 +5,16 @@
   };
   config = lib.mkIf config.my.apps.art.enable {
     users.users.jawz.packages = with pkgs;
-      ([
+      [
         gimp # the coolest bestest art program to never exist
         krita # art to your heart desire!
         mypaint # not the best art program
         mypaint-brushes # but it's got some
         mypaint-brushes1 # nice damn brushes
-        # drawpile # arty party with friends!!
         pureref # create inspiration/reference boards
         blender # cgi animation and sculpting
-      ]) ++ (if config.my.dev.gameDev.enable then [
+        # drawpile # arty party with friends!!
+      ] ++ (if config.my.dev.gameDev.enable then [
         godot_4 # game development
         gdtoolkit # gdscript language server
       ] else

modules/apps/dictionaries.nix

@@ -1,14 +1,11 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.apps.dictionaries.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.dictionaries.enable {
-    users.users.jawz.packages = with pkgs; ([
+    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,13 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.apps.fonts.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.fonts.enable {
-    users.users.jawz.packages = with pkgs; ([
+    users.users.jawz.packages = with pkgs; [ nerdfonts symbola ];
-      (nerdfonts.override {
-        fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ];
-      })
-      symbola
-    ]);
   };
 }

modules/apps/gaming.nix

@@ -1,25 +1,22 @@
 { config, lib, pkgs, ... }: {
   options.my.apps.gaming.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.gaming.enable {
-    programs.steam = {
+    programs = {
-      enable = true;
+      gamemode.enable = true;
-      remotePlay.openFirewall = true;
+      steam = {
-      dedicatedServer.openFirewall = true;
+        enable = true;
+        remotePlay.openFirewall = true;
+        dedicatedServer.openFirewall = true;
+      };
     };
-    users.users.jawz.packages = with pkgs; ([
+    users.users.jawz.packages = with pkgs; [
-      (lutris.override {
+      lutris # games launcher & emulator hub
-        extraPkgs = pkgs: [
-          winetricks
-          wine64Packages.stable
-          wineWowPackages.stable
-        ];
-      })
       cartridges # games launcher
-      heroic # install epic games
       gamemode # optimizes linux to have better gaming performance
+      heroic # install epic games
+      protonup-qt # update proton-ge
       # grapejuice # roblox manager
       # minecraft # minecraft official launcher
-      protonup-qt # update proton-ge
       # ns-usbloader # load games into my switch
 
       # emulators
@@ -29,6 +26,6 @@
       dolphin-emu # wii emulator
       citra-nightly # 3Ds emulator
       snes9x-gtk # snes emulator
-    ]);
+    ];
   };
 }

modules/apps/internet.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.apps.internet.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.internet.enable {
     programs = {
@@ -10,8 +8,8 @@
         languagePacks = [ "en-CA" "es-MX" "it" ];
       };
     };
-    services = { psd.enable = true; };
+    services.psd.enable = true;
-    users.users.jawz.packages = with pkgs; ([
+    users.users.jawz.packages = with pkgs; [
       nextcloud-client # self-hosted google-drive alternative
       fragments # beautiful torrent client
       protonmail-bridge # bridge for protonmail
@@ -19,12 +17,9 @@
       chromium # web browser with spyware included
       telegram-desktop # furry chat
       nicotine-plus # remember Ares?
-      vesktop
+      vesktop # screen share with audio discord
-      (pkgs.discord.override {
+      discord # :3
-        withOpenASAR = true;
-        # withVencord = true;
-      })
       # hugo # website engine
-    ]);
+    ];
   };
 }

modules/apps/multimedia.nix

@@ -1,22 +1,18 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.apps.multimedia.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.multimedia.enable {
-    users.users.jawz.packages = with pkgs; ([
+    users.users.jawz.packages = with pkgs; [
-      # cozy # audiobooks player
-      # gnome-podcasts # podcast player
-      # hakuneko # manga & comic GUI downloader
       celluloid # video player
       curtail # image compressor
       easyeffects # equalizer
-      # (handbrake.override {
+      handbrake # video converter, may be unnecessary
-      #   useGtk = true;
-      # }) # video converter, may be unnecessary
       identity # compare images or videos
       mousai # poor man shazam
       shortwave # listen to world radio
       tagger # tag music files
-    ]);
+      # cozy # audiobooks player
+      # gnome-podcasts # podcast player
+      # hakuneko # manga & comic GUI downloader
+    ];
   };
 }

modules/apps/office.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }: {
   options.my.apps.office.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.office.enable {
-    users.users.jawz.packages = with pkgs; ([
+    users.users.jawz.packages = with pkgs; [
       libreoffice # office, but based
       calibre # ugly af eBook library manager
       newsflash # feed reader, syncs with nextcloud
@@ -10,6 +10,6 @@
       # foliate # gtk eBook reader
       # wike # gtk wikipedia wow!
       # denaro # manage your finances
-    ]);
+    ];
   };
 }

modules/default.nix

@@ -1,40 +0,0 @@
-{ pkgs, config, lib, inputs, outputs, myLib, ... }:
-let
-  cfg = config.myNixOS;
-
-  features = myLib.extendModules (name: {
-    extraOptions = {
-      myNixOS.${name}.enable =
-        lib.mkEnableOption "enable my ${name} configuration";
-    };
-    configExtension = config: (lib.mkIf cfg.${name}.enable config);
-  }) (myLib.filesIn ./features);
-
-  bundles = myLib.extendModules (name: {
-    extraOptions = {
-      myNixOS.bundles.${name}.enable =
-        lib.mkEnableOption "enable ${name} module bundle";
-    };
-    configExtension = config: (lib.mkIf cfg.bundles.${name}.enable config);
-  }) (myLib.filesIn ./bundles);
-
-  services = myLib.extendModules (name: {
-    extraOptions = {
-      myNixOS.services.${name}.enable =
-        lib.mkEnableOption "enable ${name} service";
-    };
-    configExtension = config: (lib.mkIf cfg.services.${name}.enable config);
-  }) (myLib.filesIn ./services);
-
-in {
-  imports = [ inputs.home-manager.nixosModules.home-manager ] ++ features
-    ++ bundles ++ services;
-  options.myNixOS = { sharedSettings = { }; };
-  config = {
-    nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    nixpkgs = {
-      hostPlatform = lib.mkDefault "x86_64-linux";
-      config.allowUnfree = true;
-    };
-  };
-}

modules/dev/haskell.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.dev.haskell.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.haskell.enable {
     users.users.jawz.packages = with pkgs; ([

modules/dev/nix.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.dev.nix.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.nix.enable {
     users.users.jawz.packages = with pkgs; ([

modules/dev/python.nix

@@ -1,15 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   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:
         with ps; [
-          # nose # testing and running python scripts
-          # poetry # dependency management made easy
-          # pytest # framework for writing tests
           black # Python code formatter
           editorconfig # follow rules of contributin
           flake8 # wraper for pyflakes, pycodestyle and mccabe
@@ -17,6 +12,9 @@
           pyflakes # checks source code for errors
           pylint # bug and style checker for python
           speedtest-cli # check internet speed from the comand line
+          # nose # testing and running python scripts
+          # poetry # dependency management made easy
+          # pytest # framework for writing tests
         ]))
     ]);
   };

modules/services.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   imports = [
     ./services/network.nix
     ./services/nvidia.nix

modules/services/network.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.services.network.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.services.network.enable {
     networking = {
@@ -12,7 +10,7 @@
         192.168.1.69 server
         192.168.1.100 miniserver
       '';
-      firewall = { enable = true; };
+      firewall.enable = true;
     };
   };
 }

modules/services/nvidia.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.services.nvidia.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.services.nvidia.enable {
     services.xserver.videoDrivers = [ "nvidia" ];

modules/services/sound.nix

@@ -1,9 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-# let
-#   nixGaming = import (builtins.fetchTarball
-#     "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");
-# in
-{
   imports = [
     # nixGaming.nixosModules.pipewireLowLatency
   ];

modules/shell.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   imports = [ ./shell/exercism.nix ./dev/python.nix ./dev/haskell.nix ];
   my = {
     shell = { exercism.enable = lib.mkDefault false; };

modules/shell/exercism.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: {
-
-{
   options.my.shell.exercism.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.shell.exercism.enable {
     users.users.jawz.packages = with pkgs; ([

modules/template.nix

@@ -1,5 +1 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }: { users.users.jawz.packages = with pkgs; ([ ]); }
-
-{
-  users.users.jawz.packages = with pkgs; ([ ]);
-}