From 26b5d756d493f6ba6a0b10503abfb738825f4bd4 Mon Sep 17 00:00:00 2001
From: sils <sils@sils.li>
Date: Sun, 18 Jun 2023 12:42:21 +0200
Subject: Feat(flake): Update and restructure

---
 flake.lock | 24 ++++++++++++------------
 flake.nix  | 12 ++++++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index b3d6208..f2605e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,11 +16,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684981077,
-        "narHash": "sha256-68X9cFm0RTZm8u0rXPbeBzOVUH5OoUGAfeHHVoxGd9o=",
+        "lastModified": 1686621798,
+        "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "35110cccf28823320f4fd697fcafcb5038683982",
+        "rev": "75f7d715f8088f741be9981405f6444e2d49efdd",
         "type": "github"
       },
       "original": {
@@ -185,11 +185,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685599623,
-        "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
+        "lastModified": 1687041925,
+        "narHash": "sha256-Zfn/SphInZ9PEIHWdQk+wGQ0XGlwAgRUp/Qso+8vDOY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
+        "rev": "a8d549351d4b87ab80665f35e57bee2a04201245",
         "type": "github"
       },
       "original": {
@@ -201,11 +201,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685801374,
-        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+        "lastModified": 1686921029,
+        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
         "owner": "NixOs",
         "repo": "nixpkgs",
-        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
         "type": "github"
       },
       "original": {
@@ -273,11 +273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685846256,
-        "narHash": "sha256-G4aYK4VqlMHImvZ0lUnLHw1A+Cx28T0sBMvAKZBcGpk=",
+        "lastModified": 1687055571,
+        "narHash": "sha256-UvLoO6u5n9TzY80BpM4DaacxvyJl7u9mm9CA72d309g=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "1ef3c6de6127a1cba94cc5492cdde52e33d06ea4",
+        "rev": "2de557c780dcb127128ae987fca9d6c2b0d7dc0f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 00e9e76..23076c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,6 @@
 {
   description = "My Nixos system configuration";
+  # inputs {{{
   inputs = {
     nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.05";
     home-manager = {
@@ -81,6 +82,7 @@
       };
     };
   };
+  #}}}
   outputs = {
     self,
     nixpkgs,
@@ -104,10 +106,12 @@
         ./hosts/thinklappi
         home-manager.nixosModules.home-manager
         {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.sils = import ./users/sils;
-          home-manager.extraSpecialArgs = {inherit nixpkgs system sysLib river_init_lesser yambar_cpu yambar_memory grades;};
+          home-manager = {
+            useGlobalPkgs = true;
+            useUserPackages = true;
+            users.sils = import ./users/sils;
+            extraSpecialArgs = {inherit nixpkgs system sysLib river_init_lesser yambar_cpu yambar_memory grades;};
+        };
         }
       ];
     };
-- 
cgit 1.4.1