moving away from stylix

This commit is contained in:
Charlie Root 2024-08-15 23:13:09 +02:00
commit 8f63946c67
18 changed files with 35 additions and 13 deletions

View file

@ -24,15 +24,15 @@
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
modules = { modules = {
system = { system = {
programs = { programs = {
editors = { editors = {
emacs.enable = false; emacs.enable = false;
neovim.enable = true; neovim.enable = true;
helix.enable = true; helix.enable = false;
kakoune.enable = true; kakoune.enable = false;
}; };
discord.enable = true; discord.enable = true;
firefox.enable = true; firefox.enable = true;

View file

@ -8,7 +8,7 @@ _: {
./editors ./editors
./wms ./wms
./runners ./runners
./styling ./style
./options ./options
./system/nix/module.nix ./system/nix/module.nix
./system ./system

View file

@ -15,7 +15,7 @@ _: {
go.enable = true; go.enable = true;
python.enable = true; python.enable = true;
bash.enable = true; bash.enable = true;
typst.enable = true; typst.enable = false;
zig.enable = true; zig.enable = true;
dart.enable = false; dart.enable = false;
elixir.enable = false; elixir.enable = 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 = true; smoothScroll.enable = false;
cellularAutomaton.enable = true; cellularAutomaton.enable = true;
highlight-undo.enable = true; highlight-undo.enable = true;

View file

@ -4,5 +4,6 @@ _: {
./quickshell ./quickshell
./qt.nix ./qt.nix
./gtk.nix ./gtk.nix
./module.nix
]; ];
} }

18
modules/style/module.nix Normal file
View file

@ -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;
};
};
}

View file

@ -8,6 +8,7 @@
cfg = config.modules.usrEnv.desktops.hyprland; cfg = config.modules.usrEnv.desktops.hyprland;
inherit (config.modules.other.system) username; inherit (config.modules.other.system) username;
inherit (inputs'.anyrun.packages) anyrun; inherit (inputs'.anyrun.packages) anyrun;
inherit (config.modules.style) cursor;
inherit inherit
(inputs'.nixpkgs-wayland.packages) (inputs'.nixpkgs-wayland.packages)
foot foot
@ -19,13 +20,14 @@
split-monitor-workspaces split-monitor-workspaces
; ;
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (builtins) toString;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
# programs.hyprland = { programs.hyprland = {
# enable = true; enable = true;
# inherit (cfg) package; inherit (cfg) package;
# portalPackage = inputs'.hyprland.packages.xdg-desktop-portal-hyprland; portalPackage = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
# }; };
# xdg Portal # xdg Portal
xdg.portal = { xdg.portal = {
enable = true; enable = true;
@ -44,7 +46,7 @@ in {
home-manager.users.${username} = { home-manager.users.${username} = {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
inherit (cfg) package; # inherit (cfg) package;
# Split-monitor-workspaces provides awesome-like workspace behaviour # Split-monitor-workspaces provides awesome-like workspace behaviour
plugins = [ plugins = [
@ -335,6 +337,7 @@ in {
}; };
# Programs which get executed at Hyprland start. # Programs which get executed at Hyprland start.
exec-once = [ exec-once = [
"hyprctl setcursor ${cursor.name} ${toString cursor.size}"
#start waybar #start waybar
"${pkgs.waybar}/bin/waybar" "${pkgs.waybar}/bin/waybar"

View file

@ -10,7 +10,7 @@
powerManagement.enable = true; powerManagement.enable = true;
powerManagement.finegrained = false; powerManagement.finegrained = false;
nvidiaSettings = false; nvidiaSettings = false;
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.beta;
}; };
}; };
} }