Testing lib.mkForce
This commit is contained in:
+304
-309
File diff suppressed because it is too large
Load Diff
@@ -1642,12 +1642,10 @@ This Home Manager Nix module (ai.nix) installs the Ollama package and configures
|
|||||||
|
|
||||||
#+begin_src nix :tangle home/apps/ollama.nix :noweb tangle :mkdirp yes
|
#+begin_src nix :tangle home/apps/ollama.nix :noweb tangle :mkdirp yes
|
||||||
{ config, lib, pkgs, flakeRoot, ... }:
|
{ config, lib, pkgs, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
ollamaConfPath = flakeRoot + "/assets/conf/apps/ai/ollama/ollama.conf";
|
ollamaConfPath = flakeRoot + "/assets/conf/apps/ai/ollama/ollama.conf";
|
||||||
envVars = builtins.fromJSON (builtins.readFile ollamaConfPath);
|
envVars = builtins.fromJSON (builtins.readFile ollamaConfPath);
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -1655,8 +1653,6 @@ in
|
|||||||
environmentVariables = envVars;
|
environmentVariables = envVars;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
** Powermenu
|
** Powermenu
|
||||||
@@ -2084,7 +2080,6 @@ in
|
|||||||
# Copy repo configs/scripts into ~/.config
|
# Copy repo configs/scripts into ~/.config
|
||||||
xdg.configFile."${targetRel}" = {
|
xdg.configFile."${targetRel}" = {
|
||||||
source = lib.mkForce repoConf;
|
source = lib.mkForce repoConf;
|
||||||
|
|
||||||
};
|
};
|
||||||
xdg.configFile."${targetOverflowRel}" = {
|
xdg.configFile."${targetOverflowRel}" = {
|
||||||
source = lib.mkForce repoOverflowScript;
|
source = lib.mkForce repoOverflowScript;
|
||||||
@@ -2162,7 +2157,7 @@ in
|
|||||||
|
|
||||||
};
|
};
|
||||||
xdg.configFile."hypr/scripts/lid-lock.sh" = {
|
xdg.configFile."hypr/scripts/lid-lock.sh" = {
|
||||||
source = lib.mkForce flakeRoot + "/assets/conf/desktop/hypr/scripts/lid-lock.sh";
|
source = lib.mkForce (flakeRoot + "/assets/conf/desktop/hypr/scripts/lid-lock.sh");
|
||||||
executable = true;
|
executable = true;
|
||||||
};
|
};
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
{ config, lib, pkgs, flakeRoot, ... }:
|
{ config, lib, pkgs, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
ollamaConfPath = flakeRoot + "/assets/conf/apps/ai/ollama/ollama.conf";
|
ollamaConfPath = flakeRoot + "/assets/conf/apps/ai/ollama/ollama.conf";
|
||||||
envVars = builtins.fromJSON (builtins.readFile ollamaConfPath);
|
envVars = builtins.fromJSON (builtins.readFile ollamaConfPath);
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ in
|
|||||||
|
|
||||||
};
|
};
|
||||||
xdg.configFile."hypr/scripts/lid-lock.sh" = {
|
xdg.configFile."hypr/scripts/lid-lock.sh" = {
|
||||||
source = lib.mkForce flakeRoot + "/assets/conf/desktop/hypr/scripts/lid-lock.sh";
|
source = lib.mkForce (flakeRoot + "/assets/conf/desktop/hypr/scripts/lid-lock.sh");
|
||||||
executable = true;
|
executable = true;
|
||||||
};
|
};
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ in
|
|||||||
# Copy repo configs/scripts into ~/.config
|
# Copy repo configs/scripts into ~/.config
|
||||||
xdg.configFile."${targetRel}" = {
|
xdg.configFile."${targetRel}" = {
|
||||||
source = lib.mkForce repoConf;
|
source = lib.mkForce repoConf;
|
||||||
|
|
||||||
};
|
};
|
||||||
xdg.configFile."${targetOverflowRel}" = {
|
xdg.configFile."${targetOverflowRel}" = {
|
||||||
source = lib.mkForce repoOverflowScript;
|
source = lib.mkForce repoOverflowScript;
|
||||||
|
|||||||
Reference in New Issue
Block a user