calendar navigation + flake update + random other tools + no global postgres

6 files changed, 27 insertions, 21 deletions

diff --git a/nixos/apps.nix b/nixos/apps.nix
index cbe809c..fc759b1 100644
--- a/nixos/apps.nix
+++ b/nixos/apps.nix
@@ -10,6 +10,7 @@
     discord
     localsend
     bitwarden-desktop
+    parted
     obsidian
     libreoffice-qt6-fresh
     kdePackages.dolphin
diff --git a/nixos/apps/browser.nix b/nixos/apps/browser.nix
index 5b6ea42..0b5a330 100644
--- a/nixos/apps/browser.nix
+++ b/nixos/apps/browser.nix
@@ -4,10 +4,7 @@
     inputs.zen-browser.packages."${system}".default
   ];
   xdg.mime = let
-    value = let
-      zen-browser = inputs.zen-browser.packages.${system}.default;
-    in
-      zen-browser.meta.desktopFileName;
+    value = "zen-browser.desktop";
 
     associations = builtins.listToAttrs (map (name: {
         inherit name value;
diff --git a/nixos/environment.nix b/nixos/environment.nix
index 18b1101..d9585f0 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -37,7 +37,6 @@
     btop
     yazi
     scrcpy
-    cloc
     wf-recorder
     cava
 
@@ -48,6 +47,7 @@
     inetutils
     android-tools
     sqlite
+    bc
 
     zoxide
     starship
@@ -59,8 +59,12 @@
     cowsay
     lolcat
     just
+    jq
+
+    termshark
   ];
   fonts.packages = with pkgs; [
+    dejavu_fonts
     nerd-fonts.jetbrains-mono
   ];
 }
diff --git a/nixos/games/default.nix b/nixos/games/default.nix
index d928476..5894464 100644
--- a/nixos/games/default.nix
+++ b/nixos/games/default.nix
@@ -3,12 +3,14 @@
   imports =
     (if games.minecraft then [ ./minecraft.nix ] else []);
   programs.steam.enable = true;
+  programs.steam.protontricks.enable = true;
   programs.steam.extraCompatPackages = with pkgs; [
     proton-ge-bin
   ];
   environment.systemPackages = with pkgs; [
     steam-run
-    protontricks
     mangohud
+    freetype
+    fontconfig
   ];
 }
diff --git a/nixos/opt/llm.nix b/nixos/opt/llm.nix
index a944d5c..f9dad3a 100644
--- a/nixos/opt/llm.nix
+++ b/nixos/opt/llm.nix
@@ -1,5 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, unstable, ... }:
+
 {
+  services.ollama.package = unstable.ollama;
   services.ollama = {
     enable = true;
     acceleration = "cuda";
diff --git a/nixos/services.nix b/nixos/services.nix
index a5e4b53..0aa96d5 100644
--- a/nixos/services.nix
+++ b/nixos/services.nix
@@ -32,20 +32,20 @@
   services.cloudflare-warp.enable = true;
   services.openssh.enable = true;
   services.flatpak.enable = true;
-  services.postgresql = {
-    enable = true;
-    ensureUsers = [
-      {
-        name = username;
-        ensureDBOwnership = true;
-      }
-    ];
-    ensureDatabases = [ username ];
-    authentication = pkgs.lib.mkOverride 10 ''
-      #type database  DBuser  auth-method
-      local all       all     trust
-    '';
-  };
+  # services.postgresql = {
+  #   enable = true;
+  #   ensureUsers = [
+  #     {
+  #       name = username;
+  #       ensureDBOwnership = true;
+  #     }
+  #   ];
+  #   ensureDatabases = [ username ];
+  #   authentication = pkgs.lib.mkOverride 10 ''
+  #     #type database  DBuser  auth-method
+  #     local all       all     trust
+  #   '';
+  # };
   services.kanata = {
     enable = true;
     keyboards = {