From a39ed5d107aed1505b3a4c9d890b654b3cbebc89 Mon Sep 17 00:00:00 2001
From: foglar <kohout.fi.2023@skola.ssps.cz>
Date: Tue, 29 Oct 2024 21:02:24 +0100
Subject: [PATCH] error fixes

---
 flake.lock                                 | 37 +++++++++++++++++++++-
 flake.nix                                  |  1 +
 nixos/configuration.nix                    |  1 +
 nixos/packages/packages.nix                |  2 --
 nixos/packages/programming/git.nix         |  8 ++++-
 nixos/packages/programming/programming.nix | 11 ++++---
 nixos/packages/terminal_tools.nix          |  3 ++
 7 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0c54b7f..77a96b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -493,6 +493,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "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"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -523,7 +539,8 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_2",
-        "stylix": "stylix"
+        "stylix": "stylix",
+        "zen-browser": "zen-browser"
       }
     },
     "stylix": {
@@ -690,6 +707,24 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
+      "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",
diff --git a/flake.nix b/flake.nix
index b7f99f6..41378ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,6 +23,7 @@
     };
 
     stylix.url = "github:danth/stylix";
+    zen-browser.url = "github:MarceColl/zen-browser-flake";
   };
 
   outputs = {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index e8afb9e..c9493a3 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -248,6 +248,7 @@
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
   #  wget
+    inputs.zen-browser.packages."${system}".default
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/nixos/packages/packages.nix b/nixos/packages/packages.nix
index a49cb65..d1f6779 100644
--- a/nixos/packages/packages.nix
+++ b/nixos/packages/packages.nix
@@ -34,8 +34,6 @@
     openrocket
     spotify
 
-    ranger
-
     #zed-editor
     #gtk3
     #(python3.withPackages (subpkgs: with subpkgs; [
diff --git a/nixos/packages/programming/git.nix b/nixos/packages/programming/git.nix
index e376216..59489bb 100644
--- a/nixos/packages/programming/git.nix
+++ b/nixos/packages/programming/git.nix
@@ -1,4 +1,9 @@
-{...}:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+  }:
 {
   options = {
     git.enable = lib.mkEnableOption "enable git";
@@ -16,4 +21,5 @@
       github-cli
       gitkraken
     ];
+  };
 }
diff --git a/nixos/packages/programming/programming.nix b/nixos/packages/programming/programming.nix
index 5c32ca2..bf3b3c9 100644
--- a/nixos/packages/programming/programming.nix
+++ b/nixos/packages/programming/programming.nix
@@ -4,18 +4,19 @@
   config,
   ...
 }: {
-  imports = [
-    ./code.nix
-    ./git.nix
-  ];
 
   options = {
     programming.enable =
       lib.mkEnableOption "enable programming toolset";
   };
 
-  config = lib.mkIf config.programming.enable {
+  imports = [
+    ./code.nix
+    ./git.nix
+  ];
 
+  config = lib.mkIf config.programming.enable {
+    
     vscode.enable = lib.mkDefault true;
     git.enable = lib.mkDefault true;
 
diff --git a/nixos/packages/terminal_tools.nix b/nixos/packages/terminal_tools.nix
index 09f741a..5d5c3e7 100644
--- a/nixos/packages/terminal_tools.nix
+++ b/nixos/packages/terminal_tools.nix
@@ -1,5 +1,7 @@
 { 
+  pkgs, 
   lib,
+  config,
   ...
 }:
 {
@@ -70,6 +72,7 @@
       curl
       fzf
       tldr
+      ranger
     ];
   };
 }
\ No newline at end of file