From 4660d5f2fd2665b5e9d376b3811db2ff27454beb Mon Sep 17 00:00:00 2001
From: vanten-s <vanten-s@vanten-s.com>
Date: Wed, 13 Mar 2024 21:11:47 +0100
Subject: [PATCH] Added local configs for hypr, and added packages

---
 .gitignore                   |  1 +
 configuration.nix            |  3 ++-
 dotfiles/hypr/hyprland.conf  | 11 +----------
 dotfiles/waybar/config.jsonc |  1 +
 home.nix                     | 12 +++++++++++-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 11e0aba..48e0b11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 local-nixos.nix
+local/
diff --git a/configuration.nix b/configuration.nix
index 2eec677..cee94b2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,7 +10,7 @@ in {
   imports =
     [ # Include the results of the hardware scan.
       /etc/nixos/hardware-configuration.nix
-      ./local-nixos.nix
+      ./local/local-nixos.nix
     ];
 
   # Bootloader.
@@ -119,6 +119,7 @@ in {
     lmms
     bluez
     wl-clipboard
+    home-manager
   ];
 
   programs.nix-ld.libraries = with pkgs; [
diff --git a/dotfiles/hypr/hyprland.conf b/dotfiles/hypr/hyprland.conf
index 7096f6e..8cfcc44 100644
--- a/dotfiles/hypr/hyprland.conf
+++ b/dotfiles/hypr/hyprland.conf
@@ -1,21 +1,12 @@
-monitor = eDP-1,1920x1200,0x0,1
-
 xwayland {
     force_zero_scaling = true
 }
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
-# Execute your favorite apps at launch
+source=~/.config/local/display.conf
 exec-once = waybar & waypaper --restore
 
-# Source a file (multi-file configs)
-# source = ~/.config/hypr/myColors.conf
-
-# Some default env vars.
-env = XCURSOR_SIZE,100
-
-# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
     kb_layout = se
     kb_variant =
diff --git a/dotfiles/waybar/config.jsonc b/dotfiles/waybar/config.jsonc
index 0699817..6453e21 100644
--- a/dotfiles/waybar/config.jsonc
+++ b/dotfiles/waybar/config.jsonc
@@ -7,6 +7,7 @@
     "spacing": 4, // Gaps between modules (4px)
     // Choose the order of the modules
 	"mode": "dock",
+	"include": ["~/.config/local/display.jsonc"],
     "modules-left": [
         "hyprland/workspaces",
         "sway/mode",
diff --git a/home.nix b/home.nix
index bb9a263..254d7c4 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
-{
+let
+  pipewire = pkgs.pipewire;
+in {
   home.username = "svante";
   home.homeDirectory = "/home/svante";
   home.stateVersion = "23.11"; 
@@ -8,6 +10,13 @@
   home.packages = [
     pkgs.fortune
 	pkgs.htop
+	pkgs.xwaylandvideobridge
+	pipewire
+	pkgs.wireplumber
+	pkgs.xdg-desktop-portal-hyprland
+	pkgs.qt6.qtwayland
+	pkgs.libsForQt5.qt5.qtwayland
+	pkgs.obs-studio
   ];
 
   home.file = {
@@ -18,6 +27,7 @@
 	".config/waybar".source = dotfiles/waybar;
 	"scripts".source = dotfiles/scripts;
 	".zshrc".source = dotfiles/zshrc;
+	".config/local".source = dotfiles/local;
   };
 
   home.sessionVariables = { };