diff --git a/hypr/autostart.conf b/hypr/autostart.conf
index 69d718b..6d0378b 100755
--- a/hypr/autostart.conf
+++ b/hypr/autostart.conf
@@ -33,6 +33,7 @@ source = ~/.config/hypr/wallpaper.conf
 # env
 env = WLR_DRM_NO_ATOMIC, 1
 env = DOTNET_CLI_TELEMETRY_OPTOUT, true
+env = QT_QPA_PLATFORMTHEME, qt6ct
 source = ~/.config/hypr/nvidia.conf
 windowrulev2 = immediate, title:^(Overwatch)$
 windowrulev2 = immediate, class:^(cs2)$
diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
index cb35002..260a22d 100644
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@@ -1,9 +1,8 @@
-$lockCmd = hyprlock
 general {
-    lock_cmd = $lockCmd # dbus/sysd lock command (loginctl lock-session)
-    unlock_cmd = loginctl unlock-session      # same as above, but unlock
-    before_sleep_cmd = $lockCmd # command ran before sleep
-    # after_sleep_cmd = $lockCmd # command ran after sleep
+    lock_cmd = pidof hyprlock || hyprlock # dbus/sysd lock command (loginctl lock-session)
+    # unlock_cmd = loginctl unlock-session      # same as above, but unlock
+    before_sleep_cmd = loginctl lock-session # command ran before sleep
+    after_sleep_cmd = hyprctl dispatch dpms on # command ran after sleep
     ignore_dbus_inhibit = false      # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
 }
 
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 85ec3a2..35ead83 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -152,10 +152,10 @@ dwindle {
     special_scale_factor = 0.89,
 }
 
