From 6ef5aa949e1cfa4e52852383d0e929ac147a88e4 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 5 Jun 2024 23:54:41 +0200 Subject: [PATCH 1/2] AAA, it no worky --- hosts/default/configuration.nix | 64 +++++++++++++++++---------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 3a3b826..9b80be3 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -267,39 +267,43 @@ flatpak.enable = true; }; - systemd.timers."update-flake" = { - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = "daily"; - Persistent = true; + systemd = { + timers."update-flake" = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = "daily"; + Persistent = true; + }; }; - }; - systemd.services."update-flake" = { - path = with pkgs; [ - git - openssh - nix - nixos-rebuild - ]; - script = '' - [[ ! -d '/root/nixconf' ]] && cd /root && git clone git@github.com:itepastra/nixconf - cd /root/nixconf - git pull - nix flake update --commit-lock-file /root/nixconf - nixos-rebuild switch --flake . - git push - ''; - serviceConfig = { - Type = "oneshot"; - User = "root"; + services = { + "update-flake" = { + path = with pkgs; [ + git + openssh + nix + nixos-rebuild + ]; + script = '' + [[ ! -d '/root/nixconf' ]] && cd /root && git clone git@github.com:itepastra/nixconf + cd /root/nixconf + git pull + nix flake update --commit-lock-file /root/nixconf + nixos-rebuild switch --flake . + git push + ''; + serviceConfig = { + Type = "oneshot"; + User = "root"; + }; + wants = [ + "network-online.target" + ]; + after = [ + "network-online.target" + ]; + }; }; - wants = [ - "network-online.target" - ]; - after = [ - "network-online.target" - ]; }; environment.etc = { From 9899e459979b50eb53ce08de2e7b80f6051243f1 Mon Sep 17 00:00:00 2001 From: Noa Auto Date: Thu, 6 Jun 2024 00:00:55 +0200 Subject: [PATCH 2/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/a838e83e21502a211b83373109a260e5ef5fbcf1' (2024-06-04) → 'github:nix-community/disko/7fc7009c892509b9bf81cb73c6575f3f9e6321f5' (2024-06-05) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=098ac916a6314a2b731532e0c85f357e3cf90d2f' (2024-06-04) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=c95845b1488b4bd63e901cbdc4cb68c27a45971b' (2024-06-05) • Updated input 'nix-minecraft': 'github:Infinidoge/nix-minecraft/6929e834c2c4eba8172eafbb7b26648319217a99' (2024-06-04) → 'github:Infinidoge/nix-minecraft/a44d959812490bd772d64df2ba38725acb9aa46d' (2024-06-05) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/50a127f8fccd0d24712c8ab146ca251f27cc4cb0' (2024-06-04) → 'github:nixos/nixpkgs/52694a4be3f361cd7616e6641b070caed9c617d9' (2024-06-05) --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 4ee6a8c..ba89008 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1717490821, - "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=", + "lastModified": 1717574802, + "narHash": "sha256-TprJdvfwdjj3co7CGZ4jPIlAdZPFwYrQjamvt2B2L4g=", "owner": "nix-community", "repo": "disko", - "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1", + "rev": "7fc7009c892509b9bf81cb73c6575f3f9e6321f5", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1717509465, - "narHash": "sha256-ObX7qHLYwCDrKVi6Log7Uh3powuyR4lL/4txOiENpgI=", + "lastModified": 1717605046, + "narHash": "sha256-1oVVblacE6uQztHTTPG6NoUzj5RErIRbmDoVNWnG6xg=", "ref": "refs/heads/main", - "rev": "098ac916a6314a2b731532e0c85f357e3cf90d2f", - "revCount": 4762, + "rev": "c95845b1488b4bd63e901cbdc4cb68c27a45971b", + "revCount": 4766, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1717464255, - "narHash": "sha256-+RM9dpf6F9CRIpouYgD2YL5zrK0vslyRYK44NO70zkc=", + "lastModified": 1717550619, + "narHash": "sha256-QxJiKxuEunrpaHsl1UmeJo4+8Q/tWCVWyUa2MJSWkD8=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "6929e834c2c4eba8172eafbb7b26648319217a99", + "rev": "a44d959812490bd772d64df2ba38725acb9aa46d", "type": "github" }, "original": { @@ -575,11 +575,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1717503908, - "narHash": "sha256-hsxbTeO6Dhobc2kELDwCgRJT9J5TotL6fS8z5P+OskI=", + "lastModified": 1717599852, + "narHash": "sha256-OVeQRahdkopKIeit2JKm80ylfE0Me/rpXvZLp+hqM3M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50a127f8fccd0d24712c8ab146ca251f27cc4cb0", + "rev": "52694a4be3f361cd7616e6641b070caed9c617d9", "type": "github" }, "original": {