From 374cb77150de56d2039b114a92a7c6f6600d0dab Mon Sep 17 00:00:00 2001 From: Maaz Khokhar Date: Mon, 22 Jun 2026 15:56:51 -0500 Subject: [PATCH] moved some files + changed the layout. made hyprland config always there, just not in use. starting ricing. --- desktops/hyprland/default.nix | 2 +- desktops/hyprland/home.nix | 20 -------------------- desktops/hyprland/system.nix | 13 ++----------- home/config/hypr/hyprland.lua | 0 home/default.nix | 5 ++++- hosts/laptop/configuration.nix | 2 +- 6 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 desktops/hyprland/home.nix create mode 100644 home/config/hypr/hyprland.lua diff --git a/desktops/hyprland/default.nix b/desktops/hyprland/default.nix index baa959b..ff66a6c 100644 --- a/desktops/hyprland/default.nix +++ b/desktops/hyprland/default.nix @@ -4,4 +4,4 @@ imports = [ ./system.nix ]; -} \ No newline at end of file +} diff --git a/desktops/hyprland/home.nix b/desktops/hyprland/home.nix deleted file mode 100644 index 59c5d6e..0000000 --- a/desktops/hyprland/home.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: - -{ - wayland.windowManager.hyprland = { - enable = true; - - settings = { - "$mod" = "SUPER"; - - bind = [ - "$mod, Q, exec, ghostty" - "$mod, F, exec, brave" - ]; - }; - }; - - home.sessionVariables = { - NIXOS_OZONE_WL = "1"; - }; -} diff --git a/desktops/hyprland/system.nix b/desktops/hyprland/system.nix index fd5fc03..32333b2 100644 --- a/desktops/hyprland/system.nix +++ b/desktops/hyprland/system.nix @@ -2,21 +2,12 @@ { programs.hyprland.enable = true; - services.displayManager.sddm.wayland.enable = true; xdg.portal = { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; }; - security.polkit.enable = true; - - environment.systemPackages = with pkgs; [ - hyprland - hyprpicker - mpvpaper - quickshell - hyprpolkitagent - rofi - ]; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; } diff --git a/home/config/hypr/hyprland.lua b/home/config/hypr/hyprland.lua new file mode 100644 index 0000000..e69de29 diff --git a/home/default.nix b/home/default.nix index 121e831..a9136cb 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,9 +4,12 @@ imports = [ ./programs/bash.nix ./programs/git.nix - ../desktops/hyprland/home.nix ]; + home.file = { + ".config/hypr".source = ./config/hypr; + }; + home.username = "river"; home.homeDirectory = "/home/river"; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 44cc167..beddd0a 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -2,7 +2,7 @@ { imports = [ - ./hardware-configuration.nix + #./hardware-configuration.nix ./disko.nix # Modules