Compare commits

..

21 Commits

Author SHA1 Message Date
989e547169 update 2026-04-18 22:24:50 -05:00
a3a91287ed updating llama-swap models. 2026-04-06 15:39:26 -05:00
ab92d5ed54 merge 2026-04-06 14:32:07 -05:00
78ec25b97c update. added sdrpp 2026-04-06 14:29:45 -05:00
d84c4ecfc3 update. added sdrpp 2026-04-06 14:29:28 -05:00
4992f66a39 update 2026-03-30 20:46:12 -05:00
a618aa9eef update 2026-03-16 16:46:17 -05:00
6e094a1b6c update 2026-03-09 14:44:03 -05:00
b29f2c396c enabled steam rather than installed package. 2026-03-09 13:36:27 -05:00
8b67e31c3b added swap to server and removed a package that is failing to build 2026-03-05 07:54:19 -06:00
ac784ff44d update 2026-03-02 09:04:29 -06:00
81a74dda1d remote unlocking for server 2026-02-23 09:05:59 -06:00
48a3557e16 encrypted server 2026-02-22 15:52:07 -06:00
577f69db46 update 2026-02-22 14:12:50 -06:00
00f9eeb734 added more language models. 2026-02-22 13:40:33 -06:00
776aeffa70 update 2026-02-16 15:44:42 -06:00
fb1d76a097 added remote unlocking 2026-02-16 08:36:13 -06:00
e8e2284d7f ctx size and mmap 2026-02-14 20:28:57 -06:00
c37a25dddc Merge branch 'main' of https://git.lilyanderson.xyz/lily/LiNix 2026-02-14 19:36:35 -06:00
7d7bd5f719 added an image generation model 2026-02-14 19:35:48 -06:00
eecc58b663 added screen lock command 2026-02-14 15:55:32 -06:00
11 changed files with 164 additions and 66 deletions

54
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1769996383, "lastModified": 1775087534,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -25,11 +25,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771010766, "lastModified": 1776454077,
"narHash": "sha256-lRS6BWZZ3+Du+67VS0G+9dNRfk/ok9TqDEiNCGnbE74=", "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "54ab8bc155888f3894327bfb67b821e21723a5c4", "rev": "565e5349208fe7d0831ef959103c9bafbeac0681",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -40,11 +40,11 @@
}, },
"import-tree": { "import-tree": {
"locked": { "locked": {
"lastModified": 1763762820, "lastModified": 1773693634,
"narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
"owner": "vic", "owner": "vic",
"repo": "import-tree", "repo": "import-tree",
"rev": "3c23749d8013ec6daa1d7255057590e9ca726646", "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -55,11 +55,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1770841267, "lastModified": 1776169885,
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -71,11 +71,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1769909678, "lastModified": 1774748309,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "72716169fe93074c333e8d0173151350670b824c", "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -86,11 +86,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1770380644, "lastModified": 1775888245,
"narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe", "rev": "13043924aaa7375ce482ebe2494338e058282925",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -102,11 +102,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1764667669, "lastModified": 1773734432,
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "418468ac9527e799809c900eda37cbff999199b6", "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -131,11 +131,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1770683991, "lastModified": 1776119890,
"narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=", "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033", "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -149,11 +149,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1770971207, "lastModified": 1776505856,
"narHash": "sha256-Q56BaqKZhfMlrloGLq4+Hs1vwOgs7eVkA7TKM3pBITU=", "narHash": "sha256-VbnOijrn4EdYYJwiNQFxQNXECKBa60U66UPxUQAGkBE=",
"owner": "Lassulus", "owner": "Lassulus",
"repo": "wrappers", "repo": "wrappers",
"rev": "f77698efc5b81c3c452ed7a02a30c78e5b47bb5e", "rev": "738d4bf81cbf306f6917c540a5b798110e3cf1e8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -47,6 +47,7 @@ flake.nixosModules.lily-desktop = { pkgs, ... }:{
vim vim
wget wget
home-manager home-manager
sdrpp
self.packages.${pkgs.stdenv.hostPlatform.system}.nh self.packages.${pkgs.stdenv.hostPlatform.system}.nh
]; ];

View File

@@ -7,6 +7,8 @@
self.nixosModules.llama self.nixosModules.llama
self.nixosModules.localization self.nixosModules.localization
self.nixosModules.applications self.nixosModules.applications
self.nixosModules.utilities
self.nixosModules.early
]; ];
}; };
} }

