From 39f375e29f0ba47c44c71ec01b9e4c002f234b18 Mon Sep 17 00:00:00 2001
From: Alex <alex@ahubbard.xyz>
Date: Fri, 9 Dec 2022 23:58:13 -0600
Subject: [PATCH] update nixos configuration

---
 installers/nixos/configuration.nix      | 19 +++++++++++++++----
 installers/nixos/sway-configuration.nix |  7 ++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/installers/nixos/configuration.nix b/installers/nixos/configuration.nix
index 45d2b97..64c65a1 100644
--- a/installers/nixos/configuration.nix
+++ b/installers/nixos/configuration.nix
@@ -4,11 +4,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-<<<<<<< HEAD
-      ./gaming-configuration.nix
-=======
       #./gaming-configuration.nix
->>>>>>> tmp
       ./sway-configuration.nix
     ];
 
@@ -81,6 +77,8 @@
     	zathura
 	sfeed
     	chromium
+	brave
+	keepassxc
      ];
    };
 
@@ -116,6 +114,7 @@
     noto-fonts-extra
     noto-fonts-emoji
     noto-fonts-cjk-sans
+    nerdfonts
     zip
     unzip
     p7zip
@@ -156,8 +155,18 @@
     udiskie
     python3
     python3.pkgs.pip
+    chafa
       ];
 
+  fonts.fonts = with pkgs; [
+    noto-fonts
+    noto-fonts-extra
+    noto-fonts-emoji
+    noto-fonts-cjk-sans
+    nerdfonts
+
+  ];
+
   #enable flatpak
   services.flatpak.enable = true;
 
@@ -169,6 +178,8 @@
     pulse.enable = true;
   };
 
+
+
   services.pipewire.wireplumber.enable = true;
 
   # xdg-desktop-portal works by exposing a series of D-Bus interfaces
diff --git a/installers/nixos/sway-configuration.nix b/installers/nixos/sway-configuration.nix
index 4e148b2..5b418c9 100644
--- a/installers/nixos/sway-configuration.nix
+++ b/installers/nixos/sway-configuration.nix
@@ -3,8 +3,7 @@
   environment.systemPackages = with pkgs; [
   	wayland
   	sway
-	alacritty
-	swaylock
+	waylock
 	swayidle
 	grim
 	slurp
@@ -14,8 +13,10 @@
 	waybar
 	xwayland
 	gammastep
-	rofi-wayland
+	bemenu
 	imv
+	foot
+	autotiling
   ];
 
   # enable sway window manager