From d32ba1b498592088f85592e8de5b0c45e6441e38 Mon Sep 17 00:00:00 2001
From: Martin Larsson <larssonmartin1998@gmail.com>
Date: Sun, 11 May 2025 15:17:18 +0200
Subject: [PATCH] Rename pkgs dir to home dir, add x86 and aarch specific linux
 home modules

---
 nix/home.nix                           | 62 --------------------------
 nix/{pkgs => home}/darwin.nix          |  0
 nix/{pkgs => home}/darwin_personal.nix |  0
 nix/{pkgs => home}/darwin_work.nix     |  0
 nix/{pkgs => home}/home.nix            |  1 +
 nix/{pkgs => home}/linux.nix           |  0
 nix/home/linux_aarch.nix               | 13 ++++++
 nix/home/linux_x86.nix                 | 12 +++++
 nix/{local_home.nix => home/local.nix} |  0
 nix/{pkgs => home}/wsl.nix             |  0
 nix/local_system.nix                   | 10 -----
 11 files changed, 26 insertions(+), 72 deletions(-)
 delete mode 100644 nix/home.nix
 rename nix/{pkgs => home}/darwin.nix (100%)
 rename nix/{pkgs => home}/darwin_personal.nix (100%)
 rename nix/{pkgs => home}/darwin_work.nix (100%)
 rename nix/{pkgs => home}/home.nix (99%)
 rename nix/{pkgs => home}/linux.nix (100%)
 create mode 100644 nix/home/linux_aarch.nix
 create mode 100644 nix/home/linux_x86.nix
 rename nix/{local_home.nix => home/local.nix} (100%)
 rename nix/{pkgs => home}/wsl.nix (100%)
 delete mode 100644 nix/local_system.nix

diff --git a/nix/home.nix b/nix/home.nix
deleted file mode 100644
index 31adef5..0000000
--- a/nix/home.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ pkgs, neovim-flake, ... }:
-{
-  programs = {
-    zsh = {
-      enable = true;
-    };
-  };
-
-  home = {
-    stateVersion = "24.05";
-    packages = with pkgs; [
-      neovim-flake.packages.${system}.neovim
-      fzf
-      bat
-      git
-      yazi
-      tmux
-      eza
-      curl
-      wget
-      ripgrep
-      fd
-      jq
-      starship
-      fastfetch
-      nixfmt-rfc-style
-      luajit
-      zoxide
-      rustup
-      zig
-      zls
-      nil
-      lldb
-      gopls
-      delve
-      golangci-lint
-      cmake
-      cmake-language-server
-      cmake-format
-      cmake-lint
-      python313Packages.debugpy
-      pyright
-      lua-language-server
-      gnumake
-      ninja
-      nodejs
-      bitwarden-cli
-    ];
-    file = {
-      ".zshrc".source = ../zsh/.zshrc;
-      ".config/nvim".source = ../nvim;
-      ".config/yazi".source = ../yazi;
-      ".config/starship.toml".source = ../starship/starship.toml;
-      ".tmux.conf".source = ../tmux/.tmux.conf;
-      ".config/tmux".source = ../tmux;
-      ".config/bat".source = ../bat;
-      ".config/ghostty".source = ../ghostty;
-      ".config/confutils".source = ../confutils;
-      ".config/wallpapers".source = ../wallpapers;
-    };
-  };
-}
diff --git a/nix/pkgs/darwin.nix b/nix/home/darwin.nix
similarity index 100%
rename from nix/pkgs/darwin.nix
rename to nix/home/darwin.nix
diff --git a/nix/pkgs/darwin_personal.nix b/nix/home/darwin_personal.nix
similarity index 100%
rename from nix/pkgs/darwin_personal.nix
rename to nix/home/darwin_personal.nix
diff --git a/nix/pkgs/darwin_work.nix b/nix/home/darwin_work.nix
similarity index 100%
rename from nix/pkgs/darwin_work.nix
rename to nix/home/darwin_work.nix
diff --git a/nix/pkgs/home.nix b/nix/home/home.nix
similarity index 99%
rename from nix/pkgs/home.nix
rename to nix/home/home.nix
index 0a94fa5..fed4ae1 100644
--- a/nix/pkgs/home.nix
+++ b/nix/home/home.nix
@@ -120,6 +120,7 @@ in
       bc
       cmatrix
       svelte-language-server
+      bitwarden-cli
     ];
 
     file = symlinkFiles;
diff --git a/nix/pkgs/linux.nix b/nix/home/linux.nix
similarity index 100%
rename from nix/pkgs/linux.nix
rename to nix/home/linux.nix
diff --git a/nix/home/linux_aarch.nix b/nix/home/linux_aarch.nix
new file mode 100644
index 0000000..b3c666f
--- /dev/null
+++ b/nix/home/linux_aarch.nix
@@ -0,0 +1,13 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home = {
+    packages = with pkgs; [
+      legcord
+      librespot
+      spotify-qt
+    ];
+  };
+}
diff --git a/nix/home/linux_x86.nix b/nix/home/linux_x86.nix
new file mode 100644
index 0000000..d8fc703
--- /dev/null
+++ b/nix/home/linux_x86.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home = {
+    packages = with pkgs; [
+      discord
+      spotify
+    ];
+  };
+}
diff --git a/nix/local_home.nix b/nix/home/local.nix
similarity index 100%
rename from nix/local_home.nix
rename to nix/home/local.nix
diff --git a/nix/pkgs/wsl.nix b/nix/home/wsl.nix
similarity index 100%
rename from nix/pkgs/wsl.nix
rename to nix/home/wsl.nix
diff --git a/nix/local_system.nix b/nix/local_system.nix
deleted file mode 100644
index e916e9c..0000000
--- a/nix/local_system.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  ...
-}:
-{
-  system = {
-    stateVersion = 5;
-  };
-  
-  nix-homebrew.user = "martin.larsson";
-}