diff --git a/hosts/vali/temperance/configuration.nix b/hosts/vali/temperance/configuration.nix index 72fd6b9..7126a56 100644 --- a/hosts/vali/temperance/configuration.nix +++ b/hosts/vali/temperance/configuration.nix @@ -24,15 +24,15 @@ programs.kdeconnect.enable = true; programs.dconf.enable = true; virtualisation.docker.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; modules = { system = { programs = { editors = { emacs.enable = false; neovim.enable = true; - helix.enable = true; - kakoune.enable = true; + helix.enable = false; + kakoune.enable = false; }; discord.enable = true; firefox.enable = true; diff --git a/modules/default.nix b/modules/default.nix index a513665..fe7fdd7 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -8,7 +8,7 @@ _: { ./editors ./wms ./runners - ./styling + ./style ./options ./system/nix/module.nix ./system diff --git a/modules/editors/nvf/plugins/settings/languages.nix b/modules/editors/nvf/plugins/settings/languages.nix index a0e11f6..3b1daac 100644 --- a/modules/editors/nvf/plugins/settings/languages.nix +++ b/modules/editors/nvf/plugins/settings/languages.nix @@ -15,7 +15,7 @@ _: { go.enable = true; python.enable = true; bash.enable = true; - typst.enable = true; + typst.enable = false; zig.enable = true; dart.enable = false; elixir.enable = false; diff --git a/modules/editors/nvf/plugins/settings/visuals.nix b/modules/editors/nvf/plugins/settings/visuals.nix index 2e1e9b9..48de745 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 = true; + smoothScroll.enable = false; cellularAutomaton.enable = true; highlight-undo.enable = true; diff --git a/modules/styling/default.nix b/modules/style/default.nix similarity index 83% rename from modules/styling/default.nix rename to modules/style/default.nix index 93f546f..b32ed62 100644 --- a/modules/styling/default.nix +++ b/modules/style/default.nix @@ -4,5 +4,6 @@ _: { ./quickshell ./qt.nix ./gtk.nix + ./module.nix ]; } diff --git a/modules/styling/gtk.nix b/modules/style/gtk.nix similarity index 100% rename from modules/styling/gtk.nix rename to modules/style/gtk.nix diff --git a/modules/style/module.nix b/modules/style/module.nix new file mode 100644 index 0000000..07ae4be --- /dev/null +++ b/modules/style/module.nix @@ -0,0 +1,18 @@ +{config, ...}: let + inherit (config.modules.style.cursor) package name size; + inherit (config.modules.other.system) username; +in { + home-manager.users.${username} = { + home.pointerCursor = { + # inherit the default values set in the options, + # since these are the once I need on all my systems. + inherit package name size; + + # make gtk follow the cursor choices + gtk.enable = true; + + # ditto + x11.enable = true; + }; + }; +} diff --git a/modules/styling/qt.nix b/modules/style/qt.nix similarity index 100% rename from modules/styling/qt.nix rename to modules/style/qt.nix diff --git a/modules/styling/quickshell/bar/Bar.qml b/modules/style/quickshell/bar/Bar.qml similarity index 100% rename from modules/styling/quickshell/bar/Bar.qml rename to modules/style/quickshell/bar/Bar.qml diff --git a/modules/styling/quickshell/bar/ClockWidget.qml b/modules/style/quickshell/bar/ClockWidget.qml similarity index 100% rename from modules/styling/quickshell/bar/ClockWidget.qml rename to modules/style/quickshell/bar/ClockWidget.qml diff --git a/modules/styling/quickshell/bar/shell.qml b/modules/style/quickshell/bar/shell.qml similarity index 100% rename from modules/styling/quickshell/bar/shell.qml rename to modules/style/quickshell/bar/shell.qml diff --git a/modules/styling/quickshell/bar/time/Time.qml b/modules/style/quickshell/bar/time/Time.qml similarity index 100% rename from modules/styling/quickshell/bar/time/Time.qml rename to modules/style/quickshell/bar/time/Time.qml diff --git a/modules/styling/quickshell/bar/workspaces/Widget.qml b/modules/style/quickshell/bar/workspaces/Widget.qml similarity index 100% rename from modules/styling/quickshell/bar/workspaces/Widget.qml rename to modules/style/quickshell/bar/workspaces/Widget.qml diff --git a/modules/styling/quickshell/default.nix b/modules/style/quickshell/default.nix similarity index 100% rename from modules/styling/quickshell/default.nix rename to modules/style/quickshell/default.nix diff --git a/modules/styling/quickshell/systray/Widget.qml b/modules/style/quickshell/systray/Widget.qml similarity index 100% rename from modules/styling/quickshell/systray/Widget.qml rename to modules/style/quickshell/systray/Widget.qml diff --git a/modules/styling/stylix.nix b/modules/style/stylix.nix similarity index 100% rename from modules/styling/stylix.nix rename to modules/style/stylix.nix diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix index fa7084d..ce33e0b 100644 --- a/modules/wms/wayland/hypr/land.nix +++ b/modules/wms/wayland/hypr/land.nix @@ -8,6 +8,7 @@ cfg = config.modules.usrEnv.desktops.hyprland; inherit (config.modules.other.system) username; inherit (inputs'.anyrun.packages) anyrun; + inherit (config.modules.style) cursor; inherit (inputs'.nixpkgs-wayland.packages) foot @@ -19,13 +20,14 @@ split-monitor-workspaces ; inherit (lib) mkIf; + inherit (builtins) toString; in { config = mkIf cfg.enable { - # programs.hyprland = { - # enable = true; - # inherit (cfg) package; - # portalPackage = inputs'.hyprland.packages.xdg-desktop-portal-hyprland; - # }; + programs.hyprland = { + enable = true; + inherit (cfg) package; + portalPackage = inputs'.hyprland.packages.xdg-desktop-portal-hyprland; + }; # xdg Portal xdg.portal = { enable = true; @@ -44,7 +46,7 @@ in { home-manager.users.${username} = { wayland.windowManager.hyprland = { enable = true; - inherit (cfg) package; + # inherit (cfg) package; # Split-monitor-workspaces provides awesome-like workspace behaviour plugins = [ @@ -335,6 +337,7 @@ in { }; # Programs which get executed at Hyprland start. exec-once = [ + "hyprctl setcursor ${cursor.name} ${toString cursor.size}" #start waybar "${pkgs.waybar}/bin/waybar" diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix index e152ce8..ddb90c4 100644 --- a/options/common/gpu/nvidia.nix +++ b/options/common/gpu/nvidia.nix @@ -10,7 +10,7 @@ powerManagement.enable = true; powerManagement.finegrained = false; nvidiaSettings = false; - package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.beta; }; }; }