various updates

common/desktop/home.nix

@@ -22,6 +22,7 @@ let
       flask
       ipwhois
       pyasn
+      z3-solver
     ];
 in
 {
@@ -37,9 +38,8 @@ in
     gcc
     gimp
     inputs.attic.packages.${pkgs.system}.attic
-    inputs.comma.packages.${pkgs.system}.default
+    comma
     discord
-    jetbrains.clion
     jetbrains.rust-rover
     kdenlive
     libreoffice-fresh
@@ -54,6 +54,7 @@ in
     tex
     unzip
     yt-dlp
+    # z3
   ];
 
   # Enable my own hm modules

common/hm-modules/catppuccin/default.nix

@@ -6,6 +6,7 @@
 }:
 with lib;
 let
+  inherit (builtins) fromTOML readFile;
   cfg = config.themes.v.catppuccin;
   mako = pkgs.fetchFromGitHub {
     owner = "catppuccin";
@@ -13,6 +14,12 @@ let
     rev = "9dd088aa5f4529a3dd4d9760415e340664cb86df";
     sha256 = "sha256-nUzWkQVsIH4rrCFSP87mXAka6P+Td2ifNbTuP7NM/SQ=";
   };
+  starship = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "starship";
+    rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f";
+    sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
+  };
 in
 {
   options.themes.v.catppuccin = {
@@ -69,7 +76,11 @@ in
       })
     ];
 
-    programs.mako.extraConfig = builtins.readFile "${mako}/src/frappe";
+    programs.mako.extraConfig = readFile "${mako}/src/frappe";
+
+    programs.starship.settings = {
+      palette = "catppuccin_frappe";
+    } //fromTOML (readFile "${starship}/palettes/frappe.toml");
 
     programs.vscode = {
       userSettings."workbench.colorTheme" = "Catppuccin Frappé";

common/hm-modules/nvim/default.nix

@@ -296,7 +296,7 @@ with lib;
         telescope = {
           enable = true;
           defaults.preview.ls_short = true;
-          extensions.file_browser = {
+          extensions.file-browser = {
             enable = true;
             hijackNetrw = true;
             dirIcon = "";

common/hm-modules/rust.nix

@@ -28,15 +28,16 @@ in
 
         [build]
         rustc-wrapper = "${pkgs.sccache}/bin/sccache"
-
-        [target.'cfg(not(target_arch = "mips"))']
-        linker = "${pkgs.clang}/bin/clang"
-        rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"]
-
         [profile.rust-analyzer]
         inherits = "dev"
       '';
 
+        # [target.'cfg(not(target_arch = "mips"))']
+        # linker = "${pkgs.clang}/bin/clang"
+        # rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"]
+
+
+
       sessionPath = [ "$HOME/.cargo/bin" ];
     };
   };

common/users/default.nix

@@ -1,5 +1,16 @@
-{ config, pkgs, lib, inputs, ... }: {
-  imports = [ ./laura.nix ./vivian.nix ./jonathan.nix ];
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    ./laura.nix
+    ./vivian.nix
+    ./jonathan.nix
+  ];
   programs = {
 
     # Setup ZSH to use grml config
@@ -11,15 +22,16 @@
       interactiveShellInit = ''
         source "${pkgs.grml-zsh-config}/etc/zsh/zshrc"
         export FZF_DEFAULT_COMMAND="${pkgs.ripgrep}/bin/rg --files --follow"
-        source "${pkgs.fzf}/share/fzf/key-bindings.zsh"
-        source "${pkgs.fzf}/share/fzf/completion.zsh"
+        export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
+        export FZF_CTRL_R_COMMAND="$FZF_DEFAULT_COMMAND"
         eval "$(${pkgs.zoxide}/bin/zoxide init zsh)"
+        eval "$(${pkgs.fzf}/bin/fzf --zsh)"
 
         export TEMPDIRS="$HOME/tmp"
         source "${inputs.t.packages.${pkgs.system}.default}/bin/t-rs.sh"
       '';
       # otherwise it'll override the grml prompt
-      promptInit = "";
+      # promptInit = lib.mkDefault "";
     };
 
     # Install Neovim and set it as alias for vi(m)
@@ -39,8 +51,7 @@
   # Configure the root account
   users.extraUsers.root = {
     # Allow my SSH keys for logging in as root.
-    openssh.authorizedKeys.keys =
-      config.users.extraUsers.vivian.openssh.authorizedKeys.keys;
+    openssh.authorizedKeys.keys = config.users.extraUsers.vivian.openssh.authorizedKeys.keys;
     # Also use zsh for root
     shell = pkgs.zsh;
   };
@@ -57,6 +68,9 @@
     ripgrep
     rsync
     zoxide
+
+    # Terminfo
+    pkgs.kitty.terminfo
   ];
 
   programs.tmux = {