Compare commits

...

3 commits

Author SHA1 Message Date
d9ce46b2c9
chore: bump lock
Some checks failed
/ test (push) Failing after 10m54s
2025-03-16 02:44:12 +01:00
f8975e0896
fix: rsyncd having port issues 2025-03-16 02:40:24 +01:00
6f9054f69b
chore: new tailscale system tray, fix warnings 2025-03-16 02:40:10 +01:00
8 changed files with 48 additions and 39 deletions

30
flake.lock generated
View file

@ -52,11 +52,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740485968, "lastModified": 1741786315,
"narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +163,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740199244, "lastModified": 1742070442,
"narHash": "sha256-BiNUbNWLcG8AuKiAZmJ8tS+fr+JO8vGwB7QQ54cezKk=", "narHash": "sha256-xPDSLswRazXLlceqc2+VdbKKG2m/OXCjTzU9O/Bs4ZQ=",
"owner": "feel-co", "owner": "feel-co",
"repo": "hjem", "repo": "hjem",
"rev": "829109220c14352990bee4cf092f4918f45fb6a1", "rev": "ae49a5a2e013c710d2b2cf046ae365d08eae75b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741579508, "lastModified": 1741955947,
"narHash": "sha256-skRbH+UF2ES+msEa+KWi7AQFX73S+QsGlPsyCU6XyE0=", "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "744f749dd6fbc1489591ea370b95156858629cb9", "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +221,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1741325094, "lastModified": 1741792691,
"narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "rev": "e1f12151258b12c567f456d8248e4694e9390613",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -265,11 +265,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1741379970, "lastModified": 1741851582,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -12,6 +12,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.vscode = { programs.vscode = {
package = pkgs.vscode; package = pkgs.vscode;
profiles.default = {
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
rust-lang.rust-analyzer rust-lang.rust-analyzer
@ -23,12 +24,6 @@ in
editor.formatOnSave = true; editor.formatOnSave = true;
terminal.integrated.inheritEnv = false; terminal.integrated.inheritEnv = false;
git.autofetch = true; git.autofetch = true;
remote.SSH = {
connectTimeout = 60;
useLocalServer = true;
remotePlatform = {
"192.168.122.152" = "linux";
};
}; };
}; };
}; };

View file

@ -16,7 +16,7 @@
editor = "${pkgs.neovim}/bin/nvim"; editor = "${pkgs.neovim}/bin/nvim";
}; };
init = { init = {
defaultBranch = "master"; defaultBranch = "main";
}; };
merge = { merge = {
conflictstyle = "diff3"; conflictstyle = "diff3";

View file

@ -15,7 +15,6 @@
server = { server = {
rsync-daemon = { rsync-daemon = {
enable = true; enable = true;
port = 9523;
openFirewall = true; openFirewall = true;
location = "/mnt/backups"; location = "/mnt/backups";
address = "100.64.0.6"; address = "100.64.0.6";

View file

@ -26,7 +26,7 @@ in
default = false; default = false;
description = "Whether to open the firewall"; description = "Whether to open the firewall";
}; };
port = mkPortOption 9523 "rsyncd"; port = mkPortOption 873 "rsyncd";
address = mkOption { address = mkOption {
type = nonEmptyStr; type = nonEmptyStr;
default = "0.0.0.0"; default = "0.0.0.0";
@ -80,6 +80,7 @@ in
modules.fixes.services.rsyncd = { modules.fixes.services.rsyncd = {
enable = true; enable = true;
inherit (cfg) port;
socketActivated = true; socketActivated = true;
settings = { settings = {
globalSection = { globalSection = {

View file

@ -33,7 +33,6 @@ in
Type = "simple"; Type = "simple";
ExecStart = "/bin/sh -lc ${cfg.package}/bin/nysh"; ExecStart = "/bin/sh -lc ${cfg.package}/bin/nysh";
Restart = "on-failure"; Restart = "on-failure";
NoNewPrivileges = true; NoNewPrivileges = true;
}; };
}; };

View file

@ -18,6 +18,7 @@ let
enum enum
bool bool
; ;
inherit (lib.my) getExe;
cfg = config.modules.services.tailscale; cfg = config.modules.services.tailscale;
in in
{ {
@ -86,14 +87,29 @@ in
description = "tailscale system tray"; description = "tailscale system tray";
wantedBy = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ];
after = [ "graphical-session.target" ]; after = [ "graphical-session.target" ];
path = [ pkgs.polkit ]; path = with pkgs; [
polkit
tailscale
];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = "/bin/sh -lc ${pkgs.tailscale-systray}/bin/tailscale-systray"; ExecStart = getExe pkgs.tail-tray;
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 1; RestartSec = 1;
TimeoutStopSec = 10; TimeoutStopSec = 10;
IPAddressDeny = "any"; IPAddressDeny = "any";
NoNewPrivileges = true;
ProtectClock = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectKernelLogs = true;
SystemCallFilter = "~@clock @cpu-emulation @debug @obsolete @module @mount @raw-io @reboot @swap";
# ProtectControlGroups = true;
#RestrictNamespaces = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
}; };
}; };
}; };

View file

@ -26,7 +26,6 @@ in
] ]
++ (with pkgs; [ ++ (with pkgs; [
keepassxc keepassxc
digikam
fragments fragments
element-desktop element-desktop
libreoffice libreoffice