fix: agenix overlay

realeinherjar · Oct 29, 2023 · 3e38b03 · 3e38b03
1 parent 533044a
commit 3e38b03
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Read more about this in the [NixOs Paranoid Guide](https://xeiaso.net/blog/paran
 
 ## How to Install
 
-1. Prepare a [64-bit NixOS 23.05 minimal iso image](https://channels.nixos.org/nixos-23.05/latest-nixos-minimal-x86_64-linux.iso) and burn it, then enter the live system.
+1. Prepare a [64-bit NixOS 23.11 minimal iso image](https://channels.nixos.org/nixos-23.11/latest-nixos-minimal-x86_64-linux.iso) and burn it, then enter the live system.
    Suppose I have divided two partitions: `/dev/nvme0n1p1` and `/dev/nvme0n1p2`
 1. Format the partitions:
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -20,7 +20,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, flake-parts, agenix, ... }:
+  outputs = inputs@{ self, nixpkgs, flake-parts, nur, agenix, ... }:
     let
       user = "einherjar";
     in

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -32,7 +32,11 @@ in
           };
         };
         nixpkgs = {
-          overlays = [ inputs.rust-overlay.overlays.default ];
+          overlays = [
+            inputs.rust-overlay.overlays.default
+            inputs.nur.overlay
+            inputs.agenix.overlays.default
+          ];
         };
       }
     ];

diff --git a/hosts/system.nix b/hosts/system.nix
@@ -10,7 +10,6 @@
   networking = {
     networkmanager.enable = true;
     wireguard.enable = true;
-    iproute2.enable = true;
     stevenblack = {
       enable = true;
       block = [ "fakenews" ];
@@ -39,7 +38,7 @@
       enable = true;
       prunePaths = [ "/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool" ];
       interval = "hourly";
-      locate = pkgs.mlocate;
+      package = pkgs.mlocate;
       localuser = null;
     };
     openssh = { enable = false; };

diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
@@ -3,7 +3,7 @@
 {
   environment.systemPackages = with pkgs; [ twemoji-color-font ];
   fonts = {
-    fonts = with pkgs; [
+    packages = with pkgs; [
       noto-fonts
       noto-fonts-emoji
       nerdfonts

diff --git a/modules/programs/common/dev/default.nix b/modules/programs/common/dev/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   home = {
@@ -23,7 +23,7 @@
       # age
       age-plugin-yubikey
       age
-      inputs.agenix.packages.${system}.default
+      agenix
 
       # archive
       xz
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ @@
         };
       };
-      outputs = inputs@{ self, nixpkgs, flake-parts, agenix, ... }:
+      outputs = inputs@{ self, nixpkgs, flake-parts, nur, agenix, ... }:
         let
           user = "einherjar";
         in
@@ Expand Down @@