updated to 25.11, reduced workspaces from 9 to 5, readded ollama

5 files changed, 16 insertions, 10 deletions

diff --git a/nixos/apps.nix b/nixos/apps.nix
index 7b6ba07..f23edb8 100644
--- a/nixos/apps.nix
+++ b/nixos/apps.nix
@@ -2,10 +2,11 @@
 {
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    gimp
     vscode
     discord
     localsend
-    bitwarden
+    bitwarden-desktop
     obsidian
     # jetbrains.pycharm-professional
     # jetbrains.clion
diff --git a/nixos/desktop-environment.nix b/nixos/desktop-environment.nix
index eb5bbea..283efcb 100644
--- a/nixos/desktop-environment.nix
+++ b/nixos/desktop-environment.nix
@@ -3,15 +3,15 @@ let unstable = import <nixos-unstable> { config.allowUnfree = true; };
 in {
   services.xserver.enable = true;
   services.displayManager.ly.enable = true;
-  services.xserver.desktopManager.gnome.enable = false;
+  services.desktopManager.gnome.enable = false;
   programs.hyprland.enable = true;
   programs.hyprlock.enable = true;
   programs.foot.enable = true;
-  programs.waybar.enable = true;       # status bar
-  programs.sway.enable = true;     # lock screen, idle management
-  programs.dconf.enable = true;        # needed for gsettings
+  programs.waybar.enable = true;
+  programs.sway.enable = true;
+  programs.dconf.enable = true;
   environment.systemPackages = with pkgs; [
-    wofi # app launcher
+    wofi
     adwaita-icon-theme
     swaybg
     wl-clipboard
diff --git a/nixos/languages/beam.nix b/nixos/languages/beam.nix
index f0a5475..bffbf29 100644
--- a/nixos/languages/beam.nix
+++ b/nixos/languages/beam.nix
@@ -2,8 +2,6 @@
 {
   environment.systemPackages = with pkgs; [
     beamMinimal27Packages.elixir
-    beamMinimal27Packages.erlang
     beamMinimal27Packages.elixir-ls
-    beamMinimal27Packages.erlang-ls
   ];
 }
diff --git a/nixos/nvim.nix b/nixos/nvim.nix
index ffcbc26..c19c696 100644
--- a/nixos/nvim.nix
+++ b/nixos/nvim.nix
@@ -3,7 +3,9 @@
   environment.systemPackages = with pkgs; [
     unstable.neovim
 
+    zip
     unzip
+
     xsel
     ripgrep
     tree-sitter
diff --git a/nixos/services.nix b/nixos/services.nix
index 19df9cc..56e2fa4 100644
--- a/nixos/services.nix
+++ b/nixos/services.nix
@@ -1,19 +1,24 @@
 { config, pkgs, ... }:
 {
+  security.rtkit.enable = true;
+
   services.xserver.xkb = {
     layout = "us";
     variant = "";
   };
   services.printing.enable = true;
   services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
   };
-
+  services.ollama = {
+    enable = true;
+    acceleration = "cuda";
+  };
+  services.power-profiles-daemon.enable = true;
   services.openssh.enable = true;
   services.flatpak.enable = true;
   services.mongodb = {