-master {
+# master {
     # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
-}
+  #   new_is_master = true
+# }
 
 gestures {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
diff --git a/kitty/OneNord.conf b/kitty/OneNord.conf
new file mode 100644
index 0000000..930157e
--- /dev/null
+++ b/kitty/OneNord.conf
@@ -0,0 +1,55 @@
+# vim:ft=kitty
+## name: onenord
+## author: Ryan Mehri
+## license: MIT
+## blurb: A Kitty theme that combines the Nord and Atom One Dark color palettes for a more vibrant programming experience.
+
+# Onenord Colorscheme for Kitty
+# Based on:
+# - https://github.com/connorholyday/nord-kitty/blob/master/nord.conf
+# - https://github.com/olimorris/onedarkpro.nvim/blob/main/extras/kitty_onedark.conf
+
+foreground            #E5E9F0
+background            #2E3440
+selection_foreground  none
+selection_background  #3F4758
+url_color             #88C0D0
+cursor                #81A1C1
+
+# black
+color0   #3B4252
+color8   #4C566A
+
+# red
+color1   #E06C75
+color9   #E06C75
+
+# green
+color2   #9EC183
+color10  #9EC183
+
+# yellow
+color3   #EBCB8B
+color11  #EBCB8B
+
+# blue
+color4   #81A1C1
+color12  #81A1C1
+
+# magenta
+color5   #B988B0
+color13  #B988B0
+
+# cyan
+color6   #88C0D0
+color14  #8FBCBB
+
+# white
+color7   #E5E9F0
+color15  #ECEFF4
+
+# Tab bar
+active_tab_foreground   #88C0D0
+active_tab_background   #434C5E
+inactive_tab_foreground #6C7A96
+inactive_tab_background #2E3440
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 0482ccb..6803e70 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8:foldmethod=marker
 
+include ./OneNord.conf
 include ./kittyScrollback.conf
 
 # include ./OneDark.conf
@@ -1078,9 +1079,8 @@ tab_bar_align left
 
 #: Color scheme {{{
 
-foreground #dddddd
-background #000000
-include ./OneDark.conf
+# foreground #dddddd
+# background #000000
 
 #: The foreground and background colors.
 
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 572a5e2..d0cddf5 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -2,62 +2,64 @@
   "Ionide-vim": { "branch": "master", "commit": "00099c3cf53cba28a1d8084ab8d21639c62bd747" },
   "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
   "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
-  "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" },
+  "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "codesnap.nvim": { "branch": "main", "commit": "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b" },
-  "conform.nvim": { "branch": "master", "commit": "5541c54cf2ab078a537838e1fb9d96ae47f71255" },
-  "copilot.vim": { "branch": "release", "commit": "1dcaf72099b436b5832d6117d9cd7a4a098a8d77" },
-  "cord.nvim": { "branch": "master", "commit": "cf0af0fc9b8e218afd8c4928ae2e711ce455181b" },
-  "csharpls-extended-lsp.nvim": { "branch": "master", "commit": "bde4aebe0dc74952188c2130c6831a1d8e4ce5c6" },
-  "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
+  "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" },
+  "copilot.vim": { "branch": "release", "commit": "0668308e68b0ac28b332b204b469fbe04601536a" },
+  "cord.nvim": { "branch": "master", "commit": "d6dbc90cb87fc5388833fdf4d3aa3dbf5b11c9f0" },
+  "csharpls-extended-lsp.nvim": { "branch": "master", "commit": "5a474b06743bb20a90191994457f5e62f444976b" },
+  "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
+  "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" },
+  "go.nvim": { "branch": "master", "commit": "78c6d7b970a79c34dc0f35149f4bd845e09803d6" },
+  "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
-  "image.nvim": { "branch": "master", "commit": "a2a0849e0b3dbed90f9283603cedb683bda5d4d1" },
+  "image.nvim": { "branch": "master", "commit": "bdd5506be7fb39668692e30141f1637b691379af" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
   "kitty-scrollback.nvim": { "branch": "main", "commit": "dc101d0a8356db9c7290dfbfa82c27ec35e3b55a" },
-  "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" },
-  "leap.nvim": { "branch": "main", "commit": "0d15057cc47fa49f6609bf364f5ad3842f08c58c" },
+  "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" },
+  "leap.nvim": { "branch": "main", "commit": "eca8108dcd5f41fbde2a674dceb58b81ed887dc8" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
   "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
   "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
-  "neofusion.nvim": { "branch": "main", "commit": "3563eb3b9f9d0a9981852ab8b0d922ec7930a53f" },
-  "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" },
+  "noice.nvim": { "branch": "main", "commit": "88ac36864b5976a64b14a8f156c616f41b32f228" },
   "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
   "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
   "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
   "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
   "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" },
+  "nvim-lspconfig": { "branch": "master", "commit": "f43135c38a37c588053ad5e209c7460f43f6340c" },
   "nvim-navbuddy": { "branch": "master", "commit": "f22bac988f2dd073601d75ba39ea5636ab6e38cb" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
-  "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
+  "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-treesitter": { "branch": "master", "commit": "c1e1e24b6433d4539bad9f5daa207df39633071b" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" },
+  "nvim-treesitter": { "branch": "master", "commit": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" },
   "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
   "oil-git-status.nvim": { "branch": "main", "commit": "a7ea816bac0cc3b8b4c3605e2f2b87960be60a05" },
-  "oil.nvim": { "branch": "master", "commit": "e5312c3a801e7274fa14e6a56aa10a618fed80c3" },
+  "oil.nvim": { "branch": "master", "commit": "65c53dbe4f2140236590a7568a5f22a77d16be39" },
+  "onenord.nvim": { "branch": "main", "commit": "70b716fd36a18284ad768402523b79ccdadafedf" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "0f314613125fdd7c85faaee3c87051611d883253" },
-  "rustaceanvim": { "branch": "master", "commit": "2fa45427c01ded4d3ecca72e357f8a60fd8e46d4" },
+  "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" },
+  "rustaceanvim": { "branch": "master", "commit": "d6d7620b66d74b3b16defcf85cbef7b3582795b3" },
   "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "trouble.nvim": { "branch": "main", "commit": "806c50491078b66daf13c408042f2e74da46d0ff" },
+  "trouble.nvim": { "branch": "main", "commit": "2d8610a07033f2b367e71230ab128f8b89c2639d" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "0dc68d9225a70d42f8645049482e090c1a8dce25" },
-  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "a95d8b61b3f9102f566462fc50781e3e7c769232" },
+  "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }
 }
