flake.nix

@@ -11,10 +11,7 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    catppuccin = {
-      url = "github:catppuccin/nix/f518f96a60aceda4cd487437b25eaa48d0f1b97d";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    catppuccin.url = "github:catppuccin/nix";
 
     agenix.url = "github:ryantm/agenix";
 

home/default.nix

@@ -1,9 +1,9 @@
 {
-  config,
   pkgs,
   inputs,
   spicetify-nix,
   agenix,
+  agenix-rekey,
   ...
 }:
 {
@@ -26,6 +26,7 @@
     extraSpecialArgs = {
       inherit spicetify-nix;
       inherit agenix;
+      inherit agenix-rekey;
     };
 
     users.etwas = {

home/essentials/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./git.nix
     ./keyring.nix
-    ./restic.nix
     ./ssh.nix
     ./zsh.nix
   ];

home/essentials/restic.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 {
   services.restic = {
     enable = true;
@@ -7,22 +7,18 @@
       localbackup = {
         exclude = [
           "/home/*/.cache/*"
-          "/home/*/.local/share/libvirt/*"
-          "/home/*/.local/share/Steam/*"
-          "/home/*/.local/share/Trash/*"
-          "*/venv/*"
-          "*/.direnv/*"
-          "*/Android/*"
+          "*venv*"
         ];
         initialize = true;
+        passwordFile = config.age.secrets.restic-password.path;
         paths = [
           "/home"
         ];
         repository = "s3:https://s3.filmsli.de/restic-framework";
-        pruneOpts = [
-          "--keep-daily 7"
-          "--keep-weekly 4"
-        ];
+        environmentFile = ''
+          AWS_ACCESS_KEY_ID=XFRV1PZVN3W4OJMTTQRS
+          AWS_SECRET_ACCESS_KEY=${builtins.readFile config.age.secrets.restic-s3-key.path}
+        '';
       };
     };
   };

home/essentials/zsh.nix

@@ -7,8 +7,8 @@
 
       autocd = true;
       shellAliases = {
-        os-update = "nh clean all -K 7d --keep 14 && export NIXPKGS_ALLOW_UNFREE=1 && nh os switch /home/etwas/nix-config/";
-        os-upgrade = "cd ~/nix-config && nh clean all -K 7d --keep 14 && export NIXPKGS_ALLOW_UNFREE=1 && nix flake update && nh os switch /home/etwas/nix-config/";
+        os-update = "nh clean all -K 7d --keep 14 && export NIXPKGS_ALLOW_UNFREE=1 && nh os switch /home/rhea/nix-config/";
+        os-upgrade = "cd ~/nix-config && nh clean all -K 7d --keep 14 && export NIXPKGS_ALLOW_UNFREE=1 && nix flake update && nh os switch /home/rhea/nix-config/";
         light-off = "echo -n \"{\\\"id\\\":1,\\\"method\\\":\\\"setState\\\",\\\"params\\\":{\\\"state\\\":false}}\" | nc -u -w 1 192.168.178.28 38899";
         clr = "clear";
         power-saver = "powerprofilesctl set power-saver";

home/misc_pkgs/packages.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  agenix,
   ...
 }:
 {

home/wm/catppuccin.nix

@@ -1,10 +1,10 @@
 {
   catppuccin = {
-    gtk = {
-      enable = true;
-      size = "compact";
-      tweaks = [ "rimless" ];
-    };
+    #gtk = {
+    #  enable = true;
+    #  size = "compact";
+    #  tweaks = [ "rimless" ];
+    #};
 
     btop.enable = true;
 

modules/essentials/hardware_config.nix

@@ -22,12 +22,7 @@
         "usb_storage"
         "sd_mod"
       ];
-      kernelModules = [ 
-        "dm-snapshot"
-        "cryptd"
-      ];
-
-      luks.devices."cryptroot".device = "/dev/disk/by-label/nixos";
+      kernelModules = [ ];
     };
 
     kernelModules = [ "kvm-amd" ];
@@ -36,12 +31,12 @@
   };
 
   fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos-root";
+    device = "/dev/disk/by-label/nix-root";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-label/nixos-boot";
+    device = "/dev/disk/by-label/EFI";
     fsType = "vfat";
     options = [
       "fmask=0077"
@@ -49,7 +44,7 @@
     ];
   };
 
-  swapDevices = [ { device = "/dev/disk/by-label/nixos-swap"; } ];
+  swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;