diff --git a/Droidnix/README.org b/Droidnix/README.org index fc93713f8..c830babf3 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -10,6 +10,7 @@ [[#introduction][Introduction]] [[#the-assets-folder][The Assets Folder]] [[#the-actual-code][The Actual Code]] +[[#the-config-files][The Config Files]] --- @@ -343,7 +344,7 @@ in { ** =generated/modules/traveldroid/apps/kitty.nix= This file sets up Kitty terminal #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/kitty.nix :noweb tangle :mkdirp yes :eval never-html -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, flakeRoot... }: let ################################# @@ -355,7 +356,7 @@ let ################################# # Paths to assets ################################# - assetPath = ../../../assets/traveldroid/conf/${moduleName}; + assetPath = "${flakeRoot}/.config/kitty"; programFiles = builtins.readDir assetPath; # Convert asset files into a nix attribute set @@ -407,7 +408,7 @@ let username = config.defaultUser or "henrov"; # Path to the starship config in assets - starshipConfSrc = "${flakeRoot}/assets/traveldroid/conf/starship.toml"; + starshipConfSrc = "${flakeRoot}/generated/.config/starship.toml"; in { ################################# @@ -1178,21 +1179,21 @@ This sets the networking. * generated/users -** =generated/users/copy_2_home.nix= +** =generated/users/copy_config_2_config.nix= This copies stuff to the user home-folder -#+BEGIN_SRC nix :tangle generated/users/copy_2_home.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/users/copy_config_2_config.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, lib, flakeRoot, ... }: let username = config.users.users.defaultUser or "henrov"; - homeDir = "/home/${username}"; - assetPath = "${flakeRoot}/assets/copy_2_home"; + configDir = "/home/${username}/.config"; + assetPath = "${flakeRoot}/.config"; in { environment.systemPackages = [ pkgs.rsync ]; systemd.services.copyAssets = { - description = "Copy assets to ${username}'s home directory"; + description = "Copy assets to ${username}'s .config directory"; wantedBy = [ "multi-user.target" ]; # oneshot service runs once at boot @@ -1201,24 +1202,24 @@ in # Always use /bin/sh -c for multi-line commands serviceConfig.ExecStart = '' /bin/sh -c ' - echo "Copying assets from ${assetPath} to ${homeDir}/Droidnix ..." + echo "Copying assets from ${assetPath} to ${configDir} ..." if [ ! -d "${assetPath}" ]; then echo "ERROR: ${assetPath} does not exist" exit 1 fi - mkdir -p "${homeDir}/Droidnix" - chown u+rwx ${username}:${username} "${homeDir}/Droidnix" + mkdir -p "${configDir}" + chown -R u+rwx ${username}:${username} "${configDir}" - ${pkgs.rsync}/bin/rsync -a --no-owner --no-group "${assetPath}/" "${homeDir}/" + ${pkgs.rsync}/bin/rsync -a --no-owner --no-group "${assetPath}/" "${configDir}/" # Fix .config permissions - mkdir -p "${homeDir}/.config" - chown -R ${username}:${username} "${homeDir}/.config" - chmod u+rwx "${homeDir}/.config" + mkdir -p "${configDir}" + chown -R ${username}:${username} "${configDir}" + chmod -R u+rwx "${configDir}" - echo "Done copying assets." + echo "Done copying config files." ' ''; }; @@ -1273,24 +1274,9 @@ in * These are all the prepared config files - -** =.config/chromium/NativeMessagingHosts/com.1password.1password.json= -These are the config files for .config/chromium/NativeMessagingHosts -#+BEGIN_SRC json :tangle generated/.config/chromium/NativeMessagingHosts/com.1password.1password.json :noweb tangle :mkdirp yes :eval never-html -{ - "name": "com.1password.1password", - "description": "1Password BrowserSupport", - "path": "/run/wrappers/bin/1Password-BrowserSupport", - "type": "stdio", - "allowed_origins": [ - "chrome-extension://hjlinigoblmkhjejkmbegnoaljkphmgo/", - "chrome-extension://bkpbhnjcbehoklfkljkkbbmipaphipgl/", - "chrome-extension://gejiddohjgogedgjnonbofjigllpkmbf/", - "chrome-extension://khgocmkkpikpnmmkgmdnfckapcdkgfaf/", - "chrome-extension://aeblfdkhhhdcdjpifhhbdiojplfjncoa/", - "chrome-extension://dppgmdbiimibapkepcbdbmkaabgiofem/" - ] -}#+END_SRC +:PROPERTIES: +:CUSTOM_ID: he-config-files +:END: ** =.config/hypr/animations.conf= These are the config files for .config/hypr diff --git a/Droidnix/generated/.config/hypr/animations.conf b/Droidnix/generated/.config/hypr/animations.conf new file mode 100644 index 000000000..69f58ee96 --- /dev/null +++ b/Droidnix/generated/.config/hypr/animations.conf @@ -0,0 +1,12 @@ +# ./assets/conf/desktop/hypr/animations.conf + +animations { + enabled = yes + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default +} diff --git a/Droidnix/generated/modules/traveldroid/apps/kitty.nix b/Droidnix/generated/modules/traveldroid/apps/kitty.nix index 7ebc33ce4..dac965261 100644 --- a/Droidnix/generated/modules/traveldroid/apps/kitty.nix +++ b/Droidnix/generated/modules/traveldroid/apps/kitty.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, flakeRoot... }: let ################################# @@ -10,7 +10,7 @@ let ################################# # Paths to assets ################################# - assetPath = ../../../assets/traveldroid/conf/${moduleName}; + assetPath = "${flakeRoot}/.config/kitty"; programFiles = builtins.readDir assetPath; # Convert asset files into a nix attribute set diff --git a/Droidnix/generated/modules/traveldroid/apps/starship.nix b/Droidnix/generated/modules/traveldroid/apps/starship.nix index 4450be7d6..8ac5570f8 100644 --- a/Droidnix/generated/modules/traveldroid/apps/starship.nix +++ b/Droidnix/generated/modules/traveldroid/apps/starship.nix @@ -5,7 +5,7 @@ let username = config.defaultUser or "henrov"; # Path to the starship config in assets - starshipConfSrc = "${flakeRoot}/assets/traveldroid/conf/starship.toml"; + starshipConfSrc = "${flakeRoot}/generated/.config/starship.toml"; in { ################################# diff --git a/Droidnix/generated/users/copy_2_home.nix b/Droidnix/generated/users/copy_config_2_config.nix similarity index 55% rename from Droidnix/generated/users/copy_2_home.nix rename to Droidnix/generated/users/copy_config_2_config.nix index f5fa5128a..4e11672e5 100644 --- a/Droidnix/generated/users/copy_2_home.nix +++ b/Droidnix/generated/users/copy_config_2_config.nix @@ -2,14 +2,14 @@ let username = config.users.users.defaultUser or "henrov"; - homeDir = "/home/${username}"; - assetPath = "${flakeRoot}/assets/copy_2_home"; + configDir = "/home/${username}/.config"; + assetPath = "${flakeRoot}/.config"; in { environment.systemPackages = [ pkgs.rsync ]; systemd.services.copyAssets = { - description = "Copy assets to ${username}'s home directory"; + description = "Copy assets to ${username}'s .config directory"; wantedBy = [ "multi-user.target" ]; # oneshot service runs once at boot @@ -18,24 +18,24 @@ in # Always use /bin/sh -c for multi-line commands serviceConfig.ExecStart = '' /bin/sh -c ' - echo "Copying assets from ${assetPath} to ${homeDir}/Droidnix ..." + echo "Copying assets from ${assetPath} to ${configDir} ..." if [ ! -d "${assetPath}" ]; then echo "ERROR: ${assetPath} does not exist" exit 1 fi - mkdir -p "${homeDir}/Droidnix" - chown u+rwx ${username}:${username} "${homeDir}/Droidnix" + mkdir -p "${configDir}" + chown -R u+rwx ${username}:${username} "${configDir}" - ${pkgs.rsync}/bin/rsync -a --no-owner --no-group "${assetPath}/" "${homeDir}/" + ${pkgs.rsync}/bin/rsync -a --no-owner --no-group "${assetPath}/" "${configDir}/" # Fix .config permissions - mkdir -p "${homeDir}/.config" - chown -R ${username}:${username} "${homeDir}/.config" - chmod u+rwx "${homeDir}/.config" + mkdir -p "${configDir}" + chown -R ${username}:${username} "${configDir}" + chmod -R u+rwx "${configDir}" - echo "Done copying assets." + echo "Done copying config files." ' ''; };