Preparing for refactoring NixOS

2025-05-16 15:16:46 +03:00
parent 3bdb802fd2
commit 4423b2f08f
6 changed files with 152 additions and 152 deletions
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -1,143 +1,10 @@
-{ pkgs, inputs, ... }: {
+{ pkgs, ... }: {

  home.username = "kyren";
  home.homeDirectory = "/home/kyren";

  home.stateVersion = "24.05"; # DO NOT CHANGE

-  home.packages = with pkgs; [
-    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
-  ];
-
-  # For nixd LSP to recognize what nixpkgs version I use
-  nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-
  # Home Manager is pretty good at managing dotfiles. The primary way to manage
  # plain files is through 'home.file'.
  home.file = {
--- 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";
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -1,7 +1,11 @@
-{ ... }: {
+{ pkgs, ... }: {

  imports = [
    ./nvidia.nix
  ];

+  environment.systemPackages = with pkgs; [
+    openrgb-with-all-plugins
+  ];
+
 }
--- a/modules/kde.nix
+++ b/modules/kde.nix
@@ -13,4 +13,5 @@
    layout = "us";
    variant = "";
  };
+
 }
--- 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.
+
 }
--- a/modules/packages.nix
+++ 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
+  ];
+
+}