From 3bd584d11b85a2f6e5fc6b783779bae8322e709c Mon Sep 17 00:00:00 2001
From: vali <valentin@kaas.cc>
Date: Thu, 15 Aug 2024 21:20:56 +0200
Subject: [PATCH] module changes

---
 .envrc                                        |  5 ++++
 .gitignore                                    |  3 +-
 .../editors/nvf/lua/display/numbertoggle.lua  | 17 +++--------
 .../editors/nvf/plugins/settings/visuals.nix  |  3 +-
 modules/editors/nvf/settings.nix              |  3 +-
 modules/gui/steam.nix                         |  2 --
 modules/options/style/module.nix              | 29 ++++++++++++++++++-
 modules/styling/stylix.nix                    |  2 +-
 8 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..8a876c9
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,5 @@
+watch_file flake.nix
+watch_file flake.lock
+
+use flake
+
diff --git a/.gitignore b/.gitignore
index 5214ca1..67f3409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-./assets/*
+/assets
+/.direnv
diff --git a/modules/editors/nvf/lua/display/numbertoggle.lua b/modules/editors/nvf/lua/display/numbertoggle.lua
index 7672d18..75969c2 100644
--- a/modules/editors/nvf/lua/display/numbertoggle.lua
+++ b/modules/editors/nvf/lua/display/numbertoggle.lua
@@ -1,16 +1,7 @@
--- alias for vim.api.nvim_create_autocmd
-local create_autocmd = vim.api.nvim_create_autocmd
--- alias for vim.api.nvim_create_augroup
-local create_augroup = vim.api.nvim_create_augroup
-
 -- taken from https://github.com/sitiom/nvim-numbertoggle
--- I would much rather avoid fetching yet another plugin for something
--- that should be done locally - and not as a plugin
-local augroup = create_augroup('NumberToggle', {})
-
-create_autocmd({ 'BufEnter', 'FocusGained', 'InsertLeave', 'CmdlineLeave', 'WinEnter' }, {
+vim.api.nvim_create_autocmd({ 'BufEnter', 'FocusGained', 'InsertLeave', 'CmdlineLeave', 'WinEnter' }, {
     pattern = '*',
-    group = augroup,
+    group = vim.api.nvim_create_augroup('NumberToggle', {}),
     callback = function()
         if vim.o.nu and vim.api.nvim_get_mode().mode ~= 'i' then
             vim.opt.relativenumber = true
@@ -18,9 +9,9 @@ create_autocmd({ 'BufEnter', 'FocusGained', 'InsertLeave', 'CmdlineLeave', 'WinE
     end,
 })
 
-create_autocmd({ 'BufLeave', 'FocusLost', 'InsertEnter', 'CmdlineEnter', 'WinLeave' }, {
+vim.api.nvim_create_autocmd({ 'BufLeave', 'FocusLost', 'InsertEnter', 'CmdlineEnter', 'WinLeave' }, {
     pattern = '*',
-    group = augroup,
+    group = vim.api.nvim_create_augroup('NumberToggle', {}),
     callback = function()
         if vim.o.nu then
             vim.opt.relativenumber = false
diff --git a/modules/editors/nvf/plugins/settings/visuals.nix b/modules/editors/nvf/plugins/settings/visuals.nix
index 614fc90..2e1e9b9 100644
--- a/modules/editors/nvf/plugins/settings/visuals.nix
+++ b/modules/editors/nvf/plugins/settings/visuals.nix
@@ -4,7 +4,7 @@ _: {
       enable = true;
       nvimWebDevicons.enable = true;
       scrollBar.enable = false;
-      smoothScroll.enable = false;
+      smoothScroll.enable = true;
       cellularAutomaton.enable = true;
       highlight-undo.enable = true;
 
@@ -21,6 +21,7 @@ _: {
           notification.window = {
             winblend = 0;
             border = "none";
+            render_limit = 10;
           };
         };
       };
diff --git a/modules/editors/nvf/settings.nix b/modules/editors/nvf/settings.nix
index 94b065d..dac00e9 100644
--- a/modules/editors/nvf/settings.nix
+++ b/modules/editors/nvf/settings.nix
@@ -42,7 +42,6 @@ in {
           autoIndent = true;
           spellcheck = {
             enable = true;
-            # TODO add de
             languages = ["en" "de"];
           };
 
@@ -72,7 +71,7 @@ in {
           # additional lua configuration that I can append
           # or, to be more precise, randomly inject into
           # the lua configuration of my Neovim configuration
-          # wrapper. this is recursively read from the lua
+          # wrapper. This is recursively read from the lua
           # directory, so we do not need to use require
 
           luaConfigRC = let
diff --git a/modules/gui/steam.nix b/modules/gui/steam.nix
index a8cee5d..9c4b3b6 100644
--- a/modules/gui/steam.nix
+++ b/modules/gui/steam.nix
@@ -15,8 +15,6 @@ in {
   config = mkIf cfg.enable {
     programs.steam = {
       enable = true;
-      # remotePlay.openFirewall = true;
-      # dedicatedServer.openFirewall = true;
       gamescopeSession.enable = mkIf cfg.gamescope true;
       extraCompatPackages = with pkgs; [proton-ge-bin];
     };
diff --git a/modules/options/style/module.nix b/modules/options/style/module.nix
index b63d7b4..cfb9e22 100644
--- a/modules/options/style/module.nix
+++ b/modules/options/style/module.nix
@@ -1,7 +1,34 @@
-_: {
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib) mkOption;
+  inherit (lib.types) package str int;
+in {
   imports = [
     ./stylix.nix
     #    ./qt.nix
     #    ./gtk.nix
   ];
+
+  options.modules.style = {
+    cursor = {
+      package = mkOption {
+        type = package;
+        default = pkgs.bibata-cursors;
+        description = "Cursor package";
+      };
+      name = mkOption {
+        type = str;
+        default = "Bibata-Modern-Classic";
+        description = "Cursor name";
+      };
+      size = mkOption {
+        type = int;
+        default = 32;
+        description = "Cursor size";
+      };
+    };
+  };
 }
diff --git a/modules/styling/stylix.nix b/modules/styling/stylix.nix
index 5ec95d3..21a3b1c 100644
--- a/modules/styling/stylix.nix
+++ b/modules/styling/stylix.nix
@@ -13,7 +13,7 @@ in {
   imports = [inputs.stylix.nixosModules.stylix];
   config = mkIf cfg.enable {
     stylix = {
-      enable = true;
+      enable = false;
       autoEnable = false;
       homeManagerIntegration = {
         followSystem = true;