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

11 files changed, 34 insertions, 36 deletions

diff --git a/README.md b/README.md
index 3c83b71..bd9f50c 100644
--- a/README.md
+++ b/README.md
@@ -147,6 +147,7 @@ Configure in nixos/environment.nix
 
 ### Applications
 Configure in nixos/apps.nix
+- Gimp
 - Vscode
 - Discord
 - Bitwarden
diff --git a/flake.lock b/flake.lock
index 36ed1db..d8f39ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,48 +7,48 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1764866045,
+        "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760580664,
-        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
+        "lastModified": 1764831616,
+        "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
+        "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1760580664,
-        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
+        "lastModified": 1765015431,
+        "narHash": "sha256-FQk/vnZvTU7Z/bYsebQMyICcvp43u9hrBKntSITXkhA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
+        "rev": "388b0c923d4d245cb6ac19eda4a7d93a32056592",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 388a236..0cc117c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
   description = "System";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/master";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/hypr/hyprland/input.conf b/hypr/hyprland/input.conf
index 3f26fae..96214ff 100644
--- a/hypr/hyprland/input.conf
+++ b/hypr/hyprland/input.conf
@@ -16,11 +16,6 @@ input {
     }
 }
 
-# https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
-    workspace_swipe = false
-}
-
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
 device {
diff --git a/hypr/hyprland/keybinds.conf b/hypr/hyprland/keybinds.conf
index e7f60d4..af743a2 100644
--- a/hypr/hyprland/keybinds.conf
+++ b/hypr/hyprland/keybinds.conf
@@ -20,16 +20,12 @@ bind = $mainMod, right, movefocus, r
 bind = $mainMod, up, movefocus, u
 bind = $mainMod, down, movefocus, d
 
-# Switch workspaces with mainMod + [0-9]
+# Switch workspaces with mainMod + [0-5]
 bind = $mainMod, 1, workspace, 1
 bind = $mainMod, 2, workspace, 2
 bind = $mainMod, 3, workspace, 3
 bind = $mainMod, 4, workspace, 4
 bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
 bind = $mainMod SHIFT, 1, movetoworkspace, 1
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 = {
diff --git a/waybar/config b/waybar/config
index 1596adb..e514a31 100644
--- a/waybar/config
+++ b/waybar/config
@@ -30,7 +30,7 @@
     "format": "{icon}",
     "on-click": "activate",
     "persistent-workspaces": {
-    "*":[1,2,3,4,5,6,7,8,9]
+    "*":[1,2,3,4,5]
     },
   },
   "custom/space": {