diff options
| author | Aargh Rai <aargh.rai+git@gmail.com> | 2026-06-09 19:02:58 +0530 |
|---|---|---|
| committer | Aargh Rai <aargh.rai+git@gmail.com> | 2026-06-09 19:02:58 +0530 |
| commit | e8e5ed4f7e684ee38a5f20162053e68f2911ff1e (patch) | |
| tree | 6cc773b411cc1086b0da82ba4e9fbcf5599438c1 /nixos | |
| parent | c6084fef665e3931623fa5a181f0d51827c0e387 (diff) | |
updated to 26.05
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/apps.nix | 9 | ||||
| -rw-r--r-- | nixos/environment.nix | 11 | ||||
| -rw-r--r-- | nixos/home.nix | 1 | ||||
| -rw-r--r-- | nixos/languages/rust.nix | 1 | ||||
| -rw-r--r-- | nixos/opt/llm.nix | 3 |
5 files changed, 15 insertions, 10 deletions
diff --git a/nixos/apps.nix b/nixos/apps.nix index cfe4cd4..974f183 100644 --- a/nixos/apps.nix +++ b/nixos/apps.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, unstable, ... }: { imports = [ @@ -8,16 +8,15 @@ google-chrome blanket gimp - vscode - discord + # discord # electron has fucked discord, electron is currently unsecure package localsend libresprite - bitwarden-desktop + # bitwarden-desktop # same electron issue parted obsidian libreoffice-qt6-fresh kdePackages.dolphin - wineWowPackages.stable + wineWow64Packages.stable vlc ]; diff --git a/nixos/environment.nix b/nixos/environment.nix index 1d1a8b5..d8f70e5 100644 --- a/nixos/environment.nix +++ b/nixos/environment.nix @@ -11,8 +11,15 @@ "$HOME/.android-sdk/platform-tools" "$HOME/.android-sdk/emulator" ]; - PKG_CONFIG_PATH="$HOME/.local/lib/pkgconfig $HOME/.local/lib64/pkgconfig"; - LD_LIBRARY_PATH="$HOME/.local/lib $HOME/.local/lib64"; + PKG_CONFIG_PATH = [ + "$HOME/.local/lib/pkgconfig" + "$HOME/.local/lib64/pkgconfig" + ]; + LD_LIBRARY_PATH = [ + "$HOME/.local/lib" + "$HOME/.local/lib64" + pkgs.stdenv.cc.cc.lib + ]; ANDROID_NDK_HOME="$HOME/.android-ndk"; ANDROID_NDK_ROOT="$HOME/.android-ndk"; ANDROID_HOME="$HOME/.android-sdk"; diff --git a/nixos/home.nix b/nixos/home.nix index 6271724..4089e1f 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -8,7 +8,6 @@ shell = pkgs.fish; }; virtualisation.docker.enable = true; - programs.adb.enable = true; programs.fish = { enable = true; shellInit = '' diff --git a/nixos/languages/rust.nix b/nixos/languages/rust.nix index 1978c9b..ffe66fd 100644 --- a/nixos/languages/rust.nix +++ b/nixos/languages/rust.nix @@ -2,6 +2,7 @@ { environment.systemPackages = with pkgs; [ cargo + rustc rust-analyzer ]; } diff --git a/nixos/opt/llm.nix b/nixos/opt/llm.nix index f9dad3a..db5c81a 100644 --- a/nixos/opt/llm.nix +++ b/nixos/opt/llm.nix @@ -1,9 +1,8 @@ { config, pkgs, unstable, ... }: { - services.ollama.package = unstable.ollama; services.ollama = { enable = true; - acceleration = "cuda"; + package = unstable.ollama-cuda; }; } |