From 21395ede95fea55906848ee1a64ba3596bf8db9c Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Tue, 23 Jan 2024 12:33:38 -0600 Subject: [PATCH] I clearly don't know where to put this... --- flake.nix | 5 +++++ hosts/othalan/default.nix | 2 -- modules/hyprland.nix | 2 +- modules/nix.nix | 8 +------- modules/restic.nix | 3 +-- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 659f5aa..c16cfb6 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,11 @@ wezterm.url = "github:wez/wezterm?dir=nix"; }; + nixConfig = { + extra-substituters = [ "https://daylin.cachix.org"]; + extra-trusted-public-keys = ["daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="]; + }; + outputs = inputs @ { self, nixpkgs, diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix index 99c647f..b8b8dff 100644 --- a/hosts/othalan/default.nix +++ b/hosts/othalan/default.nix @@ -51,6 +51,4 @@ "audio" ]; }; - - } diff --git a/modules/hyprland.nix b/modules/hyprland.nix index dd20d9f..c48b9c0 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -32,7 +32,7 @@ catppuccin-cursors.mochaDark pavucontrol ]; - nixpkgs.overlays = [ inputs.nixpkgs-wayland.overlay ]; + nixpkgs.overlays = [inputs.nixpkgs-wayland.overlay]; # wayland extras nix.settings = { # add binary caches diff --git a/modules/nix.nix b/modules/nix.nix index ad274bf..dc20bed 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -23,13 +23,7 @@ alejandra ]; - nix.settings = { + nix.settings = { trusted-users = ["daylin"]; - substituters = [ - "https://daylin.cachix.org" - ]; - trusted-public-keys = [ - "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" - ]; }; } diff --git a/modules/restic.nix b/modules/restic.nix index 3efaa61..c233834 100644 --- a/modules/restic.nix +++ b/modules/restic.nix @@ -1,4 +1,4 @@ -{...}:{ +{...}: { services.restic.backups.gdrive = { extraBackupArgs = [ "--exclude-file /home/daylin/.config/restic/excludes.txt" @@ -21,5 +21,4 @@ RandomizedDelaySec = "5h"; }; }; - }