module changes

This commit is contained in:
Charlie Root 2024-08-15 21:20:56 +02:00
commit fe34f6c78a
8 changed files with 43 additions and 21 deletions

5
.envrc Normal file
View file

@ -0,0 +1,5 @@
watch_file flake.nix
watch_file flake.lock
use flake

3
.gitignore vendored
View file

@ -1 +1,2 @@
./assets/* /assets
/.direnv

View file

@ -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 -- taken from https://github.com/sitiom/nvim-numbertoggle
-- I would much rather avoid fetching yet another plugin for something vim.api.nvim_create_autocmd({ 'BufEnter', 'FocusGained', 'InsertLeave', 'CmdlineLeave', 'WinEnter' }, {
-- that should be done locally - and not as a plugin
local augroup = create_augroup('NumberToggle', {})
create_autocmd({ 'BufEnter', 'FocusGained', 'InsertLeave', 'CmdlineLeave', 'WinEnter' }, {
pattern = '*', pattern = '*',
group = augroup, group = vim.api.nvim_create_augroup('NumberToggle', {}),
callback = function() callback = function()
if vim.o.nu and vim.api.nvim_get_mode().mode ~= 'i' then if vim.o.nu and vim.api.nvim_get_mode().mode ~= 'i' then
vim.opt.relativenumber = true vim.opt.relativenumber = true
@ -18,9 +9,9 @@ create_autocmd({ 'BufEnter', 'FocusGained', 'InsertLeave', 'CmdlineLeave', 'WinE
end, end,
}) })
create_autocmd({ 'BufLeave', 'FocusLost', 'InsertEnter', 'CmdlineEnter', 'WinLeave' }, { vim.api.nvim_create_autocmd({ 'BufLeave', 'FocusLost', 'InsertEnter', 'CmdlineEnter', 'WinLeave' }, {
pattern = '*', pattern = '*',
group = augroup, group = vim.api.nvim_create_augroup('NumberToggle', {}),
callback = function() callback = function()
if vim.o.nu then if vim.o.nu then
vim.opt.relativenumber = false vim.opt.relativenumber = false

View file

@ -4,7 +4,7 @@ _: {
enable = true; enable = true;
nvimWebDevicons.enable = true; nvimWebDevicons.enable = true;
scrollBar.enable = false; scrollBar.enable = false;
smoothScroll.enable = false; smoothScroll.enable = true;
cellularAutomaton.enable = true; cellularAutomaton.enable = true;
highlight-undo.enable = true; highlight-undo.enable = true;
@ -21,6 +21,7 @@ _: {
notification.window = { notification.window = {
winblend = 0; winblend = 0;
border = "none"; border = "none";
render_limit = 10;
}; };
}; };
}; };

View file

@ -42,7 +42,6 @@ in {
autoIndent = true; autoIndent = true;
spellcheck = { spellcheck = {
enable = true; enable = true;
# TODO add de
languages = ["en" "de"]; languages = ["en" "de"];
}; };
@ -72,7 +71,7 @@ in {
# additional lua configuration that I can append # additional lua configuration that I can append
# or, to be more precise, randomly inject into # or, to be more precise, randomly inject into
# the lua configuration of my Neovim configuration # 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 # directory, so we do not need to use require
luaConfigRC = let luaConfigRC = let

View file

@ -15,8 +15,6 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.steam = { programs.steam = {
enable = true; enable = true;
# remotePlay.openFirewall = true;
# dedicatedServer.openFirewall = true;
gamescopeSession.enable = mkIf cfg.gamescope true; gamescopeSession.enable = mkIf cfg.gamescope true;
extraCompatPackages = with pkgs; [proton-ge-bin]; extraCompatPackages = with pkgs; [proton-ge-bin];
}; };

View file

@ -1,7 +1,34 @@
_: { {
pkgs,
lib,
...
}: let
inherit (lib) mkOption;
inherit (lib.types) package str int;
in {
imports = [ imports = [
./stylix.nix ./stylix.nix
# ./qt.nix # ./qt.nix
# ./gtk.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";
};
};
};
} }

View file

@ -13,7 +13,7 @@ in {
imports = [inputs.stylix.nixosModules.stylix]; imports = [inputs.stylix.nixosModules.stylix];
config = mkIf cfg.enable { config = mkIf cfg.enable {
stylix = { stylix = {
enable = true; enable = false;
autoEnable = false; autoEnable = false;
homeManagerIntegration = { homeManagerIntegration = {
followSystem = true; followSystem = true;