Restructure Directories

flake.lock

@@ -84,11 +84,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1656239181,
-        "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
+        "lastModified": 1656372800,
+        "narHash": "sha256-1u9SDLXvKix/QejNb2sY2J2QZXnbe/14MnLtn+ln9j0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
+        "rev": "020c74014b9e2fa905bb4059c979965816cd9118",
         "type": "github"
       },
       "original": {

flake.nix

@@ -42,7 +42,7 @@
         system = "x86_64-linux";
 
         # >> Main NixOS configuration file <<
-        modules = [ ./configuration.nix ];
+        modules = [ ./nixos/configuration.nix ];
 
         # Make our inputs available to the config (for importing modules)
         specialArgs = { inherit inputs; };
@@ -60,7 +60,7 @@
 
         modules = [
 	  # >> Main HomeManager configuration file <<
-          ./home.nix
+          ./home/home.nix
           {
             home = rec {
               username = "christoph";

home/home.nix

@@ -30,6 +30,8 @@
       nix-direnv.enable = true;
     };
 
+    exa.enable = true;
+
     # TODO: Copy config from Arch dots
     fish = {
       enable = true;
@@ -83,7 +85,6 @@
   # Add stuff for your user as you see fit:
   home.packages = with pkgs; [
     # CLI Tools
-    # HM exa
     procs
     tokei
     rsync
@@ -126,6 +127,7 @@
     xdotool
 
     # Web
+    noisetorch
     discord
     yt-dlp
     spotify

nixos/cachix.nix

@@ -0,0 +1,13 @@
+
+# WARN: this file will get overwritten by $ cachix use <name>
+{ pkgs, lib, ... }:
+
+let
+  folder = ./cachix;
+  toImport = name: value: folder + ("/" + name);
+  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
+  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
+in {
+  inherit imports;
+  nix.binaryCaches = ["https://cache.nixos.org/"];
+}

nixos/cachix/nix-community.nix

@@ -0,0 +1,11 @@
+
+{
+  nix = {
+    binaryCaches = [
+      "https://nix-community.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
+}

nixos/configuration.nix

@@ -8,6 +8,9 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+
+      # NixCommunity binary cache
+      ./cachix.nix
     ];
 
   # Enable flakes