From 7f3fbb6077eb52040dc2b3fcaa14a6e269bd1bb5 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Sun, 7 Apr 2024 10:34:12 +0200 Subject: [PATCH 1/3] autoupdate flake --- modules/nixos/system/autoUpgrade/default.nix | 33 ++++++++++++++++++++ systems/x86_64-linux/yggdrasil/default.nix | 8 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 modules/nixos/system/autoUpgrade/default.nix diff --git a/modules/nixos/system/autoUpgrade/default.nix b/modules/nixos/system/autoUpgrade/default.nix new file mode 100644 index 0000000..b9947c1 --- /dev/null +++ b/modules/nixos/system/autoUpgrade/default.nix @@ -0,0 +1,33 @@ +{ + options, + config, + pkgs, + lib, + inputs, + ... +}: +with lib; +with lib.wyrdgard; +let + cfg = config.wyrdgard.system.autoUpgrade; +in +{ + options.wyrdgard.system.autoUpgrade = with types; { + enable = mkEnableOption "Enable auto-upgrade"; + time = mkOpt str "02:00" "Time to run auto-upgrade"; + }; + + config = mkIf cfg.enable { + system.autoUpgrade = { + enable = true; + flake = inputs.self.outPath; + flags = [ + "--update-input" + "nixpkgs" + "--print-build-logs" + ]; + dates = cfg.time; + randomizedDelaySec = "45min"; + }; + }; +} diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index 57aff4e..29bddb0 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -24,11 +24,17 @@ with lib.wyrdgard; _1password = enabled; }; - system.hardware = { + system = { + autoUpgrade = { + enable = true; + time = "10:00"; + }; + hardware = { bluetooth = enabled; gpu.nvidia = enabled; }; }; + }; system.stateVersion = "23.11"; } From feaf4cd91ee2c258cd6efbe5e8faae7b4d9c4313 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Sun, 7 Apr 2024 10:34:12 +0200 Subject: [PATCH 2/3] autoupdate flake --- modules/nixos/system/autoUpgrade/default.nix | 33 ++++++++++++++++++++ systems/x86_64-linux/yggdrasil/default.nix | 8 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 modules/nixos/system/autoUpgrade/default.nix diff --git a/modules/nixos/system/autoUpgrade/default.nix b/modules/nixos/system/autoUpgrade/default.nix new file mode 100644 index 0000000..b9947c1 --- /dev/null +++ b/modules/nixos/system/autoUpgrade/default.nix @@ -0,0 +1,33 @@ +{ + options, + config, + pkgs, + lib, + inputs, + ... +}: +with lib; +with lib.wyrdgard; +let + cfg = config.wyrdgard.system.autoUpgrade; +in +{ + options.wyrdgard.system.autoUpgrade = with types; { + enable = mkEnableOption "Enable auto-upgrade"; + time = mkOpt str "02:00" "Time to run auto-upgrade"; + }; + + config = mkIf cfg.enable { + system.autoUpgrade = { + enable = true; + flake = inputs.self.outPath; + flags = [ + "--update-input" + "nixpkgs" + "--print-build-logs" + ]; + dates = cfg.time; + randomizedDelaySec = "45min"; + }; + }; +} diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index 57aff4e..29bddb0 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -24,11 +24,17 @@ with lib.wyrdgard; _1password = enabled; }; - system.hardware = { + system = { + autoUpgrade = { + enable = true; + time = "10:00"; + }; + hardware = { bluetooth = enabled; gpu.nvidia = enabled; }; }; + }; system.stateVersion = "23.11"; } From b9123f5666b75ff84f42b3a2aeb71e9955ad06eb Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Sun, 7 Apr 2024 17:38:36 +0200 Subject: [PATCH 3/3] add nixvim as default EDITOR --- .../nixos/apps/cli-apps/nixvim/default.nix | 21 +++++++++++++++---- modules/nixos/user/default.nix | 2 +- systems/x86_64-linux/yggdrasil/default.nix | 6 +++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/nixos/apps/cli-apps/nixvim/default.nix b/modules/nixos/apps/cli-apps/nixvim/default.nix index ccf0a91..f9e5ec7 100644 --- a/modules/nixos/apps/cli-apps/nixvim/default.nix +++ b/modules/nixos/apps/cli-apps/nixvim/default.nix @@ -16,9 +16,22 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - less - wyrdgard.neovim - ]; + environment = { + systemPackages = with pkgs; [ + less + wyrdgard.neovim + ]; + variables = { + EDITOR = "nvim"; + SUDOEDITOR = "nvim"; + }; + }; + + wyrdgard.home = { + extraOptions = { + # Use Neovim for Git diffs. + programs.fish.shellAliases.vimdiff = "nvim -d"; + }; + }; }; } diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix index 206a1e9..0e0c740 100644 --- a/modules/nixos/user/default.nix +++ b/modules/nixos/user/default.nix @@ -28,7 +28,7 @@ let pkgs.runCommandNoCC "propagated-icon" { passthru = { - fileName = cfg.icon.fileName; + inherit (fileName); }; } '' diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index 29bddb0..c639176 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -30,11 +30,11 @@ with lib.wyrdgard; time = "10:00"; }; hardware = { - bluetooth = enabled; - gpu.nvidia = enabled; + bluetooth = enabled; + gpu.nvidia = enabled; + }; }; }; - }; system.stateVersion = "23.11"; }