1
0
Prechádzať zdrojové kódy

a few changes I use on meili at the moment

Zander Hawke 11 mesiacov pred
rodič
commit
1bb434ecdf

+ 2 - 0
.gitignore

@@ -3,3 +3,5 @@
 result*
 *.qcow2
 .DS_Store
+cert*
+key*

+ 8 - 8
flake.nix

@@ -2,23 +2,23 @@
   description = "my nix configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=true";
+    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin?shallow=true";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable?shallow=true";
 
-    darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.05";
+    darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.05?shallow=true";
     darwin.inputs.nixpkgs.follows = "nixpkgs-darwin";
 
-    devenv.url = "github:cachix/devenv";
+    devenv.url = "github:cachix/devenv?shallow=true";
     devenv.inputs.nixpkgs.follows = "nixpkgs-unstable";
 
-    disko.url = "github:nix-community/disko";
+    disko.url = "github:nix-community/disko?shallow=true";
     disko.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/master";
+    home-manager.url = "github:nix-community/home-manager/master?shallow=true";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-    nixvim.url = "github:nix-community/nixvim/nixos-25.05";
+    nixvim.url = "github:nix-community/nixvim/nixos-25.05?shallow=true";
     nixvim.inputs.nixpkgs.follows = "nixpkgs";
   };
 

+ 8 - 0
home/features/cli/aider-chat.nix

@@ -3,4 +3,12 @@
   home.packages = with pkgs; [
     aider-chat
   ];
+
+  home.sessionVariables = {
+    OPENROUTER_API_KEY = "";
+  };
+
+  # programs.fish.interactiveShellInit = ''
+  #   set OPENROUTER_API_KEY $(pass openrouter.ai/avante)
+  # '';
 }

+ 7 - 4
home/features/cli/pass.nix

@@ -1,7 +1,10 @@
+{ config, ... }:
 {
   programs.password-store.enable = true;
-  programs.password-store.settings = {
-    PASSWORD_STORE_KEY = "7A53D4C6B481F7711588D34FDE749C31D060A160";
-    PASSWORD_STORE_SIGNING_KEY = "7A53D4C6B481F7711588D34FDE749C31D060A160";
-  };
+
+  programs.fish.shellInit = ''
+    set PASSWORD_STORE_DIR "${config.xdg.dataHome}/password-store";
+    set PASSWORD_STORE_KEY "7A53D4C6B481F7711588D34FDE749C31D060A160";
+    set PASSWORD_STORE_SIGNING_KEY "7A53D4C6B481F7711588D34FDE749C31D060A160";
+  '';
 }

+ 2 - 2
home/features/desktop/aerospace.nix

@@ -179,8 +179,8 @@ in
         {
           check-further-callbacks = false;
           "if" = {
-            app-id = "app.zen-browser.zen";
-            window-title-regex-substring = "Picture-in-Picture";
+            app-id = "com.brave.Browser";
+            window-title-regex-substring = "Picture in Picture";
           };
           run = [ "layout floating" ];
         }

+ 0 - 1
home/features/desktop/default.nix

@@ -4,7 +4,6 @@
     ./alacritty.nix
     ./fonts.nix
     ./ghostty.nix
-    ./logseq.nix
     ./syncthing.nix
     ./yubikey.nix
   ];

+ 10 - 1
home/features/nvim/plugins/avante.nix

@@ -1,4 +1,13 @@
 {
   plugins.avante.enable = true;
-  plugins.avante.settings.claude.model = "claude-3-5-haiku-20241022";
+  plugins.avante.settings = {
+    hints.enabled = false;
+    provider = "openrouter";
+    vendors.openrouter = {
+      __inherited_from = "openai";
+      endpoint = "https://openrouter.ai/api/v1";
+      api_key_name = "OPENROUTER_API_KEY";
+      model = "moonshotai/kimi-k2:free";
+    };
+  };
 }

+ 1 - 0
hosts/meili/default.nix

@@ -60,6 +60,7 @@
   };
 
   users.users.thomas.home = "/Users/thomas";
+  ids.gids.nixbld = 350;
 
   networking = {
     hostName = "meili";

+ 5 - 3
hosts/meili/software.nix

@@ -9,6 +9,8 @@
     gnupg
     jq
     ripgrep
+    ollama
+    rlama
 
     unstable.devenv
   ];
@@ -30,7 +32,7 @@
       # "hot"
       # "ledger-live"
       # "mullvadvpn"
-      # "obsidian"
+      "obsidian"
       # "openaudible"
       "orbstack"
 
@@ -40,7 +42,7 @@
       "protonvpn"
 
       "signal"
-      "tailscale"
+      "tailscale-app"
       # "tor-browser"
       # "utm"
       "vlc"
@@ -54,7 +56,7 @@
       "Yubico Authenticator" = 1497506650;
       # "UTM Virtual Machines" = 1538878817; costs $9.99 in the app store
       # "Speechify" = 1624912180;
-      # "DaVinci Resolve" = 571213070;
+      "DaVinci Resolve" = 571213070;
       # "Orbot" = 1609461599;
 
       # Safari Extensions