diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9cb2216..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.stfolder/ -.stversions/ diff --git a/1 b/1 deleted file mode 100644 index 85c4ab9..0000000 --- a/1 +++ /dev/null @@ -1,8 +0,0 @@ -add zerotier - -JJ: Change ID: uzrwrzxz -JJ: This commit contains the following changes: -JJ: M modules/hosts/candlekeep.nix -JJ: M modules/hosts/grymforge.nix -JJ: -JJ: Lines starting with "JJ:" (like this one) will be removed. diff --git a/flake.lock b/flake.lock index 22ce82f..894b0f9 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "crane": { "locked": { - "lastModified": 1776396856, - "narHash": "sha256-aRJpIJUlZLaf06ekPvqjuU46zvO9K90IxJGpbqodkPs=", + "lastModified": 1775790182, + "narHash": "sha256-pG2RWVQY0Pe+rmmXJx+Jpyi+JcgjWzS18m7fcD1B64Q=", "owner": "ipetkov", "repo": "crane", - "rev": "28462d6d55c33206ffa5a56c7907ca3125ed788f", + "rev": "534982f1c41834b101e381b07b1121a4f065a374", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1775176642, - "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "179704030c5286c729b5b0522037d1d51341022c", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -212,18 +212,20 @@ "gnome-shell": { "flake": false, "locked": { + "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "gnome-49", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -233,11 +235,11 @@ ] }, "locked": { - "lastModified": 1776721614, - "narHash": "sha256-zGuW7C4tsScib2560yE5VV6lY/MdRs30aU9cbg3RP+U=", + "lastModified": 1774715571, + "narHash": "sha256-MMjHif46sc/iLF9JqxBhFaueSPRcjPeP9AiujERH6N0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c555a4a34a260493be5adb795c54e013c58f2d34", + "rev": "557f5e38ce94ef0f02f05de7ae65057d4b2a89a6", "type": "github" }, "original": { @@ -310,11 +312,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776714033, - "narHash": "sha256-O+34yexfSxigXyb5usuzqac7vRHy6gYv7BtNtzDhQNo=", + "lastModified": 1774620721, + "narHash": "sha256-QucawBaJ6Rl5JWAXAbpouXM1MsvlzwCsPGl3zOwLtzw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "32bed686f4fd8274a5e4a58d071687a74e19821e", + "rev": "fb83d584532282f585cd02f3aa513e98b843e7e7", "type": "github" }, "original": { @@ -343,11 +345,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1776706941, - "narHash": "sha256-nnv27JD0FOOqs1Hh67kydXFzZoEu8e0QyMf0R9AXaIw=", + "lastModified": 1774616418, + "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "e9c182a13c1d12762351ec01ce0ec711d41b0337", + "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", "type": "github" }, "original": { @@ -363,11 +365,11 @@ ] }, "locked": { - "lastModified": 1776575850, - "narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=", + "lastModified": 1775970782, + "narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3b9653a107c736222b5ae0d4036dd3b885219065", + "rev": "bedba5989b04614fc598af9633033b95a937933f", "type": "github" }, "original": { @@ -378,11 +380,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -394,11 +396,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -409,11 +411,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1776434932, - "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", + "lastModified": 1774388614, + "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", + "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", "type": "github" }, "original": { @@ -425,11 +427,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1775579569, - "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=", + "lastModified": 1774610258, + "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfd9566f82a6e1d55c30f861879186440614696e", + "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611", "type": "github" }, "original": { @@ -441,11 +443,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1776255774, - "narHash": "sha256-psVTpH6PK3q1htMJpmdz1hLF5pQgEshu7gQWgKO6t6Y=", + "lastModified": 1775763530, + "narHash": "sha256-BuTK9z1QEwWPOIakQ1gCN4pa4VwVJpfptYCviy2uOGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "566acc07c54dc807f91625bb286cb9b321b5f42a", + "rev": "b0188973b4b2a5b6bdba8b65381d6cd09a533da0", "type": "github" }, "original": { @@ -463,11 +465,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776734539, - "narHash": "sha256-jERXeeyV/c9nrXEoYhfgsRJ/KodsBWJ01B/oZMBS1vk=", + "lastModified": 1774807148, + "narHash": "sha256-/2YNEHj/OVdp4iXMRNxLlfkABb6mBo0VmWwymInpwkI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "fc43ab5c38f6eeceef0734d7b0ef011557b612a4", + "rev": "e41c78e2facbbf4b03f34ea56eea922e546d77c8", "type": "github" }, "original": { @@ -486,11 +488,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776585574, - "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", + "lastModified": 1774734782, + "narHash": "sha256-rq/8sJPI8wD4P3CXSyvW/dPuAa+qXGdqzAKM3eunZ+4=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", + "rev": "8e216ba101d761b8a71f359246941d50e22bad3f", "type": "github" }, "original": { @@ -511,11 +513,11 @@ ] }, "locked": { - "lastModified": 1775228139, - "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -536,11 +538,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1776695587, - "narHash": "sha256-XXn/vKRCiwCkAzXvOxNyLE0mRDfFa0axQDJYMikaGY8=", + "lastModified": 1774736237, + "narHash": "sha256-uQ+Was7QP9Bupr0XZyZXOAD32Ox8z2mJnevT2FmDwS8=", "owner": "notashelf", "repo": "nvf", - "rev": "4de19e12094a30d3cd205822536e0c3c57cba66c", + "rev": "a0636d5c977743851c91d3c2e74bfac90be48835", "type": "github" }, "original": { @@ -574,11 +576,11 @@ ] }, "locked": { - "lastModified": 1776395632, - "narHash": "sha256-Mi1uF5f2FsdBIvy+v7MtsqxD3Xjhd0ARJdwoqqqPtJo=", + "lastModified": 1775790837, + "narHash": "sha256-RAHjn8sjgfF3D17BaV8iv69o3P+L9aCuE36PFwzoqHU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8087ff1f47fff983a1fba70fa88b759f2fd8ae97", + "rev": "c913e0b9525311f103b7e1463ebb0f28c6865d8d", "type": "github" }, "original": { @@ -609,11 +611,11 @@ ] }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1774303811, + "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", "type": "github" }, "original": { @@ -636,17 +638,18 @@ ], "nur": "nur", "systems": "systems_3", + "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776170745, - "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", + "lastModified": 1774124764, + "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", "owner": "danth", "repo": "stylix", - "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", + "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", "type": "github" }, "original": { @@ -715,6 +718,23 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, "tinted-kitty": { "flake": false, "locked": { @@ -734,11 +754,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1772661346, - "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "13b5b0c299982bb361039601e2d72587d6846294", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -750,11 +770,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1772934010, - "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -766,11 +786,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1772909925, - "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -788,11 +808,11 @@ ] }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", "type": "github" }, "original": { @@ -806,11 +826,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1776740142, - "narHash": "sha256-kyU4D8J6AgyuNX+CTkFMBGL2ydSesa9TxEElVWFeX4Y=", + "lastModified": 1775505758, + "narHash": "sha256-akjVahwblAas9ea/pCopiQcmzAkNpRmPxh4j1nHPNV4=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "7e1b8c7be49c9f2bd3236a7b92819bbedf4e8495", + "rev": "483f1b2e52c919a4eb495b441b2245289406ed6b", "type": "github" }, "original": { @@ -860,11 +880,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1776491188, - "narHash": "sha256-sjMs63OaRhwCrl46v1A+K2EJdqnw63Pc7BMnHqiU790=", + "lastModified": 1775885119, + "narHash": "sha256-YNcOUBFt3dYFbhpgIGEPTdBi5vH3LbEGfRoTUokfmyw=", "owner": "dj95", "repo": "zjstatus", - "rev": "f7f58bd3cb30352a8da85926636b8ec41770098a", + "rev": "4ef69ff55930373d60f6c85afc39b2494850feeb", "type": "github" }, "original": { diff --git a/modules/aspects/roles.nix b/modules/aspects/roles.nix index 1375c2f..70bc506 100644 --- a/modules/aspects/roles.nix +++ b/modules/aspects/roles.nix @@ -58,7 +58,6 @@ "pass" "zk" "gui-programs" - "steam" ]; laptop.features = [ diff --git a/modules/features/desktop/steam.nix b/modules/features/desktop/steam.nix deleted file mode 100644 index 2365b39..0000000 --- a/modules/features/desktop/steam.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - ... -}: - -{ - config.dendritic.features.steam = { - nixosModules = [ - ( - { config, pkgs, ... }: - { - hardware.graphics.enable32Bit = true; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - - gamescopeSession = { - enable = true; - args = [ - "-F fsr" - "-f" - ]; - }; - - package = pkgs.steam.override { - extraPkgs = - pkgs: with pkgs; [ - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXScrnSaver - libpng - libpulseaudio - libvorbis - stdenv.cc.cc.lib - libkrb5 - keyutils - ]; - }; - }; - - environment.sessionVariables = { - # Proton GE flag for FSR - WINE_FULLSCREEN_FSR = "1"; - }; - - environment.systemPackages = with pkgs; [ - protonup-ng - steam-devices-udev-rules - scanmem - mangohud - ]; - } - ) - ]; - }; -} diff --git a/modules/features/security/security-kernel-hardened.nix b/modules/features/security/security-kernel-hardened.nix index 9865b1d..4b7403e 100644 --- a/modules/features/security/security-kernel-hardened.nix +++ b/modules/features/security/security-kernel-hardened.nix @@ -5,7 +5,7 @@ ( { pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_hardened; security = { protectKernelImage = true; diff --git a/modules/features/security/systemd/security-systemd-sshd.nix b/modules/features/security/systemd/security-systemd-sshd.nix index 66e1439..09442c3 100644 --- a/modules/features/security/systemd/security-systemd-sshd.nix +++ b/modules/features/security/systemd/security-systemd-sshd.nix @@ -6,7 +6,7 @@ { ... }: { systemd.services.sshd.serviceConfig = { - # NoNewPrivileges = true; + NoNewPrivileges = true; ProtectSystem = "strict"; ProtectHome = "read-only"; ProtectClock = true; @@ -21,7 +21,7 @@ PrivateDevices = true; RestrictNamespaces = true; RestrictRealtime = true; - # RestrictSUIDSGID = true; + RestrictSUIDSGID = true; MemoryDenyWriteExecute = true; LockPersonality = true; DevicePolicy = "closed"; diff --git a/modules/features/system/system-nix.nix b/modules/features/system/system-nix.nix index f312621..4523914 100644 --- a/modules/features/system/system-nix.nix +++ b/modules/features/system/system-nix.nix @@ -3,7 +3,7 @@ config.dendritic.features.system-nix = { nixosModules = [ ( - { config, pkgs, ... }: + { config, ... }: let user = config.dendritic.current.primaryUser; @@ -29,16 +29,6 @@ services.fstrim.enable = true; time.timeZone = "America/Toronto"; - nix.settings = { - substituters = [ - "https://cache.gwg313.xyz/mycache?priority=5" - ]; - trusted-public-keys = [ - "mycache:ovUjiiyQNUGjK8yZA4dPV1f8tIfCZrGIubdWvWpdvtc=" - ]; - }; - - environment.systemPackages = [ pkgs.attic-client ]; } ) ]; diff --git a/modules/hosts/candlekeep.nix b/modules/hosts/candlekeep.nix index 8e56df0..48cf5f6 100644 --- a/modules/hosts/candlekeep.nix +++ b/modules/hosts/candlekeep.nix @@ -18,7 +18,6 @@ ../nixos/hosts/candlekeep/ssh.nix ../nixos/hosts/candlekeep/nfs.nix ../nixos/hosts/candlekeep/networking.nix - ../nixos/hosts/candlekeep/zerotier.nix ]; }; } diff --git a/modules/hosts/grymforge.nix b/modules/hosts/grymforge.nix index 1c9fd86..21cff5e 100644 --- a/modules/hosts/grymforge.nix +++ b/modules/hosts/grymforge.nix @@ -17,7 +17,6 @@ ../nixos/hosts/candlekeep/ssh.nix ../nixos/hosts/candlekeep/nfs.nix ../nixos/hosts/candlekeep/networking.nix - ../nixos/hosts/candlekeep/zerotier.nix ]; }; } diff --git a/modules/nixos/hosts/candlekeep/syncthing.nix b/modules/nixos/hosts/candlekeep/syncthing.nix index 81ea73d..93dac43 100644 --- a/modules/nixos/hosts/candlekeep/syncthing.nix +++ b/modules/nixos/hosts/candlekeep/syncthing.nix @@ -62,19 +62,7 @@ }; "zettelkasten" = { - path = "/home/gwg313/my-notes/"; - devices = [ "grymforge" ]; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; - - "nix-config" = { - path = "/home/gwg313/nix-config/"; + path = "/home/gwg313/zettelkasten/"; devices = [ "grymforge" ]; versioning = { type = "staggered"; diff --git a/modules/nixos/hosts/candlekeep/zerotier.nix b/modules/nixos/hosts/candlekeep/zerotier.nix deleted file mode 100644 index 7605cdf..0000000 --- a/modules/nixos/hosts/candlekeep/zerotier.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - ... -}: -{ - services.zerotierone = { - joinNetworks = [ - "ebe7fbd445359e9d" - ]; - enable = true; - }; - - networking.extraHosts = '' - 192.168.194.54 graphene.zt - 192.168.191.218 candlekeep.zt - 192.168.191.201 grymforge.zt - 192.168.191.202 cache.gwg313.xyz - ''; -} diff --git a/modules/nixos/hosts/grymforge/syncthing.nix b/modules/nixos/hosts/grymforge/syncthing.nix deleted file mode 100644 index 6db4bcd..0000000 --- a/modules/nixos/hosts/grymforge/syncthing.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - config, - user, - inputs, - ... -}: -{ - services.syncthing = { - enable = true; - dataDir = "/home/gwg313"; - openDefaultPorts = true; - configDir = "/home/gwg313/.config/syncthing"; - user = "gwg313"; - group = "users"; - guiAddress = "127.0.0.1:8384"; - - overrideDevices = true; - overrideFolders = true; - - settings = { - gui = { - user = inputs.secrets.syncthing.gui_user; - password = inputs.secrets.syncthing.gui_password; - }; - devices = { - "candlekeep" = { - id = inputs.secrets.syncthing.candlekeep_id; - }; - }; - - folders = { - "repos" = { - path = "/home/gwg313/repos"; - devices = [ "candlekeep" ]; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; - "documents" = { - path = "/home/gwg313/Documents"; - devices = [ "candlekeep" ]; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; - "password-store" = { - path = "/home/gwg313/.local/share/password-store"; - devices = [ "candlekeep" ]; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; - - "zettelkasten" = { - path = "/home/gwg313/my-notes/"; - devices = [ "candlekeep" ]; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; - - "nix-config" = { - path = "/home/gwg313/nix-config/"; - devices = [ "candlekeep" ]; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; - }; - }; - }; -} diff --git a/modules/nixos/hosts/grymforge/zerotier.nix b/modules/nixos/hosts/grymforge/zerotier.nix deleted file mode 100644 index 7605cdf..0000000 --- a/modules/nixos/hosts/grymforge/zerotier.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - ... -}: -{ - services.zerotierone = { - joinNetworks = [ - "ebe7fbd445359e9d" - ]; - enable = true; - }; - - networking.extraHosts = '' - 192.168.194.54 graphene.zt - 192.168.191.218 candlekeep.zt - 192.168.191.201 grymforge.zt - 192.168.191.202 cache.gwg313.xyz - ''; -}