From 9648cc08ff07a16cb6fd9a0a84ae7247b7275a44 Mon Sep 17 00:00:00 2001
From: Bart van der Braak <bart@vanderbraak.nl>
Date: Thu, 17 Oct 2024 01:12:24 +0200
Subject: [PATCH] Added Zen Browser as flake

---
 tongfang/nixos/configuration.nix | 14 ++++----
 tongfang/nixos/flake.lock        | 58 ++++++++++++++++++++++++++++++++
 tongfang/nixos/flake.nix         | 17 ++++++++++
 3 files changed, 83 insertions(+), 6 deletions(-)
 create mode 100644 tongfang/nixos/flake.lock
 create mode 100644 tongfang/nixos/flake.nix

diff --git a/tongfang/nixos/configuration.nix b/tongfang/nixos/configuration.nix
index e164ce0..548b64c 100644
--- a/tongfang/nixos/configuration.nix
+++ b/tongfang/nixos/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   imports = [
@@ -51,25 +51,27 @@
 
   services.libinput.enable = true;
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
   users.users.bart = {
     isNormalUser = true;
     description = "Bart van der Braak";
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
-      kdePackages.kate
       vscodium-fhs
-      git
       thunderbird
       fastfetch
     ];
   };
 
   nixpkgs.config.allowUnfree = true;
-  environment.systemPackages = with pkgs; [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  environment.systemPackages = with pkgs; with inputs; [
+    inputs.zen-browser.packages."${system}".default
+    firefox
+    git
     vim
     wget
+    curl
   ];
   environment.variables.EDITOR = "vim";
 
diff --git a/tongfang/nixos/flake.lock b/tongfang/nixos/flake.lock
new file mode 100644
index 0000000..3a7d0d4
--- /dev/null
+++ b/tongfang/nixos/flake.lock
@@ -0,0 +1,58 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 0,
+        "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
+        "path": "/nix/store/wdk3xa0vwx7swjdl1samf1bccvyyzfc1-source",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "zen-browser": "zen-browser"
+      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1727721329,
+        "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/tongfang/nixos/flake.nix b/tongfang/nixos/flake.nix
new file mode 100644
index 0000000..1c428f7
--- /dev/null
+++ b/tongfang/nixos/flake.nix
@@ -0,0 +1,17 @@
+{
+  description = "TongFang NixOS flake";
+
+  inputs = {
+    zen-browser.url = "github:MarceColl/zen-browser-flake";
+  };
+
+  outputs = { self, nixpkgs, ... }@inputs: {
+    nixosConfigurations.tongfang = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./configuration.nix
+      ];
+      specialArgs = { inherit inputs; };
+    };
+  };
+}
\ No newline at end of file