albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Testing Tabby and nuc-server fixes

Browse source
This commit is contained in:
albert 2025-01-24 11:41:47 -08:00
parent 1c33048eda
commit b065e0beb2
Signed by: albert
GPG key ID: 3895DD267CA11BA9
6 changed files with 90 additions and 68 deletions
flake.lock
home-manager/common/software/cli
nixvim.nix
nixvim
keymaps.nix
nixos
common/services
tabby.nix
hosts
framework16
default.nix
nuc-server
default.nix

109
flake.lock generated
View file

@ -408,11 +408,11 @@
]
},
"locked": {
"lastModified": 1737043064,
"narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=",
"lastModified": 1735882644,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github"
},
"original": {
@ -655,11 +655,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1737307080,
"narHash": "sha256-YKQbvo0758a1P3pjWh75qZDPIC/18ttDtPk9PD4S4lQ=",
"lastModified": 1737126697,
"narHash": "sha256-k1YhjONkiKBHzbjNy4ZsjysBac5UJSolCVq9cTKLeKM=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "e26d456e9d9a33f66e1985ab4c06e1940352ef40",
"rev": "27a0ddac1a14e10ba98530f59db728951495f2ce",
"type": "github"
},
"original": {
@ -680,11 +680,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1737299073,
"narHash": "sha256-hOydnO9trHDo3qURqLSDdmE/pHNWDzlhkmyZ/gcBX2s=",
"lastModified": 1734994463,
"narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=",
"owner": "nix-community",
"repo": "lanzaboote",
"rev": "64d20cb2afaad8b73f4e38de41d27fb30a782bb5",
"rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67",
"type": "github"
},
"original": {
@ -699,11 +699,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1737288694,
"narHash": "sha256-e9MsdkHidgepQpF0InyRSpeD6YujQcaB0uUzeXVvW+I=",
"lastModified": 1736684024,
"narHash": "sha256-FYJ4iFD/2L1CFN/aHjI8HxxSxuPNy4OvW+VCBh41Lzk=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "e07594822638004d96f100febbe947189c42e8a9",
"rev": "917882a0186d7731a61ede986c701e272f744750",
"type": "github"
},
"original": {
@ -720,16 +720,15 @@
]
},
"locked": {
"lastModified": 1736820923,
"narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=",
"lastModified": 1736370755,
"narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9",
"rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "nix-darwin-24.11",
"repo": "nix-darwin",
"type": "github"
}
@ -837,11 +836,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1737578558,
"narHash": "sha256-fOncumCxJ3YudFTGkp60yZ/GikmgDqunxYhQFmpN6Po=",
"lastModified": 1736978406,
"narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "5f052b26634916036d20ee92e2819db0fb7d2d87",
"rev": "b678606690027913f3434dea3864e712b862dde5",
"type": "github"
},
"original": {
@ -869,11 +868,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1737248590,
"narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=",
"lastModified": 1736643958,
"narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "977f49fd8cf854416f82987696784717acd6e817",
"rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
"type": "github"
},
"original": {
@ -900,11 +899,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1737469691,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"lastModified": 1737062831,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github"
},
"original": {
@ -921,11 +920,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1737481114,
"narHash": "sha256-SrpaK5R4nMqq6ZDNm/G2Bj53xHEsouz9w7ZiMDqb0Bc=",
"lastModified": 1736965550,
"narHash": "sha256-u34e02DgidNBbJ2ZPUWlNZeqQTo7tCGT8LN9dZphNAY=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "c52a529dd1585cad4ccd5951b10ba27366aa3cee",
"rev": "8f3a889a1bb60d58f42fc671d8a0b73496ede51c",
"type": "github"
},
"original": {
@ -936,11 +935,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1737404927,
"narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=",
"lastModified": 1737165118,
"narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3",
"rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
"type": "github"
},
"original": {
@ -967,11 +966,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1737062831,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"lastModified": 1736798957,
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github"
},
"original": {
@ -983,11 +982,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1736916166,
"narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
"lastModified": 1736200483,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github"
},
"original": {
@ -999,11 +998,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1737469691,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"lastModified": 1737062831,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github"
},
"original": {
@ -1042,11 +1041,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1737283156,
"narHash": "sha256-FyHmM6vvz+UxCrPZo/poIaZBZejLHVKkAH4cjtUxZDA=",
"lastModified": 1737141914,
"narHash": "sha256-Lq7PWAD+edeIpZKM7aresrwON+Tdo3OMu1S2YX8AjjM=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "abcbd250b8a2c7aab1f4b2b9e01598ee24b42337",
"rev": "c2ee71c814c9427d4991b9d58d412add9c5a1c56",
"type": "github"
},
"original": {
@ -1063,11 +1062,11 @@
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1737581285,
"narHash": "sha256-QHNeiu2Ha/5bup5ZQ2Lug8wrVD2VQZ1qCVOZzbo+E2s=",
"lastModified": 1737243248,
"narHash": "sha256-FS0EQ1WY60GDBIL1PE89c2SYuiy02Aqi4LPZMWjt4M8=",
"owner": "nix-community",
"repo": "NUR",
"rev": "5e89702b34b72284edeca12ca41a8736ec97ccc5",
"rev": "e1d04292a91934ea92442f5bdae54c7f495f6e10",
"type": "github"
},
"original": {
@ -1192,11 +1191,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1737411508,
"narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
"lastModified": 1737107480,
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
"type": "github"
},
"original": {
@ -1226,11 +1225,11 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1737585583,
"narHash": "sha256-lU00TEdqCCWJNtMbR0l779xRJHtMf5FKCGKcsC+/Hr8=",
"lastModified": 1736955352,
"narHash": "sha256-VujiBKJYM32b7HZEVO3Txla989lE7HMNGhVomLtguB0=",
"owner": "danth",
"repo": "stylix",
"rev": "9409ae8a925aacc7ea9a794e0bde159b876572a3",
"rev": "ef93972237a82cc340e804a1d2d4140ad65fe81d",
"type": "github"
},
"original": {
@ -1380,11 +1379,11 @@
]
},
"locked": {
"lastModified": 1737103437,
"narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
"lastModified": 1736154270,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github"
},
"original": {

18
home-manager/common/software/cli/nixvim.nix
View file

@ -1,4 +1,4 @@
{ ... }: {
{ pkgs, ... }: {
imports = [
./nixvim/base.nix
./nixvim/cmp.nix
@ -35,14 +35,18 @@
diagnostics.virtual_lines.only_current_line = true;
extraPlugins = with pkgs.vimPlugins; [
vim-tabby
];
plugins = {
todo-comments.enable = true;
ollama = {
enable = true;
model = "qwen2.5-coder:3b";
url = "http://127.0.0.1:11434";
action = "display";
};
# ollama = {
# enable = true;
# model = "qwen2.5-coder:3b";
# url = "http://127.0.0.1:11434";
# action = "display";
# };
dressing.enable = true;
lsp-lines.enable = true;
crates-nvim.enable = true;

6
home-manager/common/software/cli/nixvim/keymaps.nix
View file

@ -79,8 +79,8 @@
(nmap "<leader>mu" ":MCunderCursor<CR>" // desc "Select [U]nder Corsor")
(nmap "<leader>mp" ":MCpattern<CR>" // desc "Select [P]attern")
# Ollama
(nmap "<leader>os" ":OllamaServe<CR>" // desc "Ollama [S]erve")
(nmap "<leader>op" ":Ollama<CR>" // desc "Ollama [P]rompt")
(nmap "<leader>om" ":OllamaModel<CR>" // desc "Ollama [M]odel")
# (nmap "<leader>os" ":OllamaServe<CR>" // desc "Ollama [S]erve")
# (nmap "<leader>op" ":Ollama<CR>" // desc "Ollama [P]rompt")
# (nmap "<leader>om" ":OllamaModel<CR>" // desc "Ollama [M]odel")
];
}

13
nixos/common/services/tabby.nix Normal file
View file

@ -0,0 +1,13 @@
{ pkgs, pkgs-unstable, ... }: {
environment.systemPackages = with pkgs; [ cmake ]; # Required to build Tabby
services.tabby = {
package = pkgs-unstable.tabby;
enable = true;
indexInterval = "never"; # scheduler is an unknown command and thus fails
model = "TabbyML/StarCoder-1B"; # The defualt model
# acceleration = "rocm";
usageCollection = false;
};
}

5
nixos/hosts/framework16/default.nix
View file

@ -13,9 +13,12 @@
../../common/services/podman.nix
../../common/services/geoclue.nix
../../common/services/syncthing.nix
../../common/services/ollama.nix
# ../../common/services/ollama.nix
../../common/services/tabby.nix
];
nixpkgs.config.rocmSupport = true;
# https://wiki.nixos.org/wiki/Ollama
services.ollama = {
acceleration = "rocm";

7
nixos/hosts/nuc-server/default.nix
View file

@ -8,7 +8,6 @@ in {
(modulesPath + "/installer/scan/not-detected.nix")
../../common/services/tailscale-autoconnect.nix
../../common/modules/secureboot.nix
# ../../common/modules/boot.nix
../../common/modules/ssh-luks.nix
../../common/services/docker.nix
./disks.nix
@ -20,6 +19,7 @@ in {
boot.kernelParams = [ "ip=${ipAddress}::${gateway}:255.255.255.0:${hostname}:${netDev}:none" ];
networking = {
useDHCP = false;
nameservers = [ "9.9.9.9" ];
interfaces.${netDev} = {
ipv4.addresses = [{
address = ipAddress;
@ -51,7 +51,10 @@ in {
# Set the networking hostname:
networking.hostName = hostname;
# networking.firewall.allowedTCPPorts = [ 22 ];
# NOTE: This is allowed because it's on a secure network
# and I may sometimes need to remotely troubleshoot.
networking.firewall.allowedTCPPorts = [ 22 ];
services.tailscale.extraUpFlags = [
"--advertise-exit-node"