From f6e4dea4681e56e7e706f56f9d6ae6c939d44ad1 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Thu, 1 May 2025 19:27:36 +0000 Subject: [PATCH 1/8] Cleanup --- dot_config/flake/flake.nix | 2 +- .../flake/machines/mal/configuration.nix | 32 +++++++++++++++++++ .../machines/mal/hardware-configuration.nix | 16 ++-------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 7649e93..45f3012 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -61,7 +61,7 @@ modules = [ ./machines/mal/configuration.nix - lix-module.nixosModules.default + # lix-module.nixosModules.default home-manager.nixosModules.home-manager { diff --git a/dot_config/flake/machines/mal/configuration.nix b/dot_config/flake/machines/mal/configuration.nix index 5443845..4d60574 100644 --- a/dot_config/flake/machines/mal/configuration.nix +++ b/dot_config/flake/machines/mal/configuration.nix @@ -156,6 +156,38 @@ in { }; }; + systemd.services."restore-nextcloud" = { + script = '' + # Remove keys + + ${secrets} + + printf "\nRestore nextcloud \n" + ${pkgs.restic}/bin/restic -r "$RESTIC_REPOSITORY/NextCloud" restore latest -vvv --target / + # ${pkgs.restic}/bin/restic -r "$RESTIC_REPOSITORY/NextCloud" check -vvv + ''; + serviceConfig = { + Type = "simple"; + User = "root"; + }; + }; + + systemd.services."restore-backups" = { + script = '' + # Remove keys + + ${secrets} + + printf "\nRestore nextcloud \n" + ${pkgs.restic}/bin/restic -r "$RESTIC_REPOSITORY/Backups" restore latest -vvv --target / + # ${pkgs.restic}/bin/restic -r "$RESTIC_REPOSITORY/NextCloud" check -vvv + ''; + serviceConfig = { + Type = "simple"; + User = "root"; + }; + }; + programs.fish.enable = true; # List services that you want to enable: diff --git a/dot_config/flake/machines/mal/hardware-configuration.nix b/dot_config/flake/machines/mal/hardware-configuration.nix index d818b4d..46b09b6 100644 --- a/dot_config/flake/machines/mal/hardware-configuration.nix +++ b/dot_config/flake/machines/mal/hardware-configuration.nix @@ -28,23 +28,11 @@ options = ["fmask=0022" "dmask=0022"]; }; - fileSystems."/mnt/store" = { - device = "nix-store"; + fileSystems."/mnt/user" = { + device = "array"; fsType = "9p"; }; - fileSystems."/nix/store" = { - depends = [ - "/mnt/store" - ]; - - device = "/mnt/store"; - fsType = "none"; - options = [ - "bind" - ]; - }; - swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking From d7ff782ee39843a3d3d41dc4bf1c939eb3eb5d4b Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Fri, 9 May 2025 09:32:35 -0400 Subject: [PATCH 2/8] cleanup --- dot_config/flake/machines/hinge/darwin.nix | 10 +--------- dot_config/flake/machines/hinge/home.nix | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dot_config/flake/machines/hinge/darwin.nix b/dot_config/flake/machines/hinge/darwin.nix index 1801c73..ace8d69 100644 --- a/dot_config/flake/machines/hinge/darwin.nix +++ b/dot_config/flake/machines/hinge/darwin.nix @@ -48,22 +48,17 @@ in { environment.systemPackages = with pkgs; [ pinentry_mac - # llvmPackages_19.clang-tools fnm pipenv sketchybar - # sbarlua lua - # android-tools jdk17 - # distrobox - conan deno @@ -100,10 +95,7 @@ in { "unzip" "xz" - "podman" - - "llvm@18" - "llvm@19" + "llvm" ]; casks = [ diff --git a/dot_config/flake/machines/hinge/home.nix b/dot_config/flake/machines/hinge/home.nix index 33700a0..b64b1a9 100644 --- a/dot_config/flake/machines/hinge/home.nix +++ b/dot_config/flake/machines/hinge/home.nix @@ -39,7 +39,7 @@ sessionVariables = { ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk"; - PATH = "$PATH:/opt/homebrew/opt/llvm@18/bin:/Users/tyler.mayoff/Library/Android/sdk/platform-tools"; + PATH = "/opt/homebrew/opt/llvm@20/bin:$PATH::/Users/tyler.mayoff/Library/Android/sdk/platform-tools"; }; file.".gnupg/gpg-agent.conf".text = '' From d220ffc5ef685cbc2e0338ff1472d7fda41328f6 Mon Sep 17 00:00:00 2001 From: Tyler Date: Mon, 12 May 2025 10:43:47 -0400 Subject: [PATCH 3/8] Update flake.nix --- dot_config/flake/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 45f3012..6a7f911 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { From 4f8b2bf193af98a1e1c0e3cb8a10a68bbf07e587 Mon Sep 17 00:00:00 2001 From: Tyler Date: Mon, 12 May 2025 10:46:52 -0400 Subject: [PATCH 4/8] Update home.nix --- dot_config/flake/machines/wash/home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix index 3159299..8659186 100644 --- a/dot_config/flake/machines/wash/home.nix +++ b/dot_config/flake/machines/wash/home.nix @@ -21,7 +21,6 @@ homeDirectory = "/home/tyler"; packages = with pkgs; [ - ventoy nom # (config.lib.nixGL.wrap renderdoc) ]; From f2e5ab2e3472b385cc14ae1dd2747ac707bbd778 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Mon, 12 May 2025 11:14:36 -0400 Subject: [PATCH 5/8] Update flake-updater.yml --- .github/workflows/flake-updater.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flake-updater.yml b/.github/workflows/flake-updater.yml index de0a5eb..23cf108 100644 --- a/.github/workflows/flake-updater.yml +++ b/.github/workflows/flake-updater.yml @@ -11,7 +11,8 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main + - run: | + curl -sSf -L https://install.lix.systems/lix | sh -s -- install - uses: DeterminateSystems/update-flake-lock@v24 with: pr-title: "Update flake.lock" # Title of PR to be created From 6afd80fc61e9032363a348de86dcd1ae8b99f82e Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Mon, 12 May 2025 11:16:23 -0400 Subject: [PATCH 6/8] Update flake-updater.yml --- .github/workflows/flake-updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flake-updater.yml b/.github/workflows/flake-updater.yml index 23cf108..cab465a 100644 --- a/.github/workflows/flake-updater.yml +++ b/.github/workflows/flake-updater.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: | - curl -sSf -L https://install.lix.systems/lix | sh -s -- install + curl -sSf -L https://install.lix.systems/lix | sh -s -- install --no-confirm - uses: DeterminateSystems/update-flake-lock@v24 with: pr-title: "Update flake.lock" # Title of PR to be created From 53755a967977af42d26cccc9ff73201abf956416 Mon Sep 17 00:00:00 2001 From: Tyler Date: Mon, 12 May 2025 11:46:14 -0400 Subject: [PATCH 7/8] Update flake.lock (#22) Co-authored-by: github-actions[bot] Co-authored-by: Tyler Mayoff --- .github/workflows/main.yml | 3 +- dot_config/flake/flake.lock | 86 ++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e9a2dc..3154173 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,8 @@ jobs: sudo docker builder prune -a df -h - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@v16 + - uses: samueldr/lix-gha-installer-action@v2025-02-26.prerelease + - uses: cachix/cachix-action@v16 with: name: tmayoff diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index f7bb6e6..fb31c94 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1745523430, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1746109800, - "narHash": "sha256-sjDpqdvbQaiA6OAsgLE4niz6hmmCpoUH0cl5zyfu6FI=", + "lastModified": 1747048878, + "narHash": "sha256-YSGK+etuuFrMo0PSMWdiIHSuEDybrgCIuyOq0V7Hmt8=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "9fe1aa7b6a1043003b38f36626dd29b52247d720", + "rev": "f430a256db90c7d6035f2d738e2e8acd5c633f16", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1745816321, - "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=", + "lastModified": 1746708654, + "narHash": "sha256-GeC99gu5H6+AjBXsn5dOhP4/ApuioGCBkufdmEIWPRs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01", + "rev": "6cb36e8327421c61e5a3bbd08ed63491b616364a", "type": "github" }, "original": { @@ -143,11 +143,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "lastModified": 1746162366, + "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", "owner": "nix-community", "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1746040799, - "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", + "lastModified": 1747021744, + "narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f217e5a319f6c186283b530f8c975e66c028433", + "rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52", "type": "github" }, "original": { @@ -407,15 +407,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", - "rev": "079528098f5998ba13c88821a2eca1005c1695de", + "lastModified": 1746827285, + "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", + "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" } }, "lix-module": { @@ -428,15 +428,15 @@ ] }, "locked": { - "lastModified": 1742943028, - "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", - "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", + "lastModified": 1746838955, + "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", + "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" } }, "nixgl": { @@ -460,11 +460,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -492,11 +492,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746810718, + "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", "type": "github" }, "original": { @@ -508,11 +508,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -607,11 +607,11 @@ ] }, "locked": { - "lastModified": 1746067100, - "narHash": "sha256-6JeEbboDvRjLwB9kzCnmWj+f+ZnMtKOe5c2F1VBpaTs=", + "lastModified": 1747017456, + "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "026e8fedefd6b167d92ed04b195c658d95ffc7a5", + "rev": "5b07506ae89b025b14de91f697eba23b48654c52", "type": "github" }, "original": { @@ -660,11 +660,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1745893500, - "narHash": "sha256-MXkFfYmufV7UA1/UY3Hw/+bBv9gNvR4vqJi6wEu3yJA=", + "lastModified": 1746143246, + "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=", "owner": "danth", "repo": "stylix", - "rev": "eb8366e23f7f4c779711965371c20da1279d9c20", + "rev": "20ace60f9cb5e179cb2256abaee505780df8e804", "type": "github" }, "original": { From a124a4ab47f5991e9159729198ff2d6b5c86f55a Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Mon, 12 May 2025 11:49:15 -0400 Subject: [PATCH 8/8] Removed mold linker --- dot_config/flake/home/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix index ae018ef..5ec8131 100644 --- a/dot_config/flake/home/common.nix +++ b/dot_config/flake/home/common.nix @@ -53,7 +53,7 @@ # Software Dev tig - mold + # mold # language servers efm-langserver