adding stuff

flake.nix

@@ -61,6 +61,11 @@
           system = "x86_64-linux";
           modules = [ ./hosts/modgud ];
         };
+
+        odin = lib.mkSystem {
+          system = "x86_64-linux";
+          modules = [ ./hosts/odin ];
+        };
       };
 
       darwinConfigurations = {

home/features/cli/starship.nix

@@ -1,3 +1,17 @@
+{ pkgs, ... }:
+
+let
+  shell-pkg = pkgs.writeShellScriptBin "shell" ''
+    case "$STARSHIP_SHELL" in
+      fish) echo 🐟 ;;
+      nu) echo 🚀 ;;
+      zsh) echo 🐚 ;;
+      bash) echo 🐻 ;;
+      *) echo "" ;;
+    esac
+  '';
+in
+
 {
   programs.starship = {
     enable = true;
@@ -6,6 +20,23 @@
     enableTransience = true;
 
     settings = {
+      character.success_symbol = "[➜](bold green)";
+      character.error_symbol = "[✗](bold red)";
+
+      shell = {
+        disabled = false;
+        fish_indicator = "🐟";
+        nu_indicator = "☘️";
+        bash_indicator = "🐻";
+        zsh_indicator = "🐚";
+      };
+
+      # custom.shell = {
+      #   command = "${pkgs.lib.meta.getExe shell-pkg}";
+      #   format = "$all$shell$character";
+      #   when = "true";
+      # };
+
       palettes.catppuccin_frappe = {
         rosewater = "#f2d5cf";
         flamingo = "#eebebe";

home/features/core.nix

@@ -13,10 +13,14 @@
   xdg.enable = true;
 
   home = {
+    # FIXME: this needs to leave as soon as `ghostty` is merged into 24.11.
+    enableNixpkgsReleaseCheck = false;
+
     username = "thomas";
     homeDirectory = if pkgs.stdenv.isDarwin then "/Users/thomas" else "/home/thomas";
 
     packages = with pkgs; [
+      cachix
       curl
       fd
       ripgrep

home/features/desktop/yubikey.nix

@@ -28,6 +28,7 @@ in
     enable = mkDefault true;
     enableBashIntegration = true;
     enableFishIntegration = true;
+    enableNushellIntegration = true;
     enableSshSupport = true;
     pinentryFlavor = "curses";
     sshKeys = [

home/features/desktop/zen-browser.nix

@@ -0,0 +1,13 @@
+{ outputs, ... }:
+{
+  imports = [
+    outputs.modules.home-manager.zen-browser
+  ];
+
+  programs.zen-browser = {
+    enable = true;
+    profiles.thomas = {
+      isDefault = true;
+    };
+  };
+}

hosts/meili/README.md

@@ -11,13 +11,31 @@ nix run github:nix-community/home-manager -- switch --flake .#thomas@meili
 
 ## Services and Applications
 
+### AeroSpace
+
+i3 style tiling manager
+
+#### Hacks
+
+I had to hack in a way to move between splits and windows seamlessly. Basically what I'm doing is when I press ctrl+{h,j,k,l} it executes a script that checks if we're in a TMUX window and if that's the case it checks if we have a split to move to or not, if not it executes `aerospace focus`.
+
+
 ### Zen Browser
-### Obsidian
+
+Not able to package Zen Browser with Nix yet.
+
+### LogSeq
+
+This is going to become my new knowledge base.
+
 ### Raycast
 ### Ghostty
+
+Ghostty is still broken on darwin systems. But the master branch of home-manager allows to set the package to null which means we can install the package via homebrew and use home-manager to configure.
+
 ### Open Audible
 ### Signal (Molly)
 ### ProtonVPN
 ### VLC
 ### Yubi Authenticator
-### AeroSpace
+

hosts/meili/software.nix

@@ -19,6 +19,8 @@
 
   homebrew = {
     casks = [
+      "android-studio"
+
       # "mac-mouse-fix"
       # "alacritty" # => we're using the home-manager package now
       # "bitwarden"
@@ -41,6 +43,7 @@
       # "tailscale"
       "tor-browser"
       "vlc"
+      "zen-browser"
       # "whatsapp"
       # "krunkit"
     ];

lib/default.nix

@@ -59,4 +59,11 @@ rec {
         pkgs = getPkgsForSystem system;
       }
     );
+
+  print =
+    text:
+    let
+      json = builtins.toJSON text;
+    in
+    builtins.trace (builtins.fromJSON json) (builtins.fromJSON json);
 }

modules/global/nix-config.nix

@@ -15,6 +15,7 @@
         "https://cachix.cachix.org"
         "https://devenv.cachix.org"
         "https://nix-community.cachix.org"
+        "https://pilina.cachix.org"
       ];
 
       trusted-public-keys = [
@@ -22,6 +23,7 @@
         "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
         "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "pilina.cachix.org-1:PN4U5ltDWENbkWtbzX0Sa7Xn86a3lyBe5K/VJg5Xrps="
       ];
 
       trusted-users = [