harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: improve formatting and update dependencies

Browse source 
Reformatted configuration files for better readability and consistency. Updated lock file dependencies to the latest revisions, ensuring compatibility and performance improvements.
This commit is contained in:
Harald Hoyer 2025-02-25 08:56:02 +01:00
parent 296d6a86b9
commit 7494fd7efd
3 changed files with 69 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -348,11 +348,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1739757849,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -759,11 +759,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1736916166, "lastModified": 1740339700,
"narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2763,11 +2763,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1736883708, "lastModified": 1740367490,
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {

60
systems/x86_64-linux/mx/rustdesk.nix
View file

@ -9,36 +9,36 @@
services.rustdesk-server.signal.relayHosts = [ "rustdesk.hoyer.world" ]; services.rustdesk-server.signal.relayHosts = [ "rustdesk.hoyer.world" ];
services.rustdesk-server.openFirewall = true; services.rustdesk-server.openFirewall = true;
/* /*
services.nginx.virtualHosts."rustdesk.hoyer.world" = { services.nginx.virtualHosts."rustdesk.hoyer.world" = {
enableACME = false; enableACME = false;
useACMEHost = "hoyer.world"; useACMEHost = "hoyer.world";
forceSSL = true; forceSSL = true;
locations = { locations = {
"/ws/id" = { "/ws/id" = {
extraConfig = '' extraConfig = ''
proxy_pass http://localhost:21118; proxy_pass http://localhost:21118;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
''; '';
}; };
"/ws/relay" = { "/ws/relay" = {
extraConfig = '' extraConfig = ''
proxy_pass http://localhost:21119; proxy_pass http://localhost:21119;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
''; '';
};
}; };
}; };
}; */
*/
} }

50
systems/x86_64-linux/sgx/fileserver.nix
View file

@ -71,25 +71,35 @@
}; };
services.syncthing = { services.syncthing = {
enable = true; enable = true;
user = "harald"; user = "harald";
dataDir = "/mnt/raid/Qmultimedia/syncthing"; # Default folder for new synced folders dataDir = "/mnt/raid/Qmultimedia/syncthing"; # Default folder for new synced folders
configDir = "/mnt/raid/Qmultimedia/syncthing/.config/syncthing"; # Folder for Syncthing's settings and keys configDir = "/mnt/raid/Qmultimedia/syncthing/.config/syncthing"; # Folder for Syncthing's settings and keys
guiAddress = "127.0.0.1:8384"; guiAddress = "127.0.0.1:8384";
settings.gui.insecureSkipHostcheck = true; settings.gui.insecureSkipHostcheck = true;
devices = { devices = {
"sgx" = { id = "2AAVSVQ-PK66I2B-2B4KWAU-TF674DG-IXNEKLF-CIWK7HG-7MUC7OW-DQQNAQM"; }; "sgx" = {
"S25" = { id = "7Q7XQXG-VF7QM6Y-HJST4V2-RWOPB3M-GHXQDLL-SRRN3IL-3PHKNOZ-D2IFIQV"; }; id = "2AAVSVQ-PK66I2B-2B4KWAU-TF674DG-IXNEKLF-CIWK7HG-7MUC7OW-DQQNAQM";
}; };
folders = { "S25" = {
"qibxq-03l4j" = { id = "7Q7XQXG-VF7QM6Y-HJST4V2-RWOPB3M-GHXQDLL-SRRN3IL-3PHKNOZ-D2IFIQV";
path = "~/logseq"; };
devices = [ "sgx" "S25" ]; };
}; folders = {
"sm-s931b_hjcb-Bilder" = { "qibxq-03l4j" = {
path = "/mnt/raid/Qmultimedia/S25-Kamera"; path = "~/logseq";
devices = [ "sgx" "S25" ]; devices = [
}; "sgx"
}; "S25"
];
};
"sm-s931b_hjcb-Bilder" = {
path = "/mnt/raid/Qmultimedia/S25-Kamera";
devices = [
"sgx"
"S25"
];
};
};
}; };
} }