diff --git a/flake.nix b/flake.nix index 1f4e344..d0360e0 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,7 @@ home-manager.nixosModules.home-manager inputs.disko.nixosModules.disko stylix.nixosModules.stylix + ./modules/home-manager/stylix.nix { home-manager = { useGlobalPkgs = true; @@ -58,7 +59,7 @@ backupFileExtension = "backup"; users.tulg = { - imports = [./modules/home.nix]; + imports = [./modules/home-manager/home.nix]; }; }; } diff --git a/hosts/virgil/configuration.nix b/hosts/virgil/configuration.nix index 13a4dcb..d933477 100644 --- a/hosts/virgil/configuration.nix +++ b/hosts/virgil/configuration.nix @@ -12,7 +12,6 @@ # ./disko.nix ./hardware-configuration.nix ./vfio.nix - ../modules/stylix.nix ]; # Bootloader. diff --git a/modules/home.nix b/modules/home-manager/home.nix similarity index 77% rename from modules/home.nix rename to modules/home-manager/home.nix index 8952e2d..626f66a 100644 --- a/modules/home.nix +++ b/modules/home-manager/home.nix @@ -28,7 +28,7 @@ in { tmux fastfetch btop - # spotify + spotify pavucontrol wl-clipboard hyprcursor @@ -58,11 +58,11 @@ in { DisableTelemetry = true; }; - programs.spicetify = { - enable = true; - theme = spicePkgs.themes.ziro; - colorScheme = "rose-pine-moon"; - }; + #programs.spicetify = { + # enable = true; + # theme = spicePkgs.themes.ziro; + # colorScheme = "rose-pine-moon"; + #}; xdg.configFile."hypr" = { source = symlink "${dots}/hypr"; @@ -113,41 +113,41 @@ in { userEmail = "tulg@protonmail.ch"; }; - gtk = { - enable = true; + # gtk = { + # enable = true; - theme = { - name = "Nordic-darker"; - package = pkgs.nordic; - }; + # theme = { + # name = "Nordic-darker"; + # package = pkgs.nordic; + # }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; - }; - }; + # iconTheme = { + # name = "Papirus-Dark"; + # package = pkgs.papirus-icon-theme; + # }; + #}; - home.pointerCursor = { - gtk.enable = true; - x11.enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 16; - }; - nixpkgs.config.qt5 = { - enable = true; - platformTheme = "qt5ct"; - style = { - package = pkgs.rose-pine-kvantum; - name = "Rose-pine"; - }; - }; + #home.pointerCursor = { + # gtk.enable = true; + # x11.enable = true; + # package = pkgs.bibata-cursors; + # name = "Bibata-Modern-Classic"; + # size = 16; + #}; + #nixpkgs.config.qt5 = { + # enable = true; + # platformTheme = "qt5ct"; + # style = { + # package = pkgs.rose-pine-kvantum; + # name = "Rose-pine"; + # }; + #}; # # home.sessionVariables = { NIXOS_OZONE_WL = "1"; # hint Electron apps to use Wayland - GTK_THEME = "rose-pine"; - QT_QPA_PLATFORMTHEME = "qt5ct"; + # GTK_THEME = "rose-pine"; + # QT_QPA_PLATFORMTHEME = "qt5ct"; QT_QPA_PLATFORM = "wayland"; # PS1="\[\e[38;5;177m\]\u\[\e[38;5;220m\]@\[\e[38;5;1m\]\h \[\e[38;5;33m\]\w \[\033[0m\]$ "; }; diff --git a/modules/home-manager/stylix.nix b/modules/home-manager/stylix.nix new file mode 100644 index 0000000..5800001 --- /dev/null +++ b/modules/home-manager/stylix.nix @@ -0,0 +1,4 @@ +{pkgs, ...}: { + stylix.enable = true; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; +} diff --git a/modules/stylix.nix b/modules/stylix.nix deleted file mode 100644 index 38e9a3d..0000000 --- a/modules/stylix.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - stylix.enable = true; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/rise-pine.yaml"; - targets.qt.enable = true; -}