From ee1c1ffe64816eabd46445bbcf812bace1dbcc19 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 21 May 2024 00:49:15 +0300 Subject: [PATCH] intelnuc autoupdate + small fixes --- README.md | 6 +++-- apps/hyprland/hypr/hyprland.conf | 2 +- flake.lock | 38 ++++++++++++++++---------------- hosts/intelnuc/system.nix | 24 +++++++++++++++++++- shell.nix | 10 ++++----- 5 files changed, 52 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 397e39c..dc0749a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ -![dlaptop](https://github.com/deltathetawastaken/dotfiles/actions/workflows/dlaptop.yml/badge.svg) -![intelnuc](https://github.com/deltathetawastaken/dotfiles/actions/workflows/intelnuc.yml/badge.svg) +

+ dlaptop + intelnuc +

\ No newline at end of file diff --git a/apps/hyprland/hypr/hyprland.conf b/apps/hyprland/hypr/hyprland.conf index 407a15c..f435acc 100644 --- a/apps/hyprland/hypr/hyprland.conf +++ b/apps/hyprland/hypr/hyprland.conf @@ -4,7 +4,7 @@ #monitor=,preferred,auto,1.066667 #monitor=,preferred,90,1.066667 -monitor=eDP-1,preferred,auto,1.333333 +monitor=eDP-1,2944x1840@60,auto,1.333333 # monitor=eDP-1,preferred,auto,1.6 #monitor=eDP-1,preferred,auto,1.066667 diff --git a/flake.lock b/flake.lock index 28efd72..42ee119 100644 --- a/flake.lock +++ b/flake.lock @@ -354,11 +354,11 @@ ] }, "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", + "lastModified": 1715791817, + "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", + "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e", "type": "github" }, "original": { @@ -377,11 +377,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1715803431, - "narHash": "sha256-YFx9BSgJPKUSLOLkol9tU+5JJNOs2pQ3YN0eY1RldOE=", + "lastModified": 1716063601, + "narHash": "sha256-gAuCKupztnqai1tZ6TyCFCRbeFzbggL0Oe0vl0/cwK8=", "ref": "refs/heads/main", - "rev": "a8522db683ae260f16f8e7778561d8a54906beb1", - "revCount": 4699, + "rev": "f8857e6072bd85b95393499688872aaf7f088b5b", + "revCount": 4719, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -451,11 +451,11 @@ ] }, "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "lastModified": 1715791527, + "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1715608589, - "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=", + "lastModified": 1715879663, + "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "65c2636484e5cb00583b8a7446c3fb657f568883", + "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3", "type": "github" }, "original": { @@ -547,11 +547,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ ] }, "locked": { - "lastModified": 1714662532, - "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", + "lastModified": 1715788457, + "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1f228ba2f1f254195c0b571302b37482861abee3", + "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", "type": "github" }, "original": { diff --git a/hosts/intelnuc/system.nix b/hosts/intelnuc/system.nix index 4ffe8d0..d0e2972 100644 --- a/hosts/intelnuc/system.nix +++ b/hosts/intelnuc/system.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs,... }: +{ config, pkgs, inputs, self,... }: { imports = [ ./hardware.nix @@ -6,6 +6,28 @@ inputs.secrets.nixosModules.intelnuc ]; + system.autoUpgrade = { + enable = true; + flake = "github:deltathetawastaken/dotfiles"; + dates = "hourly"; + }; + systemd.services.nixos-upgrade = { # 1 hour timeout, default is too low + serviceConfig.TimeoutSec= 3600; + serviceConfig.TimeoutStartUSec = 3600; + serviceConfig.TimeoutStopUSec = 3600; + }; + + + + # services.autoUpdate = { + # enable = true; + # configDir = "/home/delta/Documents/dotfiles"; # Directory where your NixOS configuration is cloned + # branch = "main"; # Branch to pull updates from + # frequency = "daily"; # Update frequency: daily, weekly, monthly, etc. + # timeOfDay = "03:00"; # Time of day for the update in HH:MM format + # }; + + boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; boot.loader.grub.useOSProber = true; diff --git a/shell.nix b/shell.nix index 3d293da..30dfcad 100644 --- a/shell.nix +++ b/shell.nix @@ -19,11 +19,11 @@ shellHook = "pre-commit install &> /dev/null && gitleaks detect -v"; nativeBuildInputs = builtins.attrValues { inherit (pkgs) - # nix - # git - # age - # ssh-to-age - # sops + nix + git + age + ssh-to-age + sops gitleaks pre-commit; }; };