From f39bee1c28dec9b78c57911de3965bd378a39e34 Mon Sep 17 00:00:00 2001
From: sadan <117494111+sadan4@users.noreply.github.com>
Date: Fri, 31 Jan 2025 16:41:00 -0500
Subject: [PATCH] things

---
 boxes/desktop/configuration.nix               |  5 ++
 common/systemModules/stylix.nix               |  5 ++
 common/users/homeModules/audio.nix            | 47 +++++++++++++++----
 common/users/homeModules/dev/cpp.nix          |  7 ++-
 common/users/homeModules/dev/default.nix      | 22 +++++----
 common/users/homeModules/dev/ide/default.nix  | 31 +++++++-----
 common/users/homeModules/dev/ide/jb/clion.nix |  7 +++
 .../users/homeModules/dev/ide/jb/default.nix  |  1 +
 common/users/homeModules/dev/javascript.nix   |  3 +-
 common/users/homeModules/prisma.nix           |  5 +-
 common/users/homeModules/unstable.nix         |  8 ++++
 common/users/homeModules/zsh.nix              |  3 ++
 flake.lock                                    | 40 +++++++++++++++-
 flake.nix                                     |  8 +++-
 14 files changed, 156 insertions(+), 36 deletions(-)
 create mode 100644 common/users/homeModules/dev/ide/jb/clion.nix
 create mode 100644 common/users/homeModules/unstable.nix

diff --git a/boxes/desktop/configuration.nix b/boxes/desktop/configuration.nix
index cd19725..e32490d 100644
--- a/boxes/desktop/configuration.nix
+++ b/boxes/desktop/configuration.nix
@@ -26,6 +26,11 @@
     # USERS
     ../../common/users/meyer
   ];
+  documentation = {
+    enable = true;
+    man.enable = true;
+    dev.enable = true;
+  };
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems;
   nix.package = stable.nix;