View File

@@ -30,7 +30,7 @@
self.packages.${pkgs.stdenv.hostPlatform.system}.nh self.packages.${pkgs.stdenv.hostPlatform.system}.nh
]; ];
system.stateVersion = "24.11"; system.stateVersion = "25.11";
}; };
} }

View File

@@ -1,40 +1,32 @@
{ {
flake.nixosModules.serverHardware = { config, lib, modulesPath, ... }: { flake.nixosModules.serverHardware = { config, lib, modulesPath, ... }: {
imports = [ imports =
(modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems = { fileSystems."/" =
"/" = { { device = "/dev/mapper/luks-e2bd2b2f-7f88-4f4c-8b1f-1033f5bca401";
device = "/dev/disk/by-uuid/208d39a0-fa7d-4fe4-be61-8867e7a51bc8";
fsType = "ext4"; fsType = "ext4";
}; };
"/boot" = { boot.initrd.luks.devices."luks-e2bd2b2f-7f88-4f4c-8b1f-1033f5bca401".device = "/dev/disk/by-uuid/e2bd2b2f-7f88-4f4c-8b1f-1033f5bca401";
device = "/dev/disk/by-uuid/AED2-D209";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/7786-BA6A";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [ "fmask=0077" "dmask=0077" ];
}; };
};
swapDevices = [ { swapDevices = [
device = "/dev/disk/by-uuid/ec9d9773-d48b-4221-af73-7c365fe0966d"; { device = "/etc/swapfile"; }
} ]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
};
};
} }

View File

@@ -6,6 +6,7 @@
self.nixosModules.nginx self.nixosModules.nginx
self.nixosModules.rtl_sdr self.nixosModules.rtl_sdr
self.nixosModules.utilities self.nixosModules.utilities
self.nixosModules.early
self.nixosModules.lily self.nixosModules.lily
self.nixosModules.localization self.nixosModules.localization

View File

@@ -1,5 +1,10 @@
{self, inputs, ...}: { {self, inputs, ...}:{
flake.nixosModules.llama = { lib, pkgs, ... }: { flake.nixosModules.llama = { lib, pkgs, ... }: let
llama_cmd = "${pkgs.llama-cpp-cuda}/bin/llama-server --port \${PORT} --mmap";
sd_cmd = "${pkgs.stable-diffusion-cpp-cuda}/bin/sd-server --listen-port \${PORT}";
chat_models = "/var/AI/Models/Chat/ggufs";
sd_models = "/var/AI/Models/Art";
in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
llama-cpp-cuda = prev.llama-cpp.override { llama-cpp-cuda = prev.llama-cpp.override {
@@ -15,15 +20,84 @@
listenAddress = "0.0.0.0"; listenAddress = "0.0.0.0";
settings = { settings = {
models = { models = {
"magidonia" = { #Language Models
"angelic_eclipse-12b" = {
ttl = 3600; ttl = 3600;
cmd = "${pkgs.llama-cpp-cuda}/bin/llama-server --port \${PORT} -m /var/AI/Models/Chat/ggufs/Magidonia-24B-v4.3-Q4_K_M.gguf"; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Angelic_Eclipse_12B-Q4_K_M.gguf";
};
"cydonia-24b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/TheDrummer_Cydonia-24B-v4.3-Q4_K_M.gguf";
};
"cydonia-redux-22b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 32768 --model ${chat_models}/Cydonia-Redux-22B-v1.1-Q4_K_M.gguf";
};
"gemma3-R1-27b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Gemma3-R1-27B-v1-Q4_K_M.gguf";
};
"hearthfire-24b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Hearthfire-24B-Q4_K_M.gguf";
};
"impish_bloodmoon" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Impish_Bloodmoon-Q4_K_M.gguf";
};
"llama_abliterated_dark_champion" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Llama-3.2-8X3B-18.4B-MOE-Dark-Champion-Instruct-uncensored-abliterated-Q4_K_M.gguf";
};
"loki-24b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/M3.2-24B-Loki-V2-Q4_K_M.gguf";
};
"magidonia-24b" = {
ttl = 3600;
cmd = "${llama_cmd} -m ${chat_models}/Magidonia-24B-v4.3-Q4_K_M.gguf --ctx-size 131072";
};
"mars-27b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Mars_27B_V1-28B-Q4_K_M.gguf";
};
"omega_directive-24b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/MS3.2-The-Omega-Directive-24B-Unslop-v2.0-Q4_K_M.gguf";
};
"qwen_14b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 40960 --model ${chat_models}/Qwen3-14B-Q4_K_M.gguf";
};
"qwen_32b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 40960 --model ${chat_models}/Qwen3-32B-Q4_K_M.gguf";
};
"snowpiercer-15b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 65536 --model ${chat_models}/Snowpiercer-15B-v1-Q4_K_M.gguf";
};
"valkyrie-49b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Valkyrie-49B-v2.1-Q4_K_M.gguf";
};
"wayfarer-12b" = {
ttl = 3600;
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/wayfarer-12B-Q4_K_M.gguf";
};
#Diffusion Models
"cyberrealistic" = {
ttl = 3600;
checkEndpoint = "/";
cmd = "${sd_cmd} --model ${sd_models}/cyberrealisticPony_semiRealV45.safetensors";
}; };
}; };
}; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
llama-cpp-cuda llama-cpp-cuda
stable-diffusion-cpp-cuda
]; ];
}; };
} }

