Separate packages into their own file.

attilaolah · Mar 3, 2024 · 93d9544 · 93d9544
1 parent 8ab35c5
commit 93d9544
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 79 deletions.
diff --git a/users/ao/home.nix b/users/ao/home.nix
@@ -3,95 +3,35 @@
 {
   imports = [
     ./file.nix
+    ./home/packages.nix
     ./programs/fish.nix
     ./programs/git.nix
     ./programs/gpg.nix
   ];
 
-  home.username = "ao";
-  home.homeDirectory = "/home/ao";
-  # TODO: Renovate!
-  home.stateVersion = "23.11";
-
-  home.packages = with pkgs; [
-    # Shell & tools:
-    tmux
-    tree
-    zoxide
-    silver-searcher
-    fzf
-
-    # Editors:
-    neovim
-
-    # Hyprland deps:
-    foot
-    waybar
-    wofi
-
-    # Utilities:
-    curl
-    wget
-    rsync
-    gnupg
-    pinentry
-    mktemp
-    dig
-    screenfetch
-    age
-    any-nix-shell
-    direnv
-    ripgrep
-    fd
-
-    # Development environment:
-    # TODO: Renovate!
-    bazel_7
-    buildifier
-    buildozer
-    clang
-    clang-tools
-    clangStdenv
-    pkg-config
-    gnumake
-    cmake
-    rustup
-    go
-    nodejs
-    nodePackages.pnpm
+  home = {
+    username = "ao";
+    homeDirectory = "/home/ao";
     # TODO: Renovate!
-    python311Full
-    python311Packages.ipython
-    ruby
-    elan
-    android-tools
-    virtualenv
+    stateVersion = "23.11";
+
+    sessionVariables = {
+      # Shell:
+      #LANG = "en_US.UTF-8";
+      #LANGUAGE = "en_US:en";
+      SHELL = "${pkgs.fish}/bin/fish";
+      # Editor:
+      #EDITOR = "nvim";
+      VISUAL = "nvim";
+      # Development environment:
+      GOPATH = "${config.home.homeDirectory}/dev/go";
+      RUSTUP_HOME = "${config.home.homeDirectory}/dev/rustup";
+    };
+  };
 
-    # GUI apps:
-    google-chrome
-    firefox
-    gimp
-  ];
 
   nixpkgs.config.allowUnfree = true;
 
-  home.sessionPath = [
-    "${config.home.homeDirectory}/local/bin"
-  ];
-
-  home.sessionVariables = {
-    # Shell:
-    LANG = "en_US.UTF-8";
-    LANGUAGE = "en_US:en";
-    SHELL = "${pkgs.fish}/bin/fish";
-    # Editor:
-    EDITOR = "nvim";
-    VISUAL = "nvim";
-    # Development environment:
-    GOPATH = "${config.home.homeDirectory}/dev/go";
-    RUSTUP_HOME = "${config.home.homeDirectory}/dev/rustup";
-  };
-
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;

diff --git a/users/ao/home/packages.nix b/users/ao/home/packages.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    # CLI utilities:
+    age
+    any-nix-shell
+    curl
+    dig
+    direnv
+    fd
+    fzf
+    gnupg
+    mktemp
+    neovim
+    pinentry
+    ripgrep
+    rsync
+    screenfetch
+    silver-searcher
+    tmux
+    tree
+    wget
+    zoxide
+
+    # Hyprland deps:
+    foot
+    waybar
+    wofi
+
+    # Browsers:
+    firefox
+    google-chrome
+
+    # Other GUI apps:
+    gimp
+    inkscape
+    rawtherapee
+
+    # Common dev tools.
+    # More specific ones should go into per-project flakes.
+    android-tools
+    # TODO: Renovate!
+    bazel_7
+    buildifier
+    buildozer
+    clang
+    clang-tools
+    clangStdenv
+    cmake
+    elan
+    gnumake
+    go
+    nodePackages.pnpm
+    nodejs
+    pkg-config
+    # TODO: Renovate!
+    (python311.withPackages (ps: with ps; [ ipython ]))
+    ruby
+    rustup
+    virtualenv
+  ];
+}