lilith/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lilith:65cefaf5cd96336409dcd52c68a157d48ade2d36
Branches Tags
lilith:main
...
compare: lilith:bd49791e06f3ab5f04a4c0097b7fc6a6a1f39494
Branches Tags
lilith:main

6 commits
65cefaf5cd ... bd49791e06

Author SHA1 Message Date
Lilith
bd49791e06
ollama 2024-07-24 01:15:10 +02:00
Lilith
6bd365f84e
ollama 2024-07-24 01:12:33 +02:00
Lilith
e326eef6f4
containers 2024-07-24 01:03:36 +02:00
Lilith
a7d3e5b7b9
containers 2024-07-24 01:01:20 +02:00
Lilith
81a3c9ac67
containers 2024-07-24 00:37:08 +02:00
Lilith
578f0231ca
containers 2024-07-24 00:36:50 +02:00
6 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1718921313, "lastModified": 1721074762,
"narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=", "narHash": "sha256-RhqFBMLh6G5vAo7Jz9mdsworI50E4FAAg7rPho4CNfY=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d", "rev": "8194f0c9546a150525a2022c17aed51df1464b80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +346,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720734513, "lastModified": 1721135958,
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -451,11 +451,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1721059467, "lastModified": 1721150952,
"narHash": "sha256-0Yx4eXowxw5TATf92DZu2qKbBYXPxYh849h9tL/TQR0=", "narHash": "sha256-LRuNRlV1JelXkufntUbaVDpI+CEOgHAnI+MTToOT9Hk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "be45415f0f321f030f8c76723fd15d4b0f3a02fb", "rev": "4830e090c333af770f3edf2aa4d5a2b183f6455e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +499,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1721016451, "lastModified": 1721080040,
"narHash": "sha256-Cypl9ORr5UjtBsbjXMTJRepTe362yNVrPrntUvHiTaw=", "narHash": "sha256-USDsS90/88RJibP3gEcH1AaVt+JpnX4XCUD9bAJP5I4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a14c5d651cee9ed70f9cd9e83f323f1e531002db", "rev": "b2c1f10bfbb3f617ea8e8669ac13f3f56ceb2ea2",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/lilith-pc/default.nix
View file

@ -4,6 +4,8 @@
extraConfig = { extraConfig = {
config.gaming.enable = true; config.gaming.enable = true;
config.ollama.enable = true;
config.hyprlandOverrides = { config.hyprlandOverrides = {
settings = { settings = {
input = { input = {

2
system/env.nix
View file

@ -2,7 +2,7 @@
environment.variables = { environment.variables = {
EDITOR = "hx"; EDITOR = "hx";
VISUAL = "hx"; VISUAL = "hx";
FLAKE = conf.home + /nixos; FLAKE = "${conf.home}/nixos";
ELECTRON_OZONE_PLATFORM_HINT = "auto"; ELECTRON_OZONE_PLATFORM_HINT = "auto";
}; };
} }

5
system/full.nix
View file

@ -1,4 +1,4 @@
{lib, config, ...}: { {lib, config, conf, ...}: {
imports = [ imports = [
./audio.nix ./audio.nix
./env.nix ./env.nix
@ -18,5 +18,8 @@
./syncthing.nix ./syncthing.nix
./wayland.nix ./wayland.nix
./zsh.nix ./zsh.nix
./ollama.nix
]; ];
} }

8
system/ollama.nix Normal file
View file

@ -0,0 +1,8 @@
{ options, lib, ...}: {
options = lib.mkIf options.ollama.enable {
services.ollama = {
enable = true;
acceleration = "rocm";
};
};
}

3
system/options.nix
View file

@ -1,6 +1,7 @@
{lib, ...}: { {lib, ...}: {
options.gaming.enable = lib.mkEnableOption "Enable gaming"; options.gaming.enable = lib.mkEnableOption "Enable gaming";
config.gaming.enable = lib.mkDefault false;
options.ollama.enable = lib.mkEnableOption "Install Ollama for local LLMs";
options.hyprlandOverrides = lib.mkOption { options.hyprlandOverrides = lib.mkOption {
# type = lib.types.attributeSet; # type = lib.types.attributeSet;