\ No newline at end of file
diff --git a/nvim/lua/themystery/plugins/conform.lua b/nvim/lua/themystery/plugins/conform.lua
index 320ee14..18607d9 100644
--- a/nvim/lua/themystery/plugins/conform.lua
+++ b/nvim/lua/themystery/plugins/conform.lua
@@ -20,7 +20,8 @@ return {
             lua = { "stylua" },
             python = { "isort", "black" },
             javascript = { { "prettierd", "prettier" } },
-            rust = {"rustfmt"}
+            rust = { "rustfmt" },
+            go = { "gofmt" }
         },
         -- -- Set up format-on-save
         format_on_save = { timeout_ms = 500, lsp_fallback = true },
diff --git a/nvim/lua/themystery/plugins/copilot.lua b/nvim/lua/themystery/plugins/copilot.lua
index a1cc3dd..44467fc 100644
--- a/nvim/lua/themystery/plugins/copilot.lua
+++ b/nvim/lua/themystery/plugins/copilot.lua
@@ -5,7 +5,8 @@ return {
         vim.api.nvim_set_keymap("i", "<C-J>", 'copilot#Accept("<CR>")', { silent = true, expr = true })
         vim.g.copilot_filetypes = {
             -- because i'm learning rust
-            rust = false
+            rust = false,
+            go = false,
         };
     end
 }
diff --git a/nvim/lua/themystery/plugins/cord.lua b/nvim/lua/themystery/plugins/cord.lua
index e012ce7..b344d49 100644
--- a/nvim/lua/themystery/plugins/cord.lua
+++ b/nvim/lua/themystery/plugins/cord.lua
@@ -25,6 +25,14 @@ return {
                 swap_fields = false,          -- If enabled, workspace is displayed first
                 workspace_blacklist = {},     -- List of workspace names to hide
             },
+            idle = {
+                enable = true, -- Enable idle status
+                show_status = true, -- Display idle status, disable to hide the rich presence on idle
+                timeout = 360000, -- Timeout in milliseconds after which the idle status is set, 0 to display immediately
+                disable_on_focus = false, -- Do not display idle status when neovim is focused
+                text = 'Idle', -- Text to display when idle
+                tooltip = '💤', -- Text to display when hovering over the idle image
+            },
         })
     end
 }
diff --git a/nvim/lua/themystery/plugins/lsp.lua b/nvim/lua/themystery/plugins/lsp.lua
index 0e746d3..8548010 100644
--- a/nvim/lua/themystery/plugins/lsp.lua
+++ b/nvim/lua/themystery/plugins/lsp.lua
@@ -4,6 +4,14 @@ return {
         version = '^4', -- Recommended
         ft = { 'rust' },
     },
