From 2969ff18b8d69c2543518f0e4e18787aa5d1a92d Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Mon, 19 Feb 2024 21:57:48 -0600
Subject: [PATCH] Initial testing with new Hyprland keybinding display script

---
 config/home/hyprland.nix      |  4 ++--
 config/system/neovim.nix      | 13 +++++++++++++
 config/system/packages.nix    | 31 ++++++++++++++++---------------
 config/system/persistence.nix |  1 +
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/config/home/hyprland.nix b/config/home/hyprland.nix
index be5b321..0a94a14 100644
--- a/config/home/hyprland.nix
+++ b/config/home/hyprland.nix
@@ -173,8 +173,8 @@ in with lib; {
       bind = ${modifier},8,workspace,8
       bind = ${modifier},9,workspace,9
       bind = ${modifier},0,workspace,10
-      bind = ${modifier},SPACE,movetoworkspace,special
-      bind = ${modifier}SHIFT,SPACE,togglespecialworkspace
+      bind = ${modifier}SHIFT,SPACE,movetoworkspace,special
+      bind = ${modifier},SPACE,togglespecialworkspace
       bind = ${modifier}SHIFT,1,movetoworkspace,1
       bind = ${modifier}SHIFT,2,movetoworkspace,2
       bind = ${modifier}SHIFT,3,movetoworkspace,3
diff --git a/config/system/neovim.nix b/config/system/neovim.nix
index 5caa54c..1e40a18 100644
--- a/config/system/neovim.nix
+++ b/config/system/neovim.nix
@@ -30,6 +30,7 @@ in {
 	servers = {
 	  tsserver.enable = true;
 	  lua-ls.enable = true;
+	  bashls.enable = true;
 	  rust-analyzer = {
 	    enable = true;
 	    installRustc = true;
@@ -79,6 +80,7 @@ in {
       vim.keymap.set('n', '<leader>s', function()
         builtin.grep_string({ search = vim.fn.input("Grep > ") })
       end)
+      vim.api.nvim_set_option("clipboard","unnamed")
     '';
 
     extraConfigVim = ''
@@ -87,6 +89,17 @@ in {
       inoremap jj <ESC>
       let s:guifontsize = 16
       let s:guifont = "JetBrainsMono\\ Nerd\\ Font"
+      " " Copy to clipboard
+      vnoremap  <leader>y  "+y
+      nnoremap  <leader>Y  "+yg_
+      nnoremap  <leader>y  "+y
+      nnoremap  <leader>yy  "+yy
+
+      " " Paste from clipboard
+      nnoremap <leader>p "+p
+      nnoremap <leader>P "+P
+      vnoremap <leader>p "+p
+      vnoremap <leader>P "+P
     '';
 
     keymaps = [
diff --git a/config/system/packages.nix b/config/system/packages.nix
index c0c7344..52f2698 100644
--- a/config/system/packages.nix
+++ b/config/system/packages.nix
@@ -15,22 +15,23 @@
     networkmanagerapplet yad playerctl nh
   ];
 
-  programs.steam.gamescopeSession.enable = true;
-  programs.dconf.enable = true;
-  programs.seahorse.enable=true;
-  programs.hyprland = {
-    enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-    xwayland.enable = true;
-  };
-  
-  programs.fuse.userAllowOther = true;
-  programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
+  programs = {
+    steam.gamescopeSession.enable = true;
+    dconf.enable = true;
+    seahorse.enable=true;
+    hyprland = {
+      enable = true;
+      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      xwayland.enable = true;
+    };
+    fuse.userAllowOther = true;
+    mtr.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+    virt-manager.enable = true;
   };
 
   virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
 }
diff --git a/config/system/persistence.nix b/config/system/persistence.nix
index 48b5773..8851658 100644
--- a/config/system/persistence.nix
+++ b/config/system/persistence.nix
@@ -29,6 +29,7 @@ in
 	".ssh"
 	".config/discord"
 	".config/obs-studio"
+	".steam"
       ];
       files = [
       ];