From 1bf2737d9ac15b6585ae551fe98c2b04897818a0 Mon Sep 17 00:00:00 2001
From: vanten-s <vanten-s@vanten-s.com>
Date: Mon, 22 Jul 2024 10:12:45 +0200
Subject: [PATCH] Added stuff

---
 configuration.nix           |  7 ++-
 dotfiles/hypr/hyprland.conf |  5 --
 home.nix                    | 99 +++++++++++++++++++++----------------
 3 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 31cc614..d75ea00 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -77,7 +77,7 @@ in {
   users.users.svante = {
     isNormalUser = true;
     description = "Svante";
-    extraGroups = [ "networkmanager" "wheel" "audio" "dialout" ];
+    extraGroups = [ "networkmanager" "wheel" "audio" "dialout" "wireshark" ];
     shell = pkgs.zsh;
     packages = with pkgs; [];
   };
@@ -131,6 +131,7 @@ in {
     glib
     links2
     dolphin
+    wireshark
     pkg-config
     gnome.nautilus
     kitty
@@ -148,6 +149,7 @@ in {
     wtype
     cifs-utils
     waybar
+    ffmpeg
     pulsemixer
     waypaper
     swaybg
@@ -312,9 +314,10 @@ in {
     enable = true;
     allowedTCPPortRanges = [ 
       { from = 1714; to = 1764; } # KDE Connect
+      { from = 22000; to = 22000; } # KDE Connect
     ];  
     allowedUDPPortRanges = [ 
-      { from = 1714; to = 1764; } # KDE Connect
+      { from = 22000; to = 22000; } # KDE Connect
     ];  
   };
 
diff --git a/dotfiles/hypr/hyprland.conf b/dotfiles/hypr/hyprland.conf
index 445a2aa..03a89fb 100644
--- a/dotfiles/hypr/hyprland.conf
+++ b/dotfiles/hypr/hyprland.conf
@@ -78,11 +78,6 @@ dwindle {
     preserve_split = yes # you probably want this
 }
 
-master {
-    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
-}
-
 gestures {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
     workspace_swipe = off
diff --git a/home.nix b/home.nix
index 8f1d6c1..35b53a8 100644
--- a/home.nix
+++ b/home.nix
@@ -5,50 +5,65 @@
   home.homeDirectory = "/home/svante";
   home.stateVersion = "23.11"; 
 
-  home.packages = [
-    pkgs.fortune
-    pkgs.mako
-    pkgs.kdePackages.kalgebra
-    pkgs.libreoffice
-    pkgs.htop
-    pkgs.ripgrep
-    pkgs.xwaylandvideobridge
-    pkgs.qtpass
-    pkgs.pipewire
-    pkgs.jdk21
-    pkgs.wireplumber
-    pkgs.xdg-desktop-portal-hyprland
-    pkgs.qt6.qtwayland
-    pkgs.libsForQt5.qt5.qtwayland
-    pkgs.ccls
-    pkgs.clang
-    pkgs.obs-studio
-    pkgs.prismlauncher
-    pkgs.prusa-slicer
-    pkgs.gphoto2
-    pkgs.freecad
-    pkgs.direnv
-    pkgs.easyeffects
-    pkgs.tmux
-    pkgs.kicad
-    pkgs.spotify
-    pkgs.arduino-ide
-    pkgs.blender
-    pkgs.gimp
-    pkgs.davinci-resolve
-    pkgs.feh
-    pkgs.unityhub
-    pkgs.distrobox
-    pkgs.godot_4
-    pkgs.dig
-    pkgs.socat
-    pkgs.android-studio
-    pkgs.android-tools
-    pkgs.steam
-    pkgs.sidequest
-    pkgs.libei
+  home.packages = with pkgs; [
+    fortune
+    mako
+    kdePackages.kalgebra
+    libreoffice
+    htop
+    ripgrep
+    xwaylandvideobridge
+    qtpass
+    pipewire
+    jdk21
+    wireplumber
+    xdg-desktop-portal-hyprland
+    qt6.qtwayland
+    libsForQt5.qt5.qtwayland
+    ccls
+    clang
+    obs-studio
+    prismlauncher
+    prusa-slicer
+    gphoto2
+    freecad
+    direnv
+    easyeffects
+    tmux
+    kicad
+    spotify
+    arduino-ide
+    blender
+    gimp
+    davinci-resolve
+    feh
+    unityhub
+    distrobox
+    godot_4
+    dig
+    socat
+    android-studio
+    android-tools
+    steam
+    sidequest
+    libei
   ];
 
+  programs.ncspot = {
+    enable = true;
+    settings = {
+      notify = true;
+    };
+  };
+
+  services.mako = {
+    enable = true;
+    backgroundColor = "#1e1e2ee0";
+    borderRadius = 10;
+    icons = false;
+    defaultTimeout = 3000;
+  };
+
   home.file = {
 	".config/fuzzel".source = dotfiles/fuzzel;
 	".config/hypr".source = dotfiles/hypr;