From 4ea241fad7232f0d7581c68f34d51d8a8888983d Mon Sep 17 00:00:00 2001
From: Michael Thomson <michael@michaelthomson.dev>
Date: Tue, 14 May 2024 14:32:07 -0400
Subject: [PATCH] update

---
 hosts/desktop/configuration.nix           | 16 ++++++++++++++++
 hosts/desktop/home.nix                    |  9 ++++++++-
 modules/home-manager/hyprland/default.nix |  8 --------
 3 files changed, 24 insertions(+), 9 deletions(-)
 delete mode 100644 modules/home-manager/hyprland/default.nix

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index aaa68e2..b4d42a4 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -27,6 +27,16 @@
 # Select internationalisation properties.
   i18n.defaultLocale = "en_CA.UTF-8";
 
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+  };
+
 # i3 relates stuff
   environment.pathsToLink = [ "/libexec" ];
   services.xserver = {
@@ -71,6 +81,7 @@
 
 # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.mthomson = {
+    shell = pkgs.zsh;
     isNormalUser = true;
     description = "Michael Thomson";
     extraGroups = [ "networkmanager" "wheel" ];
@@ -104,6 +115,11 @@
 
   environment.variables.EDITOR = "nvim";
 
+  programs = {
+    zsh.enable = true;
+    steam.enable = true;
+  };
+
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     useGlobalPkgs = true;
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 3ddc928..27c8e9b 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ../../modules/home-manager/hyprland
     ../../modules/home-manager/i3
     ../../modules/home-manager/1password
     ../../modules/home-manager/git
@@ -20,6 +19,14 @@
   home.homeDirectory = "/home/mthomson";
   home.stateVersion = "23.11";
 
+  programs = {
+    direnv = {
+      enable = true;
+      enableZshIntegration = true; # see note on other shells below
+      nix-direnv.enable = true;
+    };
+  };
+
   home.packages = with pkgs; [
     firefox
     gcc
diff --git a/modules/home-manager/hyprland/default.nix b/modules/home-manager/hyprland/default.nix
deleted file mode 100644
index ffb4cf4..0000000
--- a/modules/home-manager/hyprland/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, config, inputs, ... }:
-
-{
-  wayland.windowManager.hyprland = {
-    enable = true;
-    package = inputs.hyprland.packages."${pkgs.system}".hyprland;
-  };
-}