diff --git a/flake.nix b/flake.nix index 7cb3fea..4e19c49 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,11 @@ nix-cachyos-kernel = { url = "github:xddxdd/nix-cachyos-kernel/release"; }; + + #============ + #=== Rice === + #============ + # Hyprland hyprland = { url = "github:hyprwm/Hyprland"; @@ -27,6 +32,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:nix-community/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + quickshell = { url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; @@ -88,6 +98,7 @@ modules = [ inputs.nixos-hardware.nixosModules.framework-16-7040-amd inputs.lanzaboote.nixosModules.lanzaboote + inputs.stylix.nixosModules.stylix ./hosts/framework/configuration.nix inputs.home-manager.nixosModules.default inputs.sops-nix.nixosModules.sops diff --git a/hosts/framework/home.nix b/hosts/framework/home.nix index 1b9e3dd..ab7f1b9 100644 --- a/hosts/framework/home.nix +++ b/hosts/framework/home.nix @@ -5,6 +5,7 @@ let in { imports = [ + modules.hm.colors modules.common.home modules.hm.hyprland ]; diff --git a/modules/default.nix b/modules/default.nix index 0911ae2..846f0fa 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,8 +13,9 @@ }; hm = { - hyprland = ./home-manager/Hyprland/hyprland.nix; - scripts = ./home-manager/Hyprland/scripts.nix; + colors = ./home-manager/Rice/colors.nix; + hyprland = ./home-manager/Rice/Hyprland/hyprland.nix; + scripts = ./home-manager/Rice/Hyprland/scripts.nix; nvim = ./home-manager/nvim.nix; shell = ./home-manager/shell.nix; spicetify = ./home-manager/spicetify.nix; diff --git a/modules/home-manager/Hyprland/hyprland.nix b/modules/home-manager/Rice/Hyprland/hyprland.nix similarity index 98% rename from modules/home-manager/Hyprland/hyprland.nix rename to modules/home-manager/Rice/Hyprland/hyprland.nix index 980cfc1..0b46f39 100644 --- a/modules/home-manager/Hyprland/hyprland.nix +++ b/modules/home-manager/Rice/Hyprland/hyprland.nix @@ -75,7 +75,7 @@ in "$mod, Q, killactive" "$mod, RETURN, exec, $term" "$mod, M, exit" - "$mod, R, exec, $launcher2" + "$mod, R, exec, $launcher" "$mod SHIFT, F, exec, $browser" "$mod, E, exec, $fileManager" "$mod, F, fullscreen" diff --git a/modules/home-manager/Hyprland/scripts.nix b/modules/home-manager/Rice/Hyprland/scripts.nix similarity index 100% rename from modules/home-manager/Hyprland/scripts.nix rename to modules/home-manager/Rice/Hyprland/scripts.nix diff --git a/modules/home-manager/Rice/colors.nix b/modules/home-manager/Rice/colors.nix new file mode 100644 index 0000000..795ea0c --- /dev/null +++ b/modules/home-manager/Rice/colors.nix @@ -0,0 +1,9 @@ +{ config, pkgs, inputs, ...}: + +{ + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-moon.yaml"; + }; + +}