Compare commits

..

4 Commits

Author SHA1 Message Date
52159cd2d3 fix wrong file
Some checks are pending
Flake.lock / build (push) Waiting to run
2024-08-31 13:54:57 +02:00
68e00be7d1 user-places depending on user 2024-08-31 13:53:24 +02:00
c0c3280e34 change syncthing id 2024-08-31 13:44:41 +02:00
52213a512f syncthing settings per host 2024-08-31 13:39:45 +02:00
9 changed files with 473 additions and 6 deletions

View File

@ -0,0 +1,215 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xbel>
<xbel xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:kdepriv="http://www.kde.org/kdepriv" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info">
<info>
<metadata owner="http://www.kde.org">
<kde_places_version>4</kde_places_version>
<GroupState-Places-IsHidden>false</GroupState-Places-IsHidden>
<GroupState-Remote-IsHidden>false</GroupState-Remote-IsHidden>
<GroupState-Devices-IsHidden>false</GroupState-Devices-IsHidden>
<GroupState-RemovableDevices-IsHidden>false</GroupState-RemovableDevices-IsHidden>
<GroupState-Tags-IsHidden>false</GroupState-Tags-IsHidden>
<withRecentlyUsed>true</withRecentlyUsed>
<GroupState-RecentlySaved-IsHidden>false</GroupState-RecentlySaved-IsHidden>
<withBaloo>true</withBaloo>
<GroupState-SearchFor-IsHidden>false</GroupState-SearchFor-IsHidden>
</metadata>
</info>
<bookmark href="file:///home/deck">
<title>Home</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-home"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/0</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Schreibtisch">
<title>Desktop</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-desktop"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/1</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>true</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Bilder">
<title>Pictures</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-pictures"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/7</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Code">
<title>Code</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-git"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820821/2</ID>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Dokumente">
<title>Documents</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-documents"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/2</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Downloads">
<title>Downloads</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-downloads"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/3</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Musik">
<title>Music</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-music"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/6</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/%C3%96ffentlich">
<title>Öffentlich</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-public"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820827/3</ID>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Schreibtisch">
<title>Schreibtisch</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-desktop"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820837/4</ID>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Videos">
<title>Videos</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-videos"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/8</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Vorlagen">
<title>Vorlagen</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-templates"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820856/5</ID>
</metadata>
</info>
</bookmark>
<bookmark href="smb://administrator@server.chrayed.de/Daten">
<title>Daten</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="network-workgroup"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820812/0</ID>
</metadata>
</info>
</bookmark>
<bookmark href="remote:/">
<title>Network</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-network"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/4</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="trash:/">
<title>Trash</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-trash"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/5</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="recentlyused:/files">
<title>Recent Files</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="document-open-recent"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/9</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="recentlyused:/locations">
<title>Recent Locations</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-open-recent"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/10</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<separator>
<info>
<metadata owner="http://www.kde.org">
<UDI>/org/freedesktop/UDisks2/block_devices/nvme0n1p2</UDI>
<isSystemItem>true</isSystemItem>
<uuid>27c4c28c-0cd4-4d41-bdcd-0145c5d61a5a</uuid>
</metadata>
</info>
</separator>
</xbel>

View File

@ -0,0 +1,215 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xbel>
<xbel xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:kdepriv="http://www.kde.org/kdepriv" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info">
<info>
<metadata owner="http://www.kde.org">
<kde_places_version>4</kde_places_version>
<GroupState-Places-IsHidden>false</GroupState-Places-IsHidden>
<GroupState-Remote-IsHidden>false</GroupState-Remote-IsHidden>
<GroupState-Devices-IsHidden>false</GroupState-Devices-IsHidden>
<GroupState-RemovableDevices-IsHidden>false</GroupState-RemovableDevices-IsHidden>
<GroupState-Tags-IsHidden>false</GroupState-Tags-IsHidden>
<withRecentlyUsed>true</withRecentlyUsed>
<GroupState-RecentlySaved-IsHidden>false</GroupState-RecentlySaved-IsHidden>
<withBaloo>true</withBaloo>
<GroupState-SearchFor-IsHidden>false</GroupState-SearchFor-IsHidden>
</metadata>
</info>
<bookmark href="file:///home/deck">
<title>Home</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-home"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/0</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Schreibtisch">
<title>Desktop</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-desktop"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/1</ID>
<isSystemItem>true</isSystemItem>
<IsHidden>true</IsHidden>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Bilder">
<title>Pictures</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-pictures"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/7</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Code">
<title>Code</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-git"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820821/2</ID>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Dokumente">
<title>Documents</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-documents"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/2</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Downloads">
<title>Downloads</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-downloads"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/3</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Musik">
<title>Music</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-music"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/6</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/%C3%96ffentlich">
<title>Öffentlich</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-public"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820827/3</ID>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Schreibtisch">
<title>Schreibtisch</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-desktop"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820837/4</ID>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Videos">
<title>Videos</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-videos"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/8</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="file:///home/deck/Vorlagen">
<title>Vorlagen</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-templates"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820856/5</ID>
</metadata>
</info>
</bookmark>
<bookmark href="smb://administrator@server.chrayed.de/Daten">
<title>Daten</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="network-workgroup"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1723820812/0</ID>
</metadata>
</info>
</bookmark>
<bookmark href="remote:/">
<title>Network</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-network"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/4</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="trash:/">
<title>Trash</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="user-trash"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/5</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="recentlyused:/files">
<title>Recent Files</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="document-open-recent"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/9</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<bookmark href="recentlyused:/locations">
<title>Recent Locations</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:icon name="folder-open-recent"/>
</metadata>
<metadata owner="http://www.kde.org">
<ID>1722875040/10</ID>
<isSystemItem>true</isSystemItem>
</metadata>
</info>
</bookmark>
<separator>
<info>
<metadata owner="http://www.kde.org">
<UDI>/org/freedesktop/UDisks2/block_devices/nvme0n1p2</UDI>
<isSystemItem>true</isSystemItem>
<uuid>27c4c28c-0cd4-4d41-bdcd-0145c5d61a5a</uuid>
</metadata>
</info>
</separator>
</xbel>