View File

@@ -5,7 +5,6 @@
#Games #Games
ckan ckan
steam
steam-run steam-run
#Media #Media
@@ -22,5 +21,8 @@
texstudio texstudio
texliveFull texliveFull
]; ];
programs.steam = {
enable = true;
};
}; };
} }

View File

@@ -0,0 +1,24 @@
{self, inputs, ...}: {
flake.nixosModules.early = { pkgs, ... }: {
networking = {
useDHCP = false;
dhcpcd.enable = false;
};
boot.initrd = {
availableKernelModules = [ "r8169" "e1000e" ];
network = {
enable = true;
udhcpc.enable = true;
ssh = {
enable = true;
port = 222;
hostKeys = [ /etc/secrets/initrd/ssh_host_key ];
authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/zH272jRjJf120mqr6EpKB346Nufq5lKFzFTd0ckAC lily@lily-desktop" ];
shell = "/bin/cryptsetup-askpass";
};
postCommands = ''ip addr'';
};
};
};
}

View File

@@ -3,7 +3,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
rtl-sdr rtl-sdr
hamlib hamlib
gqrx #gqrx
sdrpp sdrpp
]; ];

View File

@@ -36,6 +36,8 @@ in {
"Mod+O".toggle-overview = null; "Mod+O".toggle-overview = null;
"Mod+Shift+Slash".show-hotkey-overlay = null; "Mod+Shift+Slash".show-hotkey-overlay = null;
"Mod+Shift+Q".quit = null; "Mod+Shift+Q".quit = null;
"Mod+Shift+Escape".spawn-sh = "noctalia-shell ipc call lockScreen lock";
"Mod+Q".close-window = null; "Mod+Q".close-window = null;
"Mod+F".maximize-column = null; "Mod+F".maximize-column = null;