tidying
This commit is contained in:
parent
4049c17abd
commit
4c752c1889
3 changed files with 43 additions and 43 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
# https://github.com/gitwatch/gitwatch
|
# https://github.com/gitwatch/gitwatch
|
||||||
# https://nixos.wiki/wiki/Syncthing
|
# https://nixos.wiki/wiki/Syncthing
|
||||||
{ pkgs, primaryUser, homeDir, ... }:
|
{ pkgs, user, homeDirectory, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -15,47 +15,47 @@
|
||||||
services = {
|
services = {
|
||||||
|
|
||||||
## Gitwatch
|
## Gitwatch
|
||||||
gitwatch = {
|
#gitwatch = {
|
||||||
|
|
||||||
Keyring = { # keyring backup, dont have a nextcloud (yet)
|
#Keyring = { # keyring backup, dont have a nextcloud (yet)
|
||||||
enable = true;
|
#enable = true;
|
||||||
user = "${primaryUser}";
|
#user = "${user}";
|
||||||
path = "${homeDir}/Keyring/";
|
#path = "${homeDirectory}/Keyring/";
|
||||||
remote = "git@codeberg.org:serenity-F/keyring.git";
|
#remote = "git@codeberg.org:serenity-F/keyring.git";
|
||||||
};
|
#};
|
||||||
|
|
||||||
Notes = { # notes backup, not paying for obsidian backup (lol)
|
#Notes = { # notes backup, not paying for obsidian backup (lol)
|
||||||
enable = true;
|
#enable = true;
|
||||||
user = "${primaryUser}";
|
#user = "${user}";
|
||||||
path = "${homeDir}/Notes/";
|
#path = "${homeDirectory}/Notes/";
|
||||||
remote = "git@codeberg.org:serenity-F/notes.git";
|
#remote = "git@codeberg.org:serenity-F/notes.git";
|
||||||
};
|
#};
|
||||||
};
|
#};
|
||||||
|
|
||||||
## Syncthing
|
## Syncthing
|
||||||
syncthing = {
|
syncthing = {
|
||||||
enable = false; # easy toggle
|
enable = false; # easy toggle
|
||||||
dataDir = "${homeDir}"; # defaults to primaryUser's homedir
|
dataDir = "${homeDirectory}"; # defaults to primaryUser's homedir
|
||||||
openDefaultPorts = true; # opens the default firewall ports
|
openDefaultPorts = true; # opens the default firewall ports
|
||||||
#configDir = "${homeDir}/.config/syncthing"; # defaults to primaryUser's homedir
|
#configDir = "${homeDirectory}/.config/syncthing"; # defaults to primaryUser's homedir
|
||||||
user = "${primaryUser}"; # uses primaryUser to run the service
|
user = "${user}"; # uses primaryUser to run the service
|
||||||
group = "users"; # runs in the users group
|
group = "users"; # runs in the users group
|
||||||
## For some reason is using `localhost:8384`
|
## For some reason is using `localhost:8384`
|
||||||
#guiAddress = "home.syncthing:8384"; # default web address for the GUI
|
#guiAddress = "home.syncthing:8384"; # default web address for the GUI
|
||||||
settings = {
|
#settings = {
|
||||||
## WebApp GUI
|
## WebApp GUI
|
||||||
#user = "serenity";
|
#user = "serenity";
|
||||||
#password = "password";
|
#password = "password";
|
||||||
|
|
||||||
## Syncthing Folders
|
## Syncthing Folders
|
||||||
overrideFolders = true; # force these folder on activation
|
#overrideFolders = true; # force these folder on activation
|
||||||
folders = {
|
#folders = {
|
||||||
|
|
||||||
"Keyring" = { # folder for password/secrets vault
|
#"Keyring" = { # folder for password/secrets vault
|
||||||
enable = true; # easy toggle - OFF for now
|
#enable = true; # easy toggle - OFF for now
|
||||||
id = "k158k-hvzk3";
|
#id = "k158k-hvzk3";
|
||||||
path = "${homeDir}/Keyring"; # defaults to primaryUser's homedir
|
#path = "${homeDirectory}/Keyring"; # defaults to primaryUser's homedir
|
||||||
devices = [
|
#devices = [
|
||||||
#"Hecate"
|
#"Hecate"
|
||||||
#"Persephone"
|
#"Persephone"
|
||||||
];
|
];
|
||||||
|
|
@ -64,24 +64,24 @@
|
||||||
#type = "simple"; # nothing fancy, keeps x number of copies
|
#type = "simple"; # nothing fancy, keeps x number of copies
|
||||||
#params = { keep = "3"; }; # number of copies to keep
|
#params = { keep = "3"; }; # number of copies to keep
|
||||||
#};
|
#};
|
||||||
};
|
#};
|
||||||
|
|
||||||
"Notes" = { # folder for organisation/notes vault
|
#"Notes" = { # folder for organisation/notes vault
|
||||||
enable = true; # easy toggle
|
#enable = true; # easy toggle
|
||||||
id = "h0ay3-l8snk";
|
#id = "h0ay3-l8snk";
|
||||||
path = "${homeDir}/Notes"; # defaults to primaryUser's homedir
|
#path = "${homeDirectory}/Notes"; # defaults to primaryUser's homedir
|
||||||
devices = [
|
#devices = [
|
||||||
#"Hecate"
|
#"Hecate"
|
||||||
#"Persephone"
|
#"Persephone"
|
||||||
];
|
#];
|
||||||
#versioning = { # versioning, for added redundancy
|
#versioning = { # versioning, for added redundancy
|
||||||
# disabled for now as we have versioning through git
|
# disabled for now as we have versioning through git
|
||||||
#type = "simple"; # nothing fancy, keeps x number of copies
|
#type = "simple"; # nothing fancy, keeps x number of copies
|
||||||
#params = { keep = "3"; }; # number of copies to keep
|
#params = { keep = "3"; }; # number of copies to keep
|
||||||
#};
|
#};
|
||||||
};
|
#};
|
||||||
|
|
||||||
};
|
#};
|
||||||
|
|
||||||
## Syncthing Devices
|
## Syncthing Devices
|
||||||
#overrideDevices = true; # force these devices on activation
|
#overrideDevices = true; # force these devices on activation
|
||||||
|
|
@ -93,7 +93,7 @@
|
||||||
#"36WUSM4-HFYOGWP-33JHBPI-WR2TXXE-ZX3PFMB-QH6BMXM-DQ523ZF-FD7M3AI";
|
#"36WUSM4-HFYOGWP-33JHBPI-WR2TXXE-ZX3PFMB-QH6BMXM-DQ523ZF-FD7M3AI";
|
||||||
#"Persephone".id = "REALLY-LONG-PERSEPHONE-SYNCTHING-KEY-HERE"; # disabled for testing
|
#"Persephone".id = "REALLY-LONG-PERSEPHONE-SYNCTHING-KEY-HERE"; # disabled for testing
|
||||||
#};
|
#};
|
||||||
};
|
#};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
## https://nix-community.github.io/home-manager/options.xhtml#opt-home.file
|
## https://nix-community.github.io/home-manager/options.xhtml#opt-home.file
|
||||||
## https://nix-community.github.io/home-manager/options.xhtml#opt-home.activation
|
## https://nix-community.github.io/home-manager/options.xhtml#opt-home.activation
|
||||||
|
|
||||||
{ inputs, outputs, pkgs, config, flakePath, disksPath, primaryUser, ... }:
|
{ inputs, outputs, pkgs, config, flakePath, disksPath, user, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
#'';
|
#'';
|
||||||
|
|
||||||
## Mounts Asphodel to typical media location
|
## Mounts Asphodel to typical media location
|
||||||
#fileSystems."/run/media/${primaryUser}/Asphodel".device =
|
#fileSystems."/run/media/${user}/Asphodel".device =
|
||||||
#"/dev/mapper/Asphodel";
|
#"/dev/mapper/Asphodel";
|
||||||
|
|
||||||
#home.file = { # Files and directories to copy to ${homeDir}
|
#home.file = { # Files and directories to copy to ${homeDir}
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
## Example format for home.file
|
## Example format for home.file
|
||||||
#"Foo" = { # Name for the copied file
|
#"Foo" = { # Name for the copied file
|
||||||
#source = ./Foo; # Source is relative to this file
|
#source = ./Foo; # Source is relative to this file
|
||||||
#target = "Desired/Path/To/Foo"; # Target path for Foo within ${homeDir}
|
#target = "Desired/Path/To/Foo"; # Target path for Foo within ${homeDirectory}
|
||||||
#recursive = true; # Unsure if necessary for most things
|
#recursive = true; # Unsure if necessary for most things
|
||||||
#};
|
#};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ inputs, outputs, lib, config, pkgs, primaryUser, homeDir, flakePath, disksPath
|
{ inputs, outputs, lib, config, pkgs, user, homeDirectory, flakePath, disksPath
|
||||||
, ... }:
|
, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
@ -17,10 +17,10 @@
|
||||||
supportsDryActivation = false;
|
supportsDryActivation = false;
|
||||||
## Prints status of run commmand with a cute message if successful
|
## Prints status of run commmand with a cute message if successful
|
||||||
text = ''
|
text = ''
|
||||||
cd ~ && ln -s Disks /run/media/${primaryUser}/*
|
cd ~ && ln -s Disks /run/media/${user}/*
|
||||||
echo "Current variables required are:"
|
echo "Current variables required are:"
|
||||||
echo "primaryUser - ${primaryUser}"
|
echo "primaryUser - ${user}"
|
||||||
echo "homeDir - ${homeDir}"
|
echo "homeDir - ${homeDirectory}"
|
||||||
echo "current paths linked are:"
|
echo "current paths linked are:"
|
||||||
echo "flakePath - ${flakePath}"
|
echo "flakePath - ${flakePath}"
|
||||||
echo "disksPath - ${disksPath}"
|
echo "disksPath - ${disksPath}"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue