push

core/audio.nix

@@ -1,6 +1,6 @@
-{ config, ... }:
+{ ... }:
 
-{  
+{
     hardware.pulseaudio.enable = false;
 
     services.pipewire = {
@@ -13,4 +13,4 @@
 
         jack.enable = true;
     };
-}
+}

core/boot.nix

@@ -1,10 +1,8 @@
+{ ... }:
 
-
+{
-{ config, ... }:
-
-{  
     boot.loader = {
         systemd-boot.enable = true;
         efi.canTouchEfiVariables = true;
     };
-}
+}

core/core.nix

@@ -1,5 +1,4 @@
-
+{ ... }:
-{ config, ... }:
 
 {
     imports = [
@@ -12,4 +11,4 @@
         ./boot.nix
         ./security.nix
     ];
-}
+}

core/graphics.nix

@@ -1,6 +1,6 @@
 { config, ... }:
 
-{  
+{
     services.xserver.videoDrivers = ["nvidia"];
 
     hardware = {
@@ -17,4 +17,4 @@
             package = config.boot.kernelPackages.nvidiaPackages.beta;
         };
     };
-}
+}

core/locale.nix

@@ -1,6 +1,6 @@
-{ config, ... }:
+{ ... }:
 
-{  
+{
     time.timeZone = "America/Chicago";
 
     i18n = {
@@ -17,4 +17,4 @@
             LC_TIME = "en_US.UTF-8";
         };
     };
-}
+}

core/network.nix

@@ -1,10 +1,8 @@
+{ ... }:
 
-
+{
-{ config, ... }:
-
-{  
     networking = {
-        hostName = "nix"; 
+        hostName = "nix";
         networkmanager.enable = true;
     };
-}
+}

core/nix.nix

@@ -1,7 +1,6 @@
+{ ... }:
 
-{ config, ... }:
+{
-
-{  
     system.stateVersion = "24.11";
     nix.settings.experimental-features = [ "nix-command" "flakes" ];
-}
+}

core/security.nix

@@ -1,6 +1,6 @@
-{ config, ... }:
+{ ... }:
 
-{  
+{
     security = {
         rtkit.enable = true;
 
@@ -9,4 +9,4 @@
             wheelNeedsPassword = false;
         };
     };
-}
+}

core/user.nix

@@ -1,9 +1,9 @@
-{ config, ... }:
+{ ... }:
 
-{  
+{
     users.users.bug = {
         isNormalUser = true;
         description = "Bug";
         extraGroups = [ "networkmanager" "wheel" ];
     };
-}
+}

gnome.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
     environment.systemPackages = with pkgs.gnomeExtensions; [
@@ -33,4 +33,4 @@
         services."getty@tty1".enable = false;
         services."autovt@tty1".enable = false;
     };
-}
+}

main.nix

@@ -1,5 +1,4 @@
-
+{ ... }:
-{ config, lib, pkgs, ... }:
 
 {
     imports = [
@@ -8,4 +7,4 @@
         ./gnome.nix
         ./theming.nix
     ];
-}
+}

packages/flatpak.nix

@@ -1,5 +1,4 @@
-
+{ ... }:
-{ config, lib, pkgs, ... }:
 
 {
     services.flatpak.packages = [
@@ -16,4 +15,4 @@
         "org.pipewire.Helvum"
         "io.github.giantpinkrobots.flatsweep"
     ];
-}
+}

packages/packages.nix

