Moved from xdg.config to home.file lib.mkForce
This commit is contained in:
+15
-39
@@ -1605,7 +1605,6 @@ This module will import all necessities.
|
||||
{
|
||||
imports = [
|
||||
./apps/ollama.nix
|
||||
#./apps/default-apps.nix
|
||||
./apps/theme.nix
|
||||
./desktop/hypridle.nix
|
||||
./desktop/hyprland.nix
|
||||
@@ -1665,7 +1664,7 @@ in
|
||||
{
|
||||
# Ensure script exists in ~/.config/hypr/scripts/
|
||||
home.file."${targetRel}" = {
|
||||
source = repoScript;
|
||||
source = lib.mkForce repoScript;
|
||||
executable = true;
|
||||
};
|
||||
}
|
||||
@@ -1689,7 +1688,7 @@ in
|
||||
];
|
||||
# Sync repo wallpapers (including videos/) into ~/nixos_conf/wallpaperstuff
|
||||
home.file."${userRelRoot}" = {
|
||||
source = repoWallpaperDir;
|
||||
source = lib.mkForce repoWallpaperDir;
|
||||
recursive = true;
|
||||
};
|
||||
systemd.user.services.mpvpaper-wallpaper = {
|
||||
@@ -1738,7 +1737,7 @@ in
|
||||
home.packages = [ pkgs.wpaperd ];
|
||||
# Sync everything *except* wallpaper.conf into ~/nixos_conf/wallpaperstuff
|
||||
home.file."${userRelRoot}" = {
|
||||
source = repoWallpapersOnly;
|
||||
source = lib.mkForce repoWallpapersOnly;
|
||||
recursive = true;
|
||||
};
|
||||
# Now safely overwrite the config every activation (no HM collision)
|
||||
@@ -1778,7 +1777,7 @@ in
|
||||
programs.waybar.enable = true;
|
||||
programs.waybar.style = lib.mkForce ""; # Schakel standaardstijl uit
|
||||
home.file.".config/waybar/config" = {
|
||||
source = "${repoWaybarDir}/config.jsonc";
|
||||
source = lib.mkForce "${repoWaybarDir}/config.jsonc";
|
||||
};
|
||||
# Overschrijf style.css handmatig na alle andere stappen
|
||||
home.activation.waybarStyle = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
@@ -1803,10 +1802,10 @@ in
|
||||
home.packages = [ pkgs.hyprlock ];
|
||||
# Gebruik home.file voor echte bestanden (geen symlinks)
|
||||
home.file.".config/hypr/lock.png" = {
|
||||
source = lockPngSrc;
|
||||
source = lib.mkForce lockPngSrc;
|
||||
};
|
||||
home.file.".config/hypr/hyprlock.conf" = {
|
||||
source = hyprlockConf;
|
||||
source = lib.mkForce hyprlockConf;
|
||||
};
|
||||
}
|
||||
#+end_src
|
||||
@@ -1821,7 +1820,7 @@ in
|
||||
{
|
||||
home.packages = [ pkgs.hypridle ];
|
||||
home.file.".config/hypr/hypridle.conf" = {
|
||||
source = hypridleConf;
|
||||
source = lib.mkForce hypridleConf;
|
||||
};
|
||||
}
|
||||
#+end_src
|
||||
@@ -1855,18 +1854,18 @@ in
|
||||
};
|
||||
# Copy repo configs/scripts into ~/.config (als echte bestanden)
|
||||
home.file."${targetRel}" = {
|
||||
source = repoConf;
|
||||
source = lib.mkForce repoConf;
|
||||
};
|
||||
home.file."${targetOverflowRel}" = {
|
||||
source = repoOverflowScript;
|
||||
source = lib.mkForce repoOverflowScript;
|
||||
executable = true;
|
||||
};
|
||||
home.file."${targetPerMonitor}" = {
|
||||
source = repoPerMonitorScript;
|
||||
source = lib.mkForce repoPerMonitorScript;
|
||||
executable = true;
|
||||
};
|
||||
home.file."${targetSwitchScript}" = {
|
||||
source = repoSwitchScript;
|
||||
source = lib.mkForce repoSwitchScript;
|
||||
executable = true;
|
||||
};
|
||||
}
|
||||
@@ -1887,10 +1886,10 @@ in
|
||||
home.packages = [ pkgs.hyprshell ];
|
||||
# Gebruik home.file voor echte bestanden (geen symlinks)
|
||||
home.file.".config/hyprshell/config.ron" = {
|
||||
source = cfgRon;
|
||||
source = lib.mkForce cfgRon;
|
||||
};
|
||||
home.file.".config/hyprshell/styles.css" = {
|
||||
source = cssFile;
|
||||
source = lib.mkForce cssFile;
|
||||
};
|
||||
# Autostart (systemd user service)
|
||||
systemd.user.services.hyprshell = {
|
||||
@@ -1908,7 +1907,6 @@ in
|
||||
WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
#+end_src
|
||||
|
||||
|
||||
@@ -1938,7 +1936,7 @@ in
|
||||
};
|
||||
# Gebruik home.file voor echte bestanden (geen symlinks)
|
||||
home.file.".config/hypr/scripts/lid-lock.sh" = {
|
||||
source = lidLockScript;
|
||||
source = lib.mkForce lidLockScript;
|
||||
executable = true;
|
||||
};
|
||||
xdg.portal = {
|
||||
@@ -2017,20 +2015,6 @@ You'll notice the color values in multiple places outside this as well.
|
||||
}
|
||||
#+end_src
|
||||
|
||||
** Default-apps
|
||||
This is where you can set defaults
|
||||
#+begin_src nix :tangle home/apps/defaults-apps.nix :noweb tangle :mkdirp yes.
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
xdg.mimeApps.enable = true;
|
||||
xdg.mimeApps.defaultApplications = {
|
||||
"x-scheme-handler/http" = [ "app.zen_browser.zen.desktop" ];
|
||||
"x-scheme-handler/https" = [ "app.zen_browser.zen.desktop" ];
|
||||
"text/html" = [ "app.zen_browser.zen.desktop" ];
|
||||
};
|
||||
}
|
||||
#+end_src
|
||||
|
||||
** Hyperexpo
|
||||
hyprexpo gets installed and configured
|
||||
#+begin_src nix :tangle home/desktop/hyprexpo.nix :noweb tangle :mkdirp yes.
|
||||
@@ -2062,7 +2046,6 @@ hyprexpo gets installed and configured
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
#+end_src
|
||||
|
||||
** Alacritty
|
||||
@@ -2409,27 +2392,22 @@ Zsh gets installed and configured
|
||||
The configuration mentioned in ./assets/conf/dev/terminal/starship.toml will be added to enabled shells
|
||||
#+begin_src nix :tangle home/dev/starship.nix :noweb tangle :mkdirp yes
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
|
||||
let
|
||||
repoStarshipToml = flakeRoot.outPath + "/assets/conf/dev/terminal/starship.toml";
|
||||
|
||||
# The exact key that appears in the error:
|
||||
targetKey = "${config.home.homeDirectory}/.config/starship.toml";
|
||||
in
|
||||
{
|
||||
xdg.enable = true;
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
enableBashIntegration = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
|
||||
# Force the *actual conflicting option* (home.file."<abs path>".source)
|
||||
home.file."${targetKey}".source = lib.mkForce repoStarshipToml;
|
||||
}
|
||||
|
||||
#+end_src
|
||||
|
||||
** Other Settings
|
||||
@@ -2619,7 +2597,6 @@ These are listed here.
|
||||
|
||||
** Initialization
|
||||
Now starts the main emacs configuration.
|
||||
|
||||
#+begin_src emacs-lisp :tangle home/dev/emacs/init.el :mkdirp yes
|
||||
;;; package --- Summary - My minimal Emacs init file -*- lexical-binding: t -*-
|
||||
|
||||
@@ -3028,8 +3005,7 @@ Only a few more things left. Specifically the machine level extra settings.
|
||||
** Traveldroid
|
||||
The configuration for the laptop does not change much. Most changes are because the hardware is different.
|
||||
*** System Level
|
||||
Nothing specific for the laptop.
|
||||
|
||||
Anything specific for the laptop.
|
||||
#+begin_src nix :tangle machines/traveldroid/configuration.nix :noweb tangle :mkdirp yes
|
||||
{ user, ... } : {
|
||||
imports =
|
||||
|
||||
Reference in New Issue
Block a user