From 58a049c93a0d7342970adb5e17f802cffbfd0406 Mon Sep 17 00:00:00 2001 From: Henro Veijer Date: Mon, 2 Mar 2026 18:12:22 +0100 Subject: [PATCH] Working on making assets/conf obsolete --- henrovnix_ok/README.org | 28 ++++++++++++++++++---------- henrovnix_ok/flake.nix | 9 +++++---- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/henrovnix_ok/README.org b/henrovnix_ok/README.org index b3b320260..b5e5aa548 100755 --- a/henrovnix_ok/README.org +++ b/henrovnix_ok/README.org @@ -702,14 +702,6 @@ We also add a devshell that makes editing this repository easier in emacs. <> <> catppuccin.nixosModules.catppuccin # theme - - # Copying ./assets/config/.config to ~/.config - # Ensure the script is executable and available - environment.systemPackages = [ pkgs.bash ]; - # Add the activation script - system.activationScripts.recreateConfig = lib.mkAfter "setupNetworking" '' - ${self}/assets/scripts/recreate_config.sh - ''; ]; specialArgs = { @@ -1629,6 +1621,7 @@ This module will import all necessities. ./dev/starship.nix ./dev/zsh.nix ./dev/emacs + ./copy_config.nix ]; <> @@ -2336,7 +2329,7 @@ Comments describe the emacs package and what it does. } #+end_src -** Early Initialization +** Early EMACS Initialization There are some emacs settings that can be configured before the gui shows up. And some of them help increase performance and let the gui show up that much faster. These are listed here. @@ -2436,7 +2429,7 @@ These are listed here. ;;; early-init.el ends here #+end_src -** Initialization +** EMACS 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 -*- @@ -2922,6 +2915,21 @@ This is mostly about configuring the monitor. And laptop specific utilities. } #+end_src +* Copy Files 2 homefolder +This makes sure all ./assets/copy_stuff ends up in the right folder +#+begin_src nix :tangle home/dev/zsh.nix :noweb tangle :mkdirp yes. +{ config, pkgs, lib, ... }: +{ + # Ensure the script is executable and available + environment.systemPackages = [ pkgs.bash ]; + + # Add the activation script + system.activationScripts.recreateConfig = lib.mkAfter "setupNetworking" '' + ${config.flakeRoot.outPath}/assets/scripts/recreate_config.sh + ''; +} +#+end_src + * README Utils *** Headers This script adds a =DO NOT MODIFY= header to all the generated nix files. diff --git a/henrovnix_ok/flake.nix b/henrovnix_ok/flake.nix index 3a8873acd..6c66080d5 100644 --- a/henrovnix_ok/flake.nix +++ b/henrovnix_ok/flake.nix @@ -35,7 +35,8 @@ machines = [ pkgs = import nixpkgs { inherit (user) system; }; -in +in!1!1Salou2@ +CV { nixosConfigurations = builtins.listToAttrs ( builtins.map (machine: { @@ -50,12 +51,12 @@ in { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - + home-manager.extraSpecialArgs = { inherit user inputs; flakeRoot.outPath= inputs.self; }; - + home-manager.backupFileExtension = "backup"; home-manager.users.${user.username} = { imports = [ @@ -64,7 +65,7 @@ in ]; }; } - + catppuccin.nixosModules.catppuccin # theme # Copying ./assets/config/.config to ~/.config