Compare commits
10 Commits
ff41d54229
...
81a74dda1d
| Author | SHA1 | Date | |
|---|---|---|---|
| 81a74dda1d | |||
| 48a3557e16 | |||
| 577f69db46 | |||
| 00f9eeb734 | |||
| 776aeffa70 | |||
| fb1d76a097 | |||
| e8e2284d7f | |||
| c37a25dddc | |||
| 7d7bd5f719 | |||
| eecc58b663 |
36
flake.lock
generated
36
flake.lock
generated
@@ -25,11 +25,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771010766,
|
||||
"narHash": "sha256-lRS6BWZZ3+Du+67VS0G+9dNRfk/ok9TqDEiNCGnbE74=",
|
||||
"lastModified": 1771756436,
|
||||
"narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "54ab8bc155888f3894327bfb67b821e21723a5c4",
|
||||
"rev": "5bd3589390b431a63072868a90c0f24771ff4cbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -40,11 +40,11 @@
|
||||
},
|
||||
"import-tree": {
|
||||
"locked": {
|
||||
"lastModified": 1763762820,
|
||||
"narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=",
|
||||
"lastModified": 1771045967,
|
||||
"narHash": "sha256-oYO4poyw0Sb/db2PigqugMlDwsvwLg6CSpFrMUWxA3Q=",
|
||||
"owner": "vic",
|
||||
"repo": "import-tree",
|
||||
"rev": "3c23749d8013ec6daa1d7255057590e9ca726646",
|
||||
"rev": "c968d3b54d12cf5d9c13f16f7c545a06c9d1fde6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -55,11 +55,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1770841267,
|
||||
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
|
||||
"lastModified": 1771369470,
|
||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
|
||||
"rev": "0182a361324364ae3f436a63005877674cf45efb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -86,11 +86,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1770380644,
|
||||
"narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
|
||||
"lastModified": 1771207753,
|
||||
"narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe",
|
||||
"rev": "d1c15b7d5806069da59e819999d70e1cec0760bf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -131,11 +131,11 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770683991,
|
||||
"narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
|
||||
"lastModified": 1771735105,
|
||||
"narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
|
||||
"rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -149,11 +149,11 @@
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770971207,
|
||||
"narHash": "sha256-Q56BaqKZhfMlrloGLq4+Hs1vwOgs7eVkA7TKM3pBITU=",
|
||||
"lastModified": 1771787537,
|
||||
"narHash": "sha256-kf8PBv/PofFUp68KTeBS5TK5l/Y6G8ko9ra6j+I+1F4=",
|
||||
"owner": "Lassulus",
|
||||
"repo": "wrappers",
|
||||
"rev": "f77698efc5b81c3c452ed7a02a30c78e5b47bb5e",
|
||||
"rev": "663b60e26b16333042f0cb8793836df3fecc2304",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
self.nixosModules.llama
|
||||
self.nixosModules.localization
|
||||
self.nixosModules.applications
|
||||
self.nixosModules.utilities
|
||||
self.nixosModules.early
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
self.packages.${pkgs.stdenv.hostPlatform.system}.nh
|
||||
|
||||
];
|
||||
system.stateVersion = "24.11";
|
||||
system.stateVersion = "25.11";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,40 +1,30 @@
|
||||
{
|
||||
flake.nixosModules.serverHardware = { config, lib, modulesPath, ... }: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/208d39a0-fa7d-4fe4-be61-8867e7a51bc8";
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/mapper/luks-e2bd2b2f-7f88-4f4c-8b1f-1033f5bca401";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/AED2-D209";
|
||||
boot.initrd.luks.devices."luks-e2bd2b2f-7f88-4f4c-8b1f-1033f5bca401".device = "/dev/disk/by-uuid/e2bd2b2f-7f88-4f4c-8b1f-1033f5bca401";
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/7786-BA6A";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [ {
|
||||
device = "/dev/disk/by-uuid/ec9d9773-d48b-4221-af73-7c365fe0966d";
|
||||
} ];
|
||||
|
||||
# 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;
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
self.nixosModules.nginx
|
||||
self.nixosModules.rtl_sdr
|
||||
self.nixosModules.utilities
|
||||
self.nixosModules.early
|
||||
|
||||
self.nixosModules.lily
|
||||
self.nixosModules.localization
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{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 = [
|
||||
(final: prev: {
|
||||
llama-cpp-cuda = prev.llama-cpp.override {
|
||||
@@ -15,15 +20,83 @@
|
||||
listenAddress = "0.0.0.0";
|
||||
settings = {
|
||||
models = {
|
||||
#Language Models
|
||||
"angelic_eclipse" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Angelic_Eclipse_12B-Q4_K_M.gguf";
|
||||
};
|
||||
"cydonia" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/TheDrummer_Cydonia-24B-v4.3-Q4_K_M.gguf";
|
||||
};
|
||||
"cydonia-redux" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 32768 --model ${chat_models}/Cydonia-Redux-22B-v1.1-Q4_K_M.gguf";
|
||||
};
|
||||
"gemma3-R1" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Gemma3-R1-27B-v1-Q4_K_M.gguf";
|
||||
};
|
||||
"hearthfire" = {
|
||||
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" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/M3.2-24B-Loki-V2-Q4_K_M.gguf";
|
||||
};
|
||||
"magidonia" = {
|
||||
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} -m ${chat_models}/Magidonia-24B-v4.3-Q4_K_M.gguf --ctx-size 131072";
|
||||
};
|
||||
"mars" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Mars_27B_V1-28B-Q4_K_M.gguf";
|
||||
};
|
||||
"omega_directive" = {
|
||||
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" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 65536 --model ${chat_models}/Snowpiercer-15B-v1-Q4_K_M.gguf";
|
||||
};
|
||||
"valkyrie" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Valkyrie-49B-v2.1-Q4_K_M.gguf";
|
||||
};
|
||||
"wayfarer" = {
|
||||
ttl = 3600;
|
||||
cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/wayfarer-12B-Q4_K_M.gguf";
|
||||
};
|
||||
|
||||
#Diffusion Models
|
||||
"cyberrealistic" = {
|
||||
ttl = 3600;
|
||||
cmd = "${sd_cmd} --model ${sd_models}/cyberrealisticPony_semiRealV45.safetensors";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
llama-cpp-cuda
|
||||
stable-diffusion-cpp-cuda
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
24
modules/nixosModules/early-remote.nix
Normal file
24
modules/nixosModules/early-remote.nix
Normal 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'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
@@ -36,6 +36,8 @@ in {
|
||||
"Mod+O".toggle-overview = null;
|
||||
"Mod+Shift+Slash".show-hotkey-overlay = null;
|
||||
"Mod+Shift+Q".quit = null;
|
||||
"Mod+Shift+Escape".spawn-sh = "noctalia-shell ipc call lockScreen lock";
|
||||
|
||||
|
||||
"Mod+Q".close-window = null;
|
||||
"Mod+F".maximize-column = null;
|
||||
|
||||
Reference in New Issue
Block a user