fixed hostnames and added unstable config

This commit is contained in:
2025-04-22 17:22:04 -07:00
parent f1187ceba7
commit d979f7daec
5 changed files with 83 additions and 10 deletions

View File

@@ -52,7 +52,7 @@
useStockConfig = true;
};
networking.hostName = "EVA-01"; # Define your hostname.
networking.hostName = "eva-01"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary

View File

@@ -2,7 +2,18 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, inputs, ... }:
{ config, pkgs, pkgs-unstable, inputs, ... }:
#let
# system = pkgs.system;
# unstable = import (builtins.fetchTarball {
# url = "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz";
# sha256 = "09dahi81cn02gnzsc8a00n945dxc18656ar0ffx5vgxjj1nhgsvy";
# }) {
# inherit system;
# config.allowUnfree = true;
# };
#in
{
imports =
@@ -39,7 +50,7 @@
options = "--delete-older-than 30d";
};
networking.hostName = "EVA-03"; # Define your hostname.
networking.hostName = "eva-03"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
@@ -122,11 +133,35 @@
services.displayManager.sddm.theme = "sddm-astronaut-theme";
environment.sessionVariables.NIXOS_OZONE_WL = "1";
# XRDP
services.xrdp.enable = true;
services.xrdp.defaultWindowManager = "startplasma-x11";
services.xrdp.openFirewall = true;
# Enable Tailscale
services.tailscale.enable = true;
#Enable Ollama daemon
services.ollama.enable = true;
# services.ollama.enable = true;
# Enable ollama
services.ollama = {
enable = true;
host = "0.0.0.0";
openFirewall = true;
acceleration = "cuda";
package = pkgs-unstable.ollama;
loadModels = [
"codegemma:7b"
"deepcoder:14b"
"gemma3:12b-it-qat"
"gemma3:27b-it-qat"
"qwq:32b"
"deepseek-r1:32b"
"HammerAI/mythomax-l2:latest"
];
};
services.fprintd.enable = true;
services.fprintd.tod.enable = true;
@@ -259,6 +294,10 @@
wirelesstools
wifite2
#unstable
#unstable.vllm
pkgs-unstable.ollama
];
fonts.packages = with pkgs; [

17
flake.lock generated
View File

@@ -247,6 +247,22 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"devshell": "devshell",
@@ -304,6 +320,7 @@
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim"
}
},

View File

@@ -3,6 +3,7 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
@@ -22,11 +23,27 @@
};
outputs = { self, nixpkgs, home-manager, nixvim, nixos-hardware, ... }@inputs: {
outputs =
{ self,
nixpkgs,
nixpkgs-unstable,
home-manager,
nixvim,
nixos-hardware,
...
}@inputs:
let
system = "x86_64-linux";
pkgs-unstable = import nixpkgs-unstable {
system = system;
config.allowUnfree = true;
};
in
{
nixosConfigurations = {
eva-01 = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
system = "x86_64-linux";
specialArgs = {inherit inputs pkgs-unstable;};
system = system;
modules = [
./eva-01/configuration.nix
inputs.home-manager.nixosModules.default
@@ -35,8 +52,8 @@
};
eva-03 = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
system = "x86_64-linux";
specialArgs = {inherit inputs pkgs-unstable;};
system = system;
modules = [
./eva-03/configuration.nix
inputs.home-manager.nixosModules.default

View File

@@ -98,7 +98,7 @@
open = "xdg-open";
locate = "sudo plocate";
tulpn = "sudo netstat -tulpn";
rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#eva-03";
rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#$(uname -n)";
};
envExtra = ''