From 17ad6f1394bfca899d5c9a05eacb81dd849051de Mon Sep 17 00:00:00 2001
From: EinEtwas <ein@etwas.me>
Date: Tue, 15 Oct 2024 10:44:53 +0200
Subject: [PATCH] fix: revert to f4a0fec

---
 home/default.nix                   |  4 ++--
 home/hyprland.nix                  |  3 ++-
 home/packages.nix                  |  4 ++--
 home/waybar.nix                    |  8 ++++----
 home/wofi.nix                      |  1 +
 modules/configuration.nix          |  3 +--
 modules/fingerprint.nix            |  1 +
 modules/hardware-configuration.nix |  2 +-
 modules/hyprland.nix               | 11 +++++++++++
 modules/shell.nix                  |  1 -
 modules/wayland.nix                |  5 ++---
 11 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 modules/hyprland.nix

diff --git a/home/default.nix b/home/default.nix
index 3f9251b..263befd 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ config, pkgs, inputs, ... }:
 {
   imports = [
     # <home-manager/nixos>
@@ -15,7 +15,6 @@
       # inherit ./hyprland.nix;
       home.username = "rhea";
       home.homeDirectory = "/home/rhea";
-
       programs.home-manager.enable = true;
 
       home.pointerCursor = {
@@ -25,6 +24,7 @@
         size = 16;
       };
 
+
       imports = [
         ./hyprland.nix
         ./git.nix
diff --git a/home/hyprland.nix b/home/hyprland.nix
index 6f4abfb..64e90e9 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }: {
+{ lib, inputs, pkgs, ... }: {
   wayland.windowManager.hyprland = {
     enable = true;
     #package = pkgs.hyprland-patched;
@@ -108,6 +108,7 @@
 
       bind = let
         alacritty = lib.getExe pkgs.alacritty;
+        chrome = lib.getExe pkgs.google-chrome;
 	hyprshot = lib.getExe pkgs.hyprshot;
         wofi = lib.getExe pkgs.wofi;
         workspaces = ["1" "2" "3" "4" "5" "6" "7" "8" "9"];
diff --git a/home/packages.nix b/home/packages.nix
index cf0161a..dd760b2 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ pkgs, nixpkgs, home-manager, ... }:
 {
   home.packages = with pkgs; [
     vesktop
-    obsidian
+    gparted
     polkit_gnome
     gh # github
 
diff --git a/home/waybar.nix b/home/waybar.nix
index f96c99a..338e004 100644
--- a/home/waybar.nix
+++ b/home/waybar.nix
@@ -1,11 +1,8 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   programs.waybar = {
     enable = true;
     systemd.enable = true;
-
-    package = pkgs.waybar;
-
     style = ./waybar.css;
     settings = {
       mainBar = {
@@ -80,6 +77,9 @@
         clock = {
           "format-alt" = "{:%a, %d. %b  %H:%M}";
         };
+
+
+
       };
     };
   };
diff --git a/home/wofi.nix b/home/wofi.nix
index d1a6cec..c0c2eaf 100644
--- a/home/wofi.nix
+++ b/home/wofi.nix
@@ -1,3 +1,4 @@
+{ config, pkgs, ... }:
 {
   programs.wofi = {
     enable = true;
diff --git a/modules/configuration.nix b/modules/configuration.nix
index 0dc3505..6d04bc1 100644
--- a/modules/configuration.nix
+++ b/modules/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   # Bootloader.
@@ -73,7 +73,6 @@
 
   environment.sessionVariables = { 
     NIXOS_OZONE_WL = "1";
-    DEFAULT_BROWSER = "${pkgs.google-chrome}/bin/google-chrome-stable";
   };
 
   services.devmon.enable = true;
diff --git a/modules/fingerprint.nix b/modules/fingerprint.nix
index 04092c9..f99efcd 100644
--- a/modules/fingerprint.nix
+++ b/modules/fingerprint.nix
@@ -1,3 +1,4 @@
+{ pkgs, ...}: 
 {
   services.fprintd = {
     enable = true;
diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix
index c8e5730..f51fae9 100644
--- a/modules/hardware-configuration.nix
+++ b/modules/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports =
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
new file mode 100644
index 0000000..b893c4c
--- /dev/null
+++ b/modules/hyprland.nix
@@ -0,0 +1,11 @@
+{ inputs, pkgs, ... }:
+
+{
+  # Enable Hyprland
+  programs.hyprland.enable = true;
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  environment.systemPackages = with pkgs; [
+    hyprlock
+  ];
+}
diff --git a/modules/shell.nix b/modules/shell.nix
index 9e62e54..60b8b2f 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -8,7 +8,6 @@
     os-update = "sudo nixos-rebuild switch --flake \".#$HOST\" --log-format internal-json -v |& nom --json";
   };
 
-  fonts.enableDefaultPackages = true;
   fonts.packages = with pkgs; [
     nerdfonts
   ];
diff --git a/modules/wayland.nix b/modules/wayland.nix
index 97c453e..dbaf82c 100644
--- a/modules/wayland.nix
+++ b/modules/wayland.nix
@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ inputs, pkgs, ... }: {
+  programs.hyprland.enable = true;
   xdg.portal = {
     enable = true;
     wlr.enable = true;
@@ -6,7 +7,5 @@
     extraPortals = [
       pkgs.xdg-desktop-portal-hyprland
     ];
-    # TODO: I should probably set `xdg.portal.config` or `xdg.portal.configPackages` here, but for now this works...
-    # config.common.default = "*";
   };
 }