From f75b3bd85ff607c94ae0312414463d94c73436e3 Mon Sep 17 00:00:00 2001
From: stitchy <stitchy@stitchy.moe>
Date: Wed, 28 Feb 2024 23:16:12 +0000
Subject: [PATCH] Flake update and refactor user programs/services

---
 config/hypr/hyprland.conf     |  4 ++--
 configuration.nix             | 24 ------------------------
 flake.lock                    | 18 +++++++++---------
 users/stitchynyan/default.nix | 27 +++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 811af4d..600fc5f 100755
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -34,8 +34,8 @@ input {
 }
 
 general {
-    gaps_in=5
-    gaps_out=15
+    gaps_in=3
+    gaps_out=5
     border_size=3
     col.active_border=0xff7733cc
     col.inactive_border=0xff333333
diff --git a/configuration.nix b/configuration.nix
index b770964..0ac1e89 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,35 +14,11 @@
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = false;
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
-
-  # Swaylock allow to unlock
-  security.pam.services.swaylock = {};
   security.sudo.wheelNeedsPassword=false;
   security.rtkit.enable = true;
-  services.gnome.gnome-keyring.enable = true;
-  services.usbmuxd.enable = true;
-  services.pipewire = {
-    enable = true;
-    pulse.enable = true;
-    alsa.enable = true;
-  };
 
   programs.zsh.enable = true;
-  programs.openvpn3.enable = true;
-  programs.hyprland.enable = true;
-
 
   programs.neovim = {
     enable = true;
diff --git a/flake.lock b/flake.lock
index d96a0f9..cfb1aa2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,11 +92,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708806879,
-        "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
+        "lastModified": 1708988456,
+        "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
+        "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1708906756,
-        "narHash": "sha256-mKksRwLcI+j6cCG7eSkIf0JzsXumlUMpssZKZZHiXrE=",
+        "lastModified": 1709076082,
+        "narHash": "sha256-1FZB4JQKXkD3NmUsmAN4t5XNdm8SMREjmsYz9gMEG78=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "dfcfb92ec611345848f3840d34d66b8501e6367c",
+        "rev": "489ac40abd7b3ae037e1681ee92bbef9d981a29c",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1708807242,
-        "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
+        "lastModified": 1708984720,
+        "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
+        "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
         "type": "github"
       },
       "original": {
diff --git a/users/stitchynyan/default.nix b/users/stitchynyan/default.nix
index bf361aa..fa0e59b 100644
--- a/users/stitchynyan/default.nix
+++ b/users/stitchynyan/default.nix
@@ -9,6 +9,33 @@
       "steam-original"
       ];
 
+  programs = {
+    hyprland.enable = true;
+    openvpn3.enable = true;
+  };
+
+  services = {
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+    blueman.enable = true;
+    gnome.gnome-keyring.enable = true;
+    pipewire = {
+      enable = true;
+      pulse.enable = true;
+      alsa.enable = true;
+    };
+    printing.enable = true;
+    usbmuxd.enable = true;
+    xserver.enable = true;
+  };
+
+  security.pam.services.swaylock = {};
+
+  hardware.bluetooth.enable = true;
+
   users.users.stitchynyan = {
     isNormalUser = true;
     shell = pkgs.zsh;