diff --git a/common/systemModules/stylix.nix b/common/systemModules/stylix.nix
index f026732..8a6101e 100644
--- a/common/systemModules/stylix.nix
+++ b/common/systemModules/stylix.nix
@@ -9,6 +9,11 @@
   stylix = {
     enable = true;
     image = ./wallpaper.jpg;
+    targets = {
+        spicetify = {
+            enable = false;
+        };
+    };
     base16Scheme = {
       base00 = "#1A1B26";
       base01 = "#16161E";
diff --git a/common/users/homeModules/audio.nix b/common/users/homeModules/audio.nix
index c2b8e16..8423e46 100644
--- a/common/users/homeModules/audio.nix
+++ b/common/users/homeModules/audio.nix
@@ -1,10 +1,34 @@
-{pkgs, ...}: {
-    home = {
-        packages = with pkgs; [
-            spotify
-            pulseaudioFull
-            pavucontrol
-        ];
+{ pkgs, inputs, ... }:
+{
+  imports = [
+    inputs.spicetify-nix.homeManagerModules.default
+  ];
+  home = {
+    packages = with pkgs; [
+      # spotify
+      pulseaudioFull
+      pavucontrol
+    ];
+  };
+  stylix = {
+    targets = {
+      spicetify = {
+        enable = false;
+      };
+    };
+  };
+  programs.spicetify =
+    let
+      spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+    in
+    {
+      enable = true;
+      enabledExtensions = with spicePkgs.extensions; [
+        adblock
+        hidePodcasts
+        shuffle # shuffle+ (special characters are sanitized out of extension names)
+      ];
+      alwaysEnableDevTools = true;
     };
   xdg = {
     desktopEntries = {
@@ -14,10 +38,15 @@
         genericName = "Music Player";
         icon = "spotify-client";
         terminal = false;
-        categories = [ "Audio" "Music" "Player" "AudioVideo" ];
+        categories = [
+          "Audio"
+          "Music"
+          "Player"
+          "AudioVideo"
+        ];
         exec = "qdbus org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.OpenUri %U";
         mimeType = [ "x-scheme-handler/spotify" ];
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/common/users/homeModules/dev/cpp.nix b/common/users/homeModules/dev/cpp.nix
index 618b17d..9983920 100644
--- a/common/users/homeModules/dev/cpp.nix
+++ b/common/users/homeModules/dev/cpp.nix
@@ -1,7 +1,12 @@
-{ pkgs, unstable, ... }:
+{ pkgs, ... }:
 {
+  imports = [
+    ../unstable.nix
+    ./ide/jb/clion.nix
+  ];
   home = {
     packages = with pkgs; [
+      xorg.libX11.man
       meson
       autoPatchelfHook
       cmake
diff --git a/common/users/homeModules/dev/default.nix b/common/users/homeModules/dev/default.nix
index 4166f45..3fae894 100644
--- a/common/users/homeModules/dev/default.nix
+++ b/common/users/homeModules/dev/default.nix
@@ -1,10 +1,14 @@
-{pkgs, ...}: {
-    home = {
-        packages = with pkgs; [
-            gnumake
-            binutils
-            linuxHeaders
-            man-pages
-        ];
-    };
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      gnumake
+      (binutils-unwrapped.override {
+        withAllTargets = true;
+      })
+      libtree
+      linuxHeaders
+      man-pages
+    ];
+  };
 }
diff --git a/common/users/homeModules/dev/ide/default.nix b/common/users/homeModules/dev/ide/default.nix
index f3f9f9b..041fe7f 100644
--- a/common/users/homeModules/dev/ide/default.nix
+++ b/common/users/homeModules/dev/ide/default.nix
@@ -1,14 +1,21 @@
-{pkgs, config, ...}:
-let 
-in {
-    imports = [
-        ../../pinned.nix
+{ pkgs, config, ... }:
+let
+in
+{
+  imports = [
+    ../../pinned.nix
+    ../../unstable.nix
+  ];
+  home = {
+    packages = with pkgs; [
+      # pinned.vscode
+      (unstable.vscode.fhsWithPackages (
+        pkgs: with pkgs; [
+          powershell
+        ]
+      ))
+      # codium
+      zed-editor
     ];
-    home = {
-        packages = with pkgs; [
-            pinned.vscode
-            # codium
-            zed-editor
-        ];
-    };
+  };
 }
diff --git a/common/users/homeModules/dev/ide/jb/clion.nix b/common/users/homeModules/dev/ide/jb/clion.nix
new file mode 100644
index 0000000..266b4dc
--- /dev/null
+++ b/common/users/homeModules/dev/ide/jb/clion.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+    home = {
+        packages = with pkgs.jetbrains; [
+            clion
+        ];
+    };
+}
diff --git a/common/users/homeModules/dev/ide/jb/default.nix b/common/users/homeModules/dev/ide/jb/default.nix
index cea3c0c..c2e6b5c 100644
--- a/common/users/homeModules/dev/ide/jb/default.nix
+++ b/common/users/homeModules/dev/ide/jb/default.nix
@@ -2,5 +2,6 @@
     imports = [
         ./idea.nix
         ./androidStudio.nix
+        ./clion.nix
     ];
 }
diff --git a/common/users/homeModules/dev/javascript.nix b/common/users/homeModules/dev/javascript.nix
index b66fa77..735dd8f 100644
--- a/common/users/homeModules/dev/javascript.nix
+++ b/common/users/homeModules/dev/javascript.nix
@@ -1,7 +1,8 @@
-{ pkgs, unstable, ... }: {
+{ pkgs, ... }: {
   imports = [
     ../prisma.nix
     ../../../../customPackages
+    ../unstable.nix
   ];
   home = {
     shellAliases = {
diff --git a/common/users/homeModules/prisma.nix b/common/users/homeModules/prisma.nix
index 1892230..ae790fd 100644
--- a/common/users/homeModules/prisma.nix
+++ b/common/users/homeModules/prisma.nix
@@ -1,4 +1,7 @@
-{pkgs, unstable, ...}: {
+{pkgs, ...}: {
+    imports = [
+        ./unstable.nix
+    ];
     home = {
         packages = with pkgs; [
             unstable.prisma
diff --git a/common/users/homeModules/unstable.nix b/common/users/homeModules/unstable.nix
new file mode 100644
index 0000000..7d2946a
--- /dev/null
+++ b/common/users/homeModules/unstable.nix
@@ -0,0 +1,8 @@
+{ unstable, ... }:
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      inherit unstable;
+    })
+  ];
+}
diff --git a/common/users/homeModules/zsh.nix b/common/users/homeModules/zsh.nix
index 8aa09ec..fed2c22 100644
--- a/common/users/homeModules/zsh.nix
+++ b/common/users/homeModules/zsh.nix
@@ -19,6 +19,9 @@ in
       zsh-powerlevel10k
       zsh-syntax-highlighting
     ];
+    sessionVariables = {
+        POWERSHELL_PATH = "${pkgs.powershell}/bin/pwsh";
+    };
     file = {
       p10k = {
         recursive = true;
diff --git a/flake.lock b/flake.lock
index e95f65e..2e22bd1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -154,6 +154,22 @@
       }
     },
     "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -616,6 +632,7 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "scripts": "scripts",
         "sops-nix": "sops-nix",
+        "spicetify-nix": "spicetify-nix",
         "stylix": "stylix"
       }
     },
@@ -655,6 +672,27 @@
         "type": "github"
       }
     },
+    "spicetify-nix": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737692134,
+        "narHash": "sha256-FCHWBhrL59cPhKZvn+2ycpdzM74kETOnZ2HX5B4q4Ko=",
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "rev": "1a60b7cf6470e411e29697fe31b1d89660fccae3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "type": "github"
+      }
+    },
     "stylix": {
       "inputs": {
         "base16": "base16",
@@ -662,7 +700,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "flake-utils": "flake-utils_3",
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
diff --git a/flake.nix b/flake.nix
index e19f76a..979a27e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,11 +33,15 @@
       url = "github:sadan4/chrome-pak-customizer";
     };
     ceserver = {
-        url = "github:sadan4/ceserver";
-        inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:sadan4/ceserver";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-parts.url = "github:hercules-ci/flake-parts";
     nix-alien.url = "https://flakehub.com/f/thiagokokada/nix-alien/0.1.384.tar.gz";
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
   outputs =
     {