Regenerated
This commit is contained in:
+20
-34
@@ -10,6 +10,7 @@
|
|||||||
[[#introduction][Introduction]]
|
[[#introduction][Introduction]]
|
||||||
[[#the-assets-folder][The Assets Folder]]
|
[[#the-assets-folder][The Assets Folder]]
|
||||||
[[#the-actual-code][The Actual Code]]
|
[[#the-actual-code][The Actual Code]]
|
||||||
|
[[#the-config-files][The Config Files]]
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -343,7 +344,7 @@ in {
|
|||||||
** =generated/modules/traveldroid/apps/kitty.nix=
|
** =generated/modules/traveldroid/apps/kitty.nix=
|
||||||
This file sets up Kitty terminal
|
This file sets up Kitty terminal
|
||||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/kitty.nix :noweb tangle :mkdirp yes :eval never-html
|
#+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
|
let
|
||||||
#################################
|
#################################
|
||||||
@@ -355,7 +356,7 @@ let
|
|||||||
#################################
|
#################################
|
||||||
# Paths to assets
|
# Paths to assets
|
||||||
#################################
|
#################################
|
||||||
assetPath = ../../../assets/traveldroid/conf/${moduleName};
|
assetPath = "${flakeRoot}/.config/kitty";
|
||||||
programFiles = builtins.readDir assetPath;
|
programFiles = builtins.readDir assetPath;
|
||||||
|
|
||||||
# Convert asset files into a nix attribute set
|
# Convert asset files into a nix attribute set
|
||||||
@@ -407,7 +408,7 @@ let
|
|||||||
username = config.defaultUser or "henrov";
|
username = config.defaultUser or "henrov";
|
||||||
|
|
||||||
# Path to the starship config in assets
|
# Path to the starship config in assets
|
||||||
starshipConfSrc = "${flakeRoot}/assets/traveldroid/conf/starship.toml";
|
starshipConfSrc = "${flakeRoot}/generated/.config/starship.toml";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
#################################
|
#################################
|
||||||
@@ -1178,21 +1179,21 @@ This sets the networking.
|
|||||||
|
|
||||||
* generated/users
|
* generated/users
|
||||||
|
|
||||||
** =generated/users/copy_2_home.nix=
|
** =generated/users/copy_config_2_config.nix=
|
||||||
This copies stuff to the user home-folder
|
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, ... }:
|
{ config, pkgs, lib, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
username = config.users.users.defaultUser or "henrov";
|
username = config.users.users.defaultUser or "henrov";
|
||||||
homeDir = "/home/${username}";
|
configDir = "/home/${username}/.config";
|
||||||
assetPath = "${flakeRoot}/assets/copy_2_home";
|
assetPath = "${flakeRoot}/.config";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
environment.systemPackages = [ pkgs.rsync ];
|
environment.systemPackages = [ pkgs.rsync ];
|
||||||
|
|
||||||
systemd.services.copyAssets = {
|
systemd.services.copyAssets = {
|
||||||
description = "Copy assets to ${username}'s home directory";
|
description = "Copy assets to ${username}'s .config directory";
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
# oneshot service runs once at boot
|
# oneshot service runs once at boot
|
||||||
@@ -1201,24 +1202,24 @@ in
|
|||||||
# Always use /bin/sh -c for multi-line commands
|
# Always use /bin/sh -c for multi-line commands
|
||||||
serviceConfig.ExecStart = ''
|
serviceConfig.ExecStart = ''
|
||||||
/bin/sh -c '
|
/bin/sh -c '
|
||||||
echo "Copying assets from ${assetPath} to ${homeDir}/Droidnix ..."
|
echo "Copying assets from ${assetPath} to ${configDir} ..."
|
||||||
|
|
||||||
if [ ! -d "${assetPath}" ]; then
|
if [ ! -d "${assetPath}" ]; then
|
||||||
echo "ERROR: ${assetPath} does not exist"
|
echo "ERROR: ${assetPath} does not exist"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "${homeDir}/Droidnix"
|
mkdir -p "${configDir}"
|
||||||
chown u+rwx ${username}:${username} "${homeDir}/Droidnix"
|
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
|
# Fix .config permissions
|
||||||
mkdir -p "${homeDir}/.config"
|
mkdir -p "${configDir}"
|
||||||
chown -R ${username}:${username} "${homeDir}/.config"
|
chown -R ${username}:${username} "${configDir}"
|
||||||
chmod u+rwx "${homeDir}/.config"
|
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
|
* These are all the prepared config files
|
||||||
|
:PROPERTIES:
|
||||||
** =.config/chromium/NativeMessagingHosts/com.1password.1password.json=
|
:CUSTOM_ID: he-config-files
|
||||||
These are the config files for .config/chromium/NativeMessagingHosts
|
:END:
|
||||||
#+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
|
|
||||||
|
|
||||||
** =.config/hypr/animations.conf=
|
** =.config/hypr/animations.conf=
|
||||||
These are the config files for .config/hypr
|
These are the config files for .config/hypr
|
||||||
|
|||||||
@@ -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
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ lib, pkgs, config, ... }:
|
{ lib, pkgs, config, flakeRoot... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
#################################
|
#################################
|
||||||
@@ -10,7 +10,7 @@ let
|
|||||||
#################################
|
#################################
|
||||||
# Paths to assets
|
# Paths to assets
|
||||||
#################################
|
#################################
|
||||||
assetPath = ../../../assets/traveldroid/conf/${moduleName};
|
assetPath = "${flakeRoot}/.config/kitty";
|
||||||
programFiles = builtins.readDir assetPath;
|
programFiles = builtins.readDir assetPath;
|
||||||
|
|
||||||
# Convert asset files into a nix attribute set
|
# Convert asset files into a nix attribute set
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ let
|
|||||||
username = config.defaultUser or "henrov";
|
username = config.defaultUser or "henrov";
|
||||||
|
|
||||||
# Path to the starship config in assets
|
# Path to the starship config in assets
|
||||||
starshipConfSrc = "${flakeRoot}/assets/traveldroid/conf/starship.toml";
|
starshipConfSrc = "${flakeRoot}/generated/.config/starship.toml";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
#################################
|
#################################
|
||||||
|
|||||||
+11
-11
@@ -2,14 +2,14 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
username = config.users.users.defaultUser or "henrov";
|
username = config.users.users.defaultUser or "henrov";
|
||||||
homeDir = "/home/${username}";
|
configDir = "/home/${username}/.config";
|
||||||
assetPath = "${flakeRoot}/assets/copy_2_home";
|
assetPath = "${flakeRoot}/.config";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
environment.systemPackages = [ pkgs.rsync ];
|
environment.systemPackages = [ pkgs.rsync ];
|
||||||
|
|
||||||
systemd.services.copyAssets = {
|
systemd.services.copyAssets = {
|
||||||
description = "Copy assets to ${username}'s home directory";
|
description = "Copy assets to ${username}'s .config directory";
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
# oneshot service runs once at boot
|
# oneshot service runs once at boot
|
||||||
@@ -18,24 +18,24 @@ in
|
|||||||
# Always use /bin/sh -c for multi-line commands
|
# Always use /bin/sh -c for multi-line commands
|
||||||
serviceConfig.ExecStart = ''
|
serviceConfig.ExecStart = ''
|
||||||
/bin/sh -c '
|
/bin/sh -c '
|
||||||
echo "Copying assets from ${assetPath} to ${homeDir}/Droidnix ..."
|
echo "Copying assets from ${assetPath} to ${configDir} ..."
|
||||||
|
|
||||||
if [ ! -d "${assetPath}" ]; then
|
if [ ! -d "${assetPath}" ]; then
|
||||||
echo "ERROR: ${assetPath} does not exist"
|
echo "ERROR: ${assetPath} does not exist"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "${homeDir}/Droidnix"
|
mkdir -p "${configDir}"
|
||||||
chown u+rwx ${username}:${username} "${homeDir}/Droidnix"
|
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
|
# Fix .config permissions
|
||||||
mkdir -p "${homeDir}/.config"
|
mkdir -p "${configDir}"
|
||||||
chown -R ${username}:${username} "${homeDir}/.config"
|
chown -R ${username}:${username} "${configDir}"
|
||||||
chmod u+rwx "${homeDir}/.config"
|
chmod -R u+rwx "${configDir}"
|
||||||
|
|
||||||
echo "Done copying assets."
|
echo "Done copying config files."
|
||||||
'
|
'
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
Reference in New Issue
Block a user