+    {
+        "ray-x/go.nvim",
+        dependencies = { -- optional packages
+            "ray-x/guihua.lua",
+        },
+        ft = { "go", 'gomod' },
+        build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries
+    },
     {
         'VonHeikemen/lsp-zero.nvim',
         branch = 'v3.x',
@@ -30,8 +38,9 @@ return {
             "SmiteshP/nvim-navbuddy",
             "Decodetalkers/csharpls-extended-lsp.nvim",
 
-            -- rust
-            'mrcjkb/rustaceanvim'
+            -- specific language servers
+            'mrcjkb/rustaceanvim',
+            'ray-x/go.nvim',
         },
         config = function()
             local lsp = require("lsp-zero")
@@ -191,6 +200,11 @@ return {
             end)
 
             require("mason").setup({});
+            require("go").setup({
+                lsp_cfg = false
+            })
+
+            local gopls_opts = require("go.lsp").config()
             require("mason-lspconfig").setup({
                 ensure_installed = { 'tsserver', 'svelte', 'lua_ls', 'csharp_ls' },
                 handlers = {
@@ -201,6 +215,9 @@ return {
                     end,
                     rust_analyzer = lsp.noop,
                     fsautocomplete = lsp.noop,
+                    gopls = function()
+                        require('lspconfig').gopls.setup(gopls_opts)
+                    end,
                 }
             })
 
diff --git a/nvim/lua/themystery/plugins/lualine.lua b/nvim/lua/themystery/plugins/lualine.lua
index dbfb0d6..bed0e4f 100644
--- a/nvim/lua/themystery/plugins/lualine.lua
+++ b/nvim/lua/themystery/plugins/lualine.lua
@@ -36,7 +36,8 @@ return {
                 -- Disable sections and component separators
                 component_separators = '',
                 section_separators = '',
-                globalstatus = true
+                globalstatus = true,
+                theme = 'onenord'
             },
             sections = {
                 -- these are to remove the defaults
diff --git a/nvim/lua/themystery/plugins/telescope.lua b/nvim/lua/themystery/plugins/telescope.lua
index b6cc526..80da04c 100644
--- a/nvim/lua/themystery/plugins/telescope.lua
+++ b/nvim/lua/themystery/plugins/telescope.lua
@@ -3,7 +3,8 @@ return {
     branch = "0.1.x",
     dependencies = {
         "nvim-lua/plenary.nvim",
-        "nvim-telescope/telescope-ui-select.nvim"
+        "nvim-telescope/telescope-ui-select.nvim",
+        "ThePrimeagen/harpoon",
     },
     config = function()
         local builtin = require('telescope.builtin')
@@ -22,7 +23,7 @@ return {
             extensions = {
                 ["ui-select"] = {
                     require("telescope.themes").get_cursor {}
-                }
+                },
             },
             defaults = {
                 mappings = {
@@ -54,9 +55,11 @@ return {
                             ['<C-d>'] = actions.delete_buffer
                         }
                     }
-                }
+                },
             }
         }
         require("telescope").load_extension("ui-select")
+        require("telescope").load_extension("harpoon")
+        vim.keymap.set("n", "<leader>pba", ":Telescope harpoon marks<CR>")
     end
 }
diff --git a/nvim/lua/themystery/plugins/theme.lua b/nvim/lua/themystery/plugins/theme.lua
index 8cba563..ff71d1b 100644
--- a/nvim/lua/themystery/plugins/theme.lua
+++ b/nvim/lua/themystery/plugins/theme.lua
@@ -4,19 +4,24 @@
 --     priority = 1000,
 --     config = function()
 --         require("onedarkpro").setup({
---             options = {
---                 transparency = true,
---             }
 --         })
---
 --         vim.cmd("colorscheme onedark_vivid")
+--
 --     end
 -- }
+-- return {
+--     "diegoulloao/neofusion.nvim",
+--     priority = 1000,
+--     config = function()
+--         vim.o.background = "dark"
+--         vim.cmd([[ colorscheme neofusion ]])
+--     end,
+-- }
 return {
-    "diegoulloao/neofusion.nvim",
+    "rmehri01/onenord.nvim",
+    dependencies = { "lukas-reineke/indent-blankline.nvim" },
     priority = 1000,
     config = function()
-        vim.o.background = "dark"
-        vim.cmd([[ colorscheme neofusion ]])
-    end,
+        require('onenord').setup()
+    end
 }
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 1f59762..15dfaac 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -75,4 +75,3 @@ export BUN_INSTALL="$HOME/.bun"
 export PATH="$BUN_INSTALL/bin:$PATH"
 export FP='fzf --preview "bat --style=numbers --color=always --line-range :500 {}"'
 
-