@@ -1,5 +1,4 @@
-
+{ lib, ... }:
-{ config, lib, pkgs, ... }:
 
 {
     imports = [
@@ -9,7 +8,7 @@
     ];
 
     nixpkgs.config.allowUnfree = true;
-    
+
     services.flatpak = {
         enable = true;
 
@@ -32,16 +31,16 @@
             pico = "ssh pico.sh";
 
             # tuns name port
-            tuns = "bash -c '\''if [ \"$#\" -ne 2 ]; then echo \"Usage: tun name port\"; exit 1; fi; 
+            tuns = "bash -c '\''if [ \"$#\" -ne 2 ]; then echo \"Usage: tun name port\"; exit 1; fi;
-if [[ \"$1\" =~ ^[0-9]+$ ]]; then port=\"$1\"; name=\"$2\"; 
+if [[ \"$1\" =~ ^[0-9]+$ ]]; then port=\"$1\"; name=\"$2\";
-elif [[ \"$2\" =~ ^[0-9]+$ ]]; then port=\"$2\"; name=\"$1\"; 
+elif [[ \"$2\" =~ ^[0-9]+$ ]]; then port=\"$2\"; name=\"$1\";
-else echo \"Error: One argument must be a number (port)\"; exit 1; fi; 
+else echo \"Error: One argument must be a number (port)\"; exit 1; fi;
 ssh -R \"$\{name}:80:localhost:$\{port}\" tuns.sh'\'' _";
 
             # pgs name directory
             pgs = "bash -c '\''if [ \"$#\" -ne 2 ]; then echo \"Usage: pgs NAME DIRECTORY\"; exit 1; fi; rsync -rv \"$2\" pgs.sh:/\"$1\"'\'' _";
         };
-        
+
         dconf.enable = lib.mkDefault true;
 
         firefox.enable = true;
@@ -69,4 +68,4 @@ ssh -R \"$\{name}:80:localhost:$\{port}\" tuns.sh'\'' _";
             dataDir = "/home/bug/";
         };
     };
-}
+}

packages/system.nix

@@ -1,16 +1,26 @@
-
+{ pkgs, ... }:
-{ config, lib, pkgs, ... }:
 
 {
     environment.systemPackages = with pkgs; [
         home-manager
+
         git
         wget
+
+        # compiling
         gcc
+        gnumake
+
+        # network
         nmap
         inetutils
         sshs
-        gnumake
+
+        # input testing
         evtest
+
+        # nix language server
+        nixd
+        nil
     ];
-}
+}

packages/user.nix

@@ -1,17 +1,12 @@
-
+{ pkgs, ... }:
-{ config, lib, pkgs, ... }:
 
 {
     users.users.bug.packages = with pkgs; [
+        # ide
         vscode
+        zed-editor
 
-        go
+        # languages
-
-        (python3.withPackages (ps: with ps; [
-            pip
-            pynput
-            python-uinput
-        ]))
 
         luau
 
@@ -22,36 +17,44 @@
             jsregexp
         ]))
 
+        go
+
+        (python3.withPackages (ps: with ps; [
+            pip
+            pynput
+            python-uinput
+        ]))
+
         nodejs
 
+        # 3D
         blender
         plasticity
 
+        # video
         kdenlive
 
+        # markdown / notes
+        obsidian
+
+        # social
+        vesktop
+
+        # music
+        nicotine-plus
+        furnace
+        pulseaudio
+
+        # utilties
+        mapscii
+        cloudflared
+        base16-schemes
+        ptyxis
+        ## rpi-imager
         neofetch
         fastfetch
-
         tree
         gnome-tweaks
         wine
-
-        obsidian
-
-        vesktop
-        nicotine-plus
-        furnace
-
-        pulseaudio
-
-        # rpi-imager
-
-        mapscii
-
-        cloudflared
-
-        base16-schemes
-
-        ptyxis
     ];
-}
+}

theming.nix

@@ -1,15 +1,14 @@
+{ pkgs, ... }:
 
-{ config, pkgs, ... }:
+{
-
-{  
     fonts = {
         fontDir.enable = true;
         enableDefaultPackages = true;
 
-        packages = with pkgs; [ 
+        packages = with pkgs; [
             twitter-color-emoji
         ];
-        
+
         fontconfig = {
             enable = true;
             useEmbeddedBitmaps = true;
@@ -19,4 +18,4 @@
             };
         };
     };
-}
+}