Squash merge dev into master

hosts/configuration.nix

@@ -5,7 +5,7 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ./local-packages.nix
+    ./system-packages.nix
     ../modules/default.nix
   ];
 

hosts/local-packages.nix

@@ -1,153 +0,0 @@
-# TODO: cleanout and repopulate individual packages better
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    brave # TODO: make a module to save browser stuff
-    vesktop
-    discord
-    obs-studio
-    spotify
-    flameshot
-    mpv
-    linuxHeaders
-    appimage-run
-    freetype.dev
-    zed-editor
-    pixman
-    udiskie
-    maim
-    git
-    git-lfs
-    gitAndTools.gh
-    gitAndTools.diff-so-fancy
-    lazygit
-    lazydocker
-    mercurial
-    nodejs
-    nodePackages.pnpm
-    nodePackages.typescript
-    yarn
-    bun
-    deno
-    obsidian
-    go
-    go-tools
-    gopls
-    rustc
-    rustup
-    cargo-edit
-    cargo-watch
-    cargo-outdated
-    cargo-audit
-    rust-analyzer
-    python3Packages.debugpy
-    gcc
-    stdenv.cc.cc.lib
-    gnumake
-    cmake
-    ninja
-    binutils
-    gdb
-    pkg-config
-    autoconf
-    automake
-    libtool
-    nasm
-    elixir
-    swift
-    zig
-    dbus.dev
-    pkg-config
-    ghc
-    cacert
-    cabal-install
-    stack
-    haskell-language-server
-    jdk17
-    maven
-    gradle
-    visualvm
-    jdt-language-server
-    clang-tools
-    vscode-langservers-extracted
-    nodePackages.eslint
-    lua-language-server
-    marksman
-    nil
-    ruff
-    taplo
-    yaml-language-server
-    alejandra
-    nodePackages.prettier
-    stylua
-    shfmt
-    nodePackages.sql-formatter
-    yamlfmt
-    luaPackages.luacheck
-    nodePackages.markdownlint-cli
-    nodePackages.stylelint
-    nodePackages.htmlhint
-    yamllint
-    nodePackages.jsonlint
-    hadolint
-    shellcheck
-    cppcheck
-    rubocop
-    phpPackages.php-codesniffer
-    phpPackages.phpstan
-    checkstyle
-    tflint
-    sqlfluff
-    wget
-    curl
-    tree
-    mesa
-    libglvnd
-    socat
-    gnused
-    gawk
-    nmap
-    psmisc
-    ugrep
-    unzip
-    starship
-    htop
-    btop
-    nvtopPackages.full
-    fd
-    fzf
-    jq
-    bash
-    xorg.xdpyinfo
-    slop
-    dunst
-    pulseaudio
-    yt-dlp # might remove for source built version
-    httpie
-    wrk
-    cloudflared
-    hashcat
-    nix-prefetch-git
-    openssl
-    openssl.dev
-    libxml2
-    zlib
-    zlib.dev
-    postgresql
-    sqlite
-    redis
-    sqls
-    tree-sitter
-    luajitPackages.jsregexp
-    tailscale
-    cachix
-    portaudio
-    xorg.libX11
-    xorg.libXtst
-    xorg.libXi
-    xorg.xorgproto
-    texlive.combined.scheme-full
-    imagemagick
-    poppler_utils
-    ghostscript
-  ];
-}

hosts/system-packages.nix

@@ -0,0 +1,80 @@
+# TODO: cleanout and repopulate individual packages better
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    obs-studio
+    spotify
+    flameshot
+    mpv
+    linuxHeaders
+    appimage-run
+    freetype.dev
+    zed-editor
+    pixman
+    udiskie
+    maim
+    mercurial
+    obsidian
+    go
+    go-tools
+    gopls
+    gcc
+    gnumake
+    cmake
+    ninja
+    binutils
+    gdb
+    pkg-config
+    autoconf
+    automake
+    libtool
+    nasm
+    elixir
+    swift
+    zig
+    dbus.dev
+    pkg-config
+    ghc
+    cacert
+    cabal-install
+    stack
+    jdk17
+    maven
+    gradle
+    visualvm
+    wget
+    curl
+    tree
+    mesa
+    libglvnd
+    socat
+    gawk
+    nmap
+    psmisc
+    unzip
+    fd
+    jq
+    bash
+    slop
+    yt-dlp # might remove for source built version
+    httpie
+    wrk
+    cloudflared
+    hashcat
+    nix-prefetch-git
+    openssl
+    openssl.dev
+    libxml2
+    zlib
+    zlib.dev
+    postgresql
+    sqlite
+    redis
+    sqls
+    luajitPackages.jsregexp
+    cachix
+    texlive.combined.scheme-full
+    imagemagick
+    poppler_utils
+    ghostscript
+  ];
+}