From 5dd1f087dfd9eac2e5fb18665c8196c7a1fecd94 Mon Sep 17 00:00:00 2001
From: Daniel Meiburg <key@dmeiburg.de>
Date: Tue, 26 Sep 2023 17:46:18 +0200
Subject: [PATCH] update

---
 dotfiles   |  2 +-
 git/config | 24 ------------------------
 home.nix   | 48 ++++++++++++++++++++++++++++--------------------
 3 files changed, 29 insertions(+), 45 deletions(-)
 delete mode 100644 git/config

diff --git a/dotfiles b/dotfiles
index cb8d0a0..818b029 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit cb8d0a0a4494c450610853717e5b9cd453e9b517
+Subproject commit 818b029c295457bf6fb087c33ca5ba289030b6be
diff --git a/git/config b/git/config
deleted file mode 100644
index 474e15c..0000000
--- a/git/config
+++ /dev/null
@@ -1,24 +0,0 @@
-[user]
-	email = key@dmeiburg.de
-	name = Daniel Meiburg
-	signingkey = 782C4A83DD7B9E4A64B12EDEE5827ECFFE0AA4F2
-[alias]
-	br = branch
-  co = checkout
-  cm = commit
-  l = log --oneline --graph
-[commit]
-	gpgSign = true
-[init]
-	defaultBranch = master
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
-[difftool]
-    prompt = true
-[diff]
-    tool = nvimdiff
-[difftool "nvimdiff"]
-    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
diff --git a/home.nix b/home.nix
index 9e1b7de..022b3b8 100644
--- a/home.nix
+++ b/home.nix
@@ -2,13 +2,17 @@
 
 {
   home.packages = with pkgs; [ 
-      firefox
+      firefox-wayland
       gnupg
       htop
       ripgrep
       pavucontrol
       fish
       pass
+      kitty
+      waybar
+      kanshi
+      pulseaudio
       # All of the below is for sway
       wl-clipboard
       mako
@@ -19,30 +23,34 @@
       enable = true;
     };
     home.file = {
-      ".config/git" = {
-        source = ./git;
+      ".config/" = {
+        source = ./dotfiles/.config;
+        recursive = true;
+      };
+   };
+    home.file = {
+      ".xkb/" = {
+        source = ./dotfiles/.xkb;
+        recursive = true;
+      };
+   };
+    home.file = {
+      ".profile" = {
+        source = ./dotfiles/.profile;
+        recursive = true;
+      };
+   };
+    home.file = {
+      ".tmux.conf" = {
+        source = ./dotfiles/.tmux.conf;
         recursive = true;
       };
    };
-    programs.kitty = {
-      enable = true;
-      theme = "Solarized Dark";
-    };
     wayland.windowManager.sway = {
     enable = true;
     wrapperFeatures.gtk = true;
-    config = rec {
-      modifier = "Mod4";
-      terminal = "kitty"; 
-      bars = [{
-      command = "waybar";
-      }];
-      output = {
-        HDMI-A-1 = {
-          scale = "2";
-        };
-      };
     };
-  };
-  programs.waybar.enable = true;
+   programs.browserpass = {
+     enable = true;
+   };
 }