diff --git a/machines/niczos/default.nix b/machines/niczos/default.nix index 203417c..3ac0873 100644 --- a/machines/niczos/default.nix +++ b/machines/niczos/default.nix @@ -63,12 +63,6 @@ in "/home/zo/dev" = { enable = true; dest = "/tmp/backups/"; - salvation.command = /* bash */ '' - SAVED_FILE="$(basename "$SRC")" - mv "$SRC" "/mfs/$SAVED_FILE"; - HASH="$(${ipfs} files stat --hash "/$SAVED_FILE")" - ${ipfs-cluster-ctl} pin add "$HASH"; - ''; }; "/home/zo/Documents" = { diff --git a/machines/niczos/hardware-configuration.nix b/machines/niczos/hardware-configuration.nix index c9084fe..7cdbc2e 100644 --- a/machines/niczos/hardware-configuration.nix +++ b/machines/niczos/hardware-configuration.nix @@ -45,10 +45,8 @@ fsType = "tmpfs"; options = [ "size=1G" - "mode=700" + "mode=600" "noexec" - "uid=1000" - "gid=1000" ]; }; diff --git a/machines/niczos/security.nix b/machines/niczos/security.nix index 68565bd..77f03fa 100644 --- a/machines/niczos/security.nix +++ b/machines/niczos/security.nix @@ -1,10 +1,7 @@ { # Classic deny all networking.firewall = { - allowedTCPPorts = [ - 49676 - 1716 - ]; - allowedUDPPorts = [ 49676 ]; + allowedTCPPorts = [ ]; + allowedUDPPorts = [ ]; }; } diff --git a/modules/nix.nix b/modules/nix.nix index b3e98fb..eb6e035 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -6,12 +6,12 @@ }; nix.settings.substituters = [ - "https://cache.lantian.pub/lantian" + "https://attic.xuyh0120.win/lantian" "https://nix-community.cachix.org" "https://cache.nixos.org/" ]; nix.settings.trusted-public-keys = [ - "lantian:WVGO7vsRMSEN+h7Lp7kv6SAmrkEXgUGbbXm7jMDjBuQ=" + "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; } diff --git a/npins/sources.json b/npins/sources.json index ad173e3..65a1212 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "release-26.05", "submodules": false, - "revision": "24f2190587513b9c2f73db112a17844ae912d965", - "url": "https://github.com/nix-community/home-manager/archive/24f2190587513b9c2f73db112a17844ae912d965.tar.gz", - "hash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=" + "revision": "ec172013fa62135f58fb58dd17ae9651e8f39727", + "url": "https://github.com/nix-community/home-manager/archive/ec172013fa62135f58fb58dd17ae9651e8f39727.tar.gz", + "hash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=" }, "jail.nix": { "type": "Git", @@ -36,10 +36,10 @@ "version_upper_bound": null, "release_prefix": null, "submodules": false, - "version": "v1.2.0", - "revision": "d4db37c6f22c63339562672babec51a8952f1325", - "url": "https://api.github.com/repos/nix-community/lanzaboote/tarball/refs/tags/v1.2.0", - "hash": "sha256-sr4Kfp6yaXUeyKL6n0Y8/ElcR3momIRC20HFc+LF22s=" + "version": "v1.1.0", + "revision": "7c9a54a7f87b4539ddbd8bda09a8a5f5f9361aa9", + "url": "https://api.github.com/repos/nix-community/lanzaboote/tarball/refs/tags/v1.1.0", + "hash": "sha256-hqijVSEETttmo8Okql9/LG0Ua34hdciKW1a5zzlj8mU=" }, "nix-cachyos-kernel": { "type": "Git", @@ -50,9 +50,9 @@ }, "branch": "release", "submodules": false, - "revision": "f20c85dac2eef06564ebc27729264f4f75ae7e1c", - "url": "https://github.com/xddxdd/nix-cachyos-kernel/archive/f20c85dac2eef06564ebc27729264f4f75ae7e1c.tar.gz", - "hash": "sha256-5LscvsaetrpuLTGJFU6zZ5n4m6aMJt2PELarem20IQo=" + "revision": "444d135dde71c1de547cf7bfd73e67145e67aebb", + "url": "https://github.com/xddxdd/nix-cachyos-kernel/archive/444d135dde71c1de547cf7bfd73e67145e67aebb.tar.gz", + "hash": "sha256-kY+k8kGBd8w4kxrw8IPzQGpnYZQV4mik2ZNHtGN0eHI=" }, "nixpkgs-26.05": { "type": "Git", @@ -63,9 +63,9 @@ }, "branch": "nixos-26.05", "submodules": false, - "revision": "7dcdd87373d72e7a2173e4db02e20d3d7f495cfd", - "url": "https://github.com/nixos/nixpkgs/archive/7dcdd87373d72e7a2173e4db02e20d3d7f495cfd.tar.gz", - "hash": "sha256-tItrb9M8eYA6WhFgmT9tpGKueri3+wRuVA952o/2xSU=" + "revision": "1bc55b9def8165e82073919945c3239903fe4dc2", + "url": "https://github.com/nixos/nixpkgs/archive/1bc55b9def8165e82073919945c3239903fe4dc2.tar.gz", + "hash": "sha256-D2aaQetafdpHxbwA4ldAxs51UX0b11pXL+JL/5L8VrM=" }, "nixpkgs-unstable": { "type": "Git", @@ -76,9 +76,9 @@ }, "branch": "nixos-unstable", "submodules": false, - "revision": "1d060086d60cb76a40cf37109f979d88a5bd6396", - "url": "https://github.com/nixos/nixpkgs/archive/1d060086d60cb76a40cf37109f979d88a5bd6396.tar.gz", - "hash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=" + "revision": "6774f7bc253789b113a4f39285dc0fa100abeacc", + "url": "https://github.com/nixos/nixpkgs/archive/6774f7bc253789b113a4f39285dc0fa100abeacc.tar.gz", + "hash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=" }, "sops-nix": { "type": "Git", @@ -89,9 +89,9 @@ }, "branch": "master", "submodules": false, - "revision": "b18e01ce148eb3efff5de2f2d3181ca53b2b2a54", - "url": "https://github.com/Mic92/sops-nix/archive/b18e01ce148eb3efff5de2f2d3181ca53b2b2a54.tar.gz", - "hash": "sha256-GoOvpdsjO5hqZuO6T6ok9u6sJEjO0iPli2zRr9oNUNw=" + "revision": "7214124c20c1542c90deb54af50e2f53ae02711f", + "url": "https://github.com/Mic92/sops-nix/archive/7214124c20c1542c90deb54af50e2f53ae02711f.tar.gz", + "hash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=" } }, "version": 7 diff --git a/roles/desktop.nix b/roles/desktop.nix index 3866544..a89f596 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -31,7 +31,6 @@ dina-font proggyfonts font-awesome - dejavu_fonts ]; time.timeZone = "Europe/Paris";