From 998846e2b0ce374a07428d345ecc7ff92d90d52c Mon Sep 17 00:00:00 2001
From: Christian Ott <mail@christianott.ch>
Date: Wed, 17 Apr 2024 09:49:23 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9D=84=EF=B8=8F=20Switch=20to=20Flakes=20and?=
 =?UTF-8?q?=20use=20it=20in=20~/.nixos-config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configuration.nix | 11 ++++++++---
 disko.nix         |  1 -
 flake.lock        | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix         | 38 +++++++++++++++++++++++++++++++++++++
 4 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/configuration.nix b/configuration.nix
index 8cc326f..3376f33 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,7 +8,10 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
+      "${builtins.fetchTarball {
+        url = "https://github.com/nix-community/disko/archive/master.tar.gz";
+        sha256 = "0bc1jrkv7mmr6iw3w452gn23fzvrq71p3klvj2bl4rc52mh8fb77";
+      }}/module.nix"
       ./disko.nix
     ];
 
@@ -78,10 +81,12 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     #vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    git
     neofetch
     wget
     curl
     btop
+    vscodium
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -128,8 +133,8 @@
   
   nix = {
     package = pkgs.nixFlakes;
-    extraOptions = "experimental-features = nix-command flakes";
-  };t
+    settings.experimental-features = ["nix-command" "flakes"];
+  };
 
 }
 
diff --git a/disko.nix b/disko.nix
index 7f0fc6a..ae1a821 100644
--- a/disko.nix
+++ b/disko.nix
@@ -21,7 +21,6 @@
               };
             };
             luks = {
-              # start = "2G";
               size = "2004G";
               content = {
                 type = "luks";
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..83aef05
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,48 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1713294767,
+        "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1713145326,
+        "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..90768b8
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,38 @@
+{
+  description = "A very basic flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
+    home-manager = {
+      url = github:nix-community/home-manager;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs = { self, nixpkgs, home-manager, ... }@inputs: 
+    let
+      username = "chrigi";
+      lib = nixpkgs.lib;
+    in {
+      nixosConfigurations.nix-f16 = lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./configuration.nix
+        ];
+      };
+    #   home-manager-config = {
+    #     fw16-chrigi = home-manager.lib.homeManagerConfiguration {
+    #       inherit system pkgs;
+    #       username = ${username};
+    #       homeDirectory = "/home/${username}";
+    #       stateVersion = "23.11";
+    #       configuration = {
+    #         imports = [
+    #           ./home.nix
+    #         ];
+    #       };
+    #   };
+    # };
+    };
+}
+