Preparing for refactoring NixOS

5 files changed, 151 insertions, 18 deletions

diff --git a/modules/common.nix b/modules/common.nix
index 0e5fdda..b9fed82 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -1,10 +1,8 @@
-#--------------------------------------#
-#                                      #
-#  Common Config/Packages for system   #
-#                                      #
-#--------------------------------------#
+{ pkgs, ... }: {
 
-{pkgs, ...}: {
+  imports = [
+    ./packages.nix
+  ];
 
   # User
   users.users.kyren = {
@@ -16,17 +14,6 @@
 
   programs.zsh.enable = true;
 
-  # List packages installed in system profile
-  # Use for apps that need sudo (or have issues thru home-manager)
-  environment.systemPackages = with pkgs; [
-    glib-networking
-    openssl
-    clang
-    clang-tools
-    ghostty
-    glibcLocales
-  ];
-
   # Localization
   time.timeZone = "Asia/Hebron";
   i18n.defaultLocale = "en_US.UTF-8";
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 5956666..e667050 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -1,7 +1,11 @@
-{ ... }: {
+{ pkgs, ... }: {
 
   imports = [
     ./nvidia.nix
   ];
 
+  environment.systemPackages = with pkgs; [
+    openrgb-with-all-plugins
+  ];
+
 }
diff --git a/modules/kde.nix b/modules/kde.nix
index 7b3ea95..52667f7 100644
--- a/modules/kde.nix
+++ b/modules/kde.nix
@@ -13,4 +13,5 @@
     layout = "us";
     variant = "";
   };
+
 }
diff --git a/modules/networking.nix b/modules/networking.nix
index 955e0b1..27246dd 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -8,4 +8,5 @@
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   #networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
 }
diff --git a/modules/packages.nix b/modules/packages.nix
new file mode 100644
index 0000000..2b5b261
--- /dev/null
+++ b/modules/packages.nix
@@ -0,0 +1,140 @@
+{ pkgs, ... }: {
+
+  environment.systemPackages = with pkgs; [
+    glib-networking
+    openssl
+    clang
+    clang-tools
+    ghostty
+    glibcLocales
+
+    nerd-fonts.jetbrains-mono
+    keepassxc
+    git
+    gh
+    delta
+    stow
+    eza
+    oh-my-posh
+    gcc
+    gnumake
+    neovim
+    fzf
+    zoxide
+    tmux
+    bc
+    keychain
+    bat
+    sqlite
+    fd
+    ripgrep
+    wakatime-cli
+    fastfetch
+    btop
+    protonvpn-gui
+    unzip
+    go
+    pnpm
+    nodejs_24
+    (python312.withPackages (pypkgs: [
+      pypkgs.matplotlib
+      pypkgs.pandas
+      pypkgs.pygithub
+    ]))
+    watchexec
+    golangci-lint
+    libnotify
+    wl-clipboard
+    whatsie
+    libratbag # Mouse software (GHUB replacement)
+    piper
+    goose
+    sqlc
+    jetbrains.idea-community
+    jdk
+    maven
+    gradle
+    kdePackages.filelight
+    kotlin
+    (minecraft.overrideAttrs (finalAttrs: previousAttrs: {
+      meta.lib.broken = false;
+    }))
+    rustup
+    tokei
+    kdePackages.kmines # Minesweeper for fun lol
+    kdePackages.kpat # Solitaire
+    # btw missing the card/brick thing with weird symbols, not sure what that game was called
+    gimp
+    kdePackages.korganizer
+    kdePackages.kaddressbook
+    gitleaks
+    rar
+    gomodifytags
+    sops
+    dig
+    syncthingtray
+    libreoffice
+    vesktop
+    nasm
+    albert
+    gdb
+    minisign
+    libisoburn
+    ncdu
+    imagemagick
+    ghostscript # for imagemagick to support pdf files
+    xxd
+    gnome-clocks
+    duf
+    tldr
+    bottom
+    hyperfine
+    nh
+    wget
+    mold
+    aseprite
+    prismlauncher
+    cloudflare-warp
+    drawio
+    tree-sitter
+    tectonic
+    mermaid-cli
+    ffmpeg
+    haruna
+    gparted
+    r2modman
+    openrgb-with-all-plugins
+
+    # LSP
+    asm-lsp
+    astro-language-server
+    basedpyright
+    bash-language-server
+    vscode-langservers-extracted # html/css/json
+    gopls
+    lemminx
+    lua-language-server
+    markdown-oxide
+    marksman
+    mdx-language-server
+    neocmakelsp
+    nil
+    tailwindcss-language-server
+    taplo
+    typescript-language-server
+    yaml-language-server
+    # pnpm i -g css-variables-language-server
+    # pnpm install -g gh-actions-language-server
+
+    # Tools
+    stylua
+    gofumpt
+    golangci-lint
+    prettierd
+    jq
+    lldb # codelldb debugger
+    shellcheck
+    beautysh # shell formatter
+  ];
+
+}