cleanup
This commit is contained in:
@@ -28,7 +28,7 @@ in
|
||||
|
||||
programs = {
|
||||
kdeconnect = {
|
||||
enable = true;
|
||||
enable = lib.mkDefault true;
|
||||
package = pkgs.gnomeExtensions.gsconnect;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -256,7 +256,7 @@ in
|
||||
openhasp = {
|
||||
plate = {
|
||||
objects = [
|
||||
{
|
||||
{
|
||||
obj = "p0b1"; # temperature label on all pages
|
||||
properties = {
|
||||
"text" = ''{{ states("sensor.thermostat_current_temperature") }}°F'';
|
||||
@@ -265,8 +265,8 @@ in
|
||||
{
|
||||
obj = "p1b2"; # light-switch toggle button
|
||||
properties = {
|
||||
"val" = ''{{ 1 if states("light.living_room_lights") == "on" else 0 }}'';
|
||||
"text" = ''{{ "\uE6E8" if is_state("light.living_room_lights", "on") else "\uE335" | e }}'';
|
||||
"val" = ''{{ 1 if states("light.living_room_lights") == "on" else 0 }}'';
|
||||
"text" = ''{{ "\uE6E8" if is_state("light.living_room_lights", "on") else "\uE335" | e }}'';
|
||||
};
|
||||
event = {
|
||||
"up" = {
|
||||
|
||||
@@ -8,18 +8,6 @@
|
||||
with lib;
|
||||
let
|
||||
cfg = config.${namespace}.services.ollama;
|
||||
|
||||
llamaPackage = pkgs.llama-cpp.overrideAttrs (_old: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
rev = "b4920";
|
||||
sha256 = "sha256-SnQIeY74JpAPRMxWcpklDH5D4CQvAgi0GYx5+ECk2J4=";
|
||||
};
|
||||
# Optionally override other attributes if you need to
|
||||
# version = "my-fork-version";
|
||||
# pname = "llama-cpp-custom";
|
||||
});
|
||||
in
|
||||
{
|
||||
imports = [ ./options.nix ];
|
||||
|
||||
@@ -64,7 +64,8 @@ in
|
||||
"power"
|
||||
"nix"
|
||||
"i2c"
|
||||
] ++ cfg.extraGroups;
|
||||
]
|
||||
++ cfg.extraGroups;
|
||||
|
||||
group = "users";
|
||||
home = "/home/${cfg.name}";
|
||||
@@ -72,6 +73,7 @@ in
|
||||
shell = lib.mkForce pkgs.zsh;
|
||||
uid = 1000;
|
||||
hashedPasswordFile = cfg.passwordFile;
|
||||
} // cfg.extraOptions;
|
||||
}
|
||||
// cfg.extraOptions;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user