View File

@ -58,7 +58,6 @@
./modules/system/lact
./modules/system/retrodeck
./modules/system/steam
./modules/system/syncthing
];
serverSystemModules = [
@ -88,6 +87,7 @@
modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ displaySystemModules ++ gamingSystemModules ++ [
./hosts/${hostName}
./modules/system/jovian-${hostName}
./modules/system/syncthing-${hostName}
{
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
];
@ -106,6 +106,7 @@
modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ gamingSystemModules ++ [
./hosts/${hostName}
./modules/system/jovian-${hostName}
./modules/system/syncthing-${hostName}
{
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
];
@ -124,6 +125,7 @@
modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ gamingSystemModules ++ [
./hosts/${hostName}
./modules/system/jovian-${hostName}
./modules/system/syncthing-${hostName}
{
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
];
@ -141,6 +143,7 @@
specialArgs = {inherit user; inherit hostName; inherit system;};
modules = externalSystemModules ++ baseSystemModules ++ serverSystemModules ++ [
./hosts/${hostName}
./modules/system/syncthing-${hostName}
{
home-manager.users.${user}.imports = baseUserModules ++ serverUserModules ++ [
];

View File

@ -0,0 +1,4 @@
{ user, ... }:
{
}

View File

@ -0,0 +1,3 @@
{ user, ... }:
{
}

View File

@ -1,5 +1,7 @@
{ user, ... }:
{
networking.firewall.allowedTCPPorts = [ 8384 22000 ];
networking.firewall.allowedUDPPorts = [ 22000 21027 ];
services = {
syncthing = {
enable = true;
@ -10,13 +12,12 @@ services = {
overrideFolders = true;
settings = {
devices = {
"workstation" = { id = "3TLJKSV-QURWERW-PZ7FUI4-LXL22PU-CFXXWRN-UBWTSPK-BJLHVWD-VMHEOQ2"; };
"steamdeck" = { id = "WOVNOIM-PCQX56E-WUWRCFO-7JFBAWF-QCE564I-4KXAHYW-ONZHHOT-DPHCEQ6"; };
"workstation" = { id = "JKW7OC4-WUQJS3V-M7UYBCI-2T52P5L-HT5GP6F-FDANKRZ-SFBOJ2S-6G5A4QQ"; };
};
folders = {
"Decky-Loader" = {
path = "/var/lib/decky-loader";
devices = [ "workstation" "steamdeck"];
devices = [ "workstation" ];
};
};
};

View File

@ -0,0 +1,26 @@
{ user, ... }:
{
networking.firewall.allowedTCPPorts = [ 8384 22000 ];
networking.firewall.allowedUDPPorts = [ 22000 21027 ];
services = {
syncthing = {
enable = true;
user = "root";
dataDir = "/${user}/sync";
configDir = "/${user}/syncthing";
overrideDevices = true;
overrideFolders = true;
settings = {
devices = {
"steamdeck" = { id = "FRVFN5U-CAJCDOR-CXOCKGI-FHHVCYP-MYVCVPK-LN53JOU-YFYB5HZ-5W4IMAW"; };
};
folders = {
"Decky-Loader" = {
path = "/var/lib/decky-loader";
devices = [ "steamdeck"];
};
};
};
};
};
}

View File

@ -1,4 +1,4 @@
{ user, ... }:
{ user, hostName, ... }:
{
# Configuration Files
home.file."Code/.directory".source = ../../../dotfiles/directory;
@ -8,7 +8,7 @@
home.file.".config/kwinrulesrc".source = ../../../dotfiles/kwinrulesrc;
# Use user Variables
#home.file.".local/share/user-places.xbel".source = ../../../dotfiles/user-places.xbel;
home.file.".local/share/user-places.xbel".source = ../../../dotfiles/user-places.xbel-${hostName};
# Wallpaper