From 7464d0d808e0730a9b4c8de0b8dca662196aa457 Mon Sep 17 00:00:00 2001 From: Ryan Pandya Date: Fri, 31 Jan 2025 23:53:08 -0800 Subject: [PATCH] Stupid nixos --- flake.nix | 16 ++++++++++++---- hosts/ryanpandya.com/default.nix | 10 ---------- modules/apps/hyprland/default.nix | 11 ++++++++++- modules/profiles/desktop.nix | 1 + 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 921fb0c..6eb4dd1 100644 --- a/flake.nix +++ b/flake.nix @@ -263,23 +263,31 @@ specialArgs = { inherit inputs username; - vars = vars; + vars = { + desktop = false; + gaming = false; + nvidia = false; + }; }; modules = [ ./hosts/ryanpandya.com + inputs.stylix.nixosModules.stylix inputs.sops-nix.nixosModules.sops home-manager.nixosModules.home-manager - inputs.stylix.nixosModules.stylix - { home-manager = { backupFileExtension = "hmbak"; useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = { - inherit inputs vars username; + inherit inputs username; + vars = { + desktop = false; + gaming = false; + nvidia = false; + }; }; sharedModules = with inputs; [ nix-index-database.hmModules.nix-index diff --git a/hosts/ryanpandya.com/default.nix b/hosts/ryanpandya.com/default.nix index f77a2b6..3c1addd 100644 --- a/hosts/ryanpandya.com/default.nix +++ b/hosts/ryanpandya.com/default.nix @@ -32,16 +32,6 @@ "sr_mod" ]; }; - kernelModules = lib.mkDefault [ - "dm-snapshot" - "kvm-amd" - "tcp_bbr" - "uinput" - ]; - kernelParams = lib.mkDefault [ - "amd_iommu=on" - "amd_pstate=active" - ]; # loader = { # systemd-boot = { # windows = { diff --git a/modules/apps/hyprland/default.nix b/modules/apps/hyprland/default.nix index b36dfc6..1fe2342 100644 --- a/modules/apps/hyprland/default.nix +++ b/modules/apps/hyprland/default.nix @@ -6,16 +6,24 @@ }: let + cfg = config.hyprland; browser = builtins.toString config.desktop.browser; terminal = builtins.toString config.desktop.terminal; in with lib; { + imports = [ ./waybar.nix ./swaync.nix ./rofi.nix ]; + options = { + hyprland = { + enable = lib.mkEnableOption "Enable hyprland in NixOS"; + }; + }; + config = lib.mkIf cfg.enable { home-manager.users.${username}.wayland.windowManager.hyprland = { enable = true; @@ -221,4 +229,5 @@ with lib; '' ]; }; -} +}; +} \ No newline at end of file diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index dd76904..6854945 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -37,6 +37,7 @@ in catppuccinTheming.enable = true; adb.enable = true; # floorp.enable = true; + hyprland.enable = true; # kde.enable = true; # mumble.enable = true; # office.enable = true;