From 9847dc9fabad31964243bdb42c7b772869aaa836 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 31 Aug 2024 15:32:24 +0100
Subject: [PATCH 01/65] Rewrite init.vim to init.lua

---
 config/home.nix                    |   3 +-
 config/packages/neovim/default.nix |   2 +-
 config/packages/neovim/init.lua    | 242 +++++++++++++++++++++++++++++
 config/packages/neovim/init.vim    | 143 -----------------
 4 files changed, 245 insertions(+), 145 deletions(-)
 create mode 100644 config/packages/neovim/init.lua
 delete mode 100644 config/packages/neovim/init.vim

diff --git a/config/home.nix b/config/home.nix
index b6c597e..fe43bf9 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -96,7 +96,8 @@ in {
         tldr
         unzip
         vim
-        vimPlugins.vim-plug
+        vimPlugins.vim-packer
+        vimPlugins.packer-nvim
         virtio-win
         vscode
         wget
diff --git a/config/packages/neovim/default.nix b/config/packages/neovim/default.nix
index 4480ef2..dc0b484 100644
--- a/config/packages/neovim/default.nix
+++ b/config/packages/neovim/default.nix
@@ -1,4 +1,4 @@
 {
-    home.file."/home/vylpes/.config/nvim/init.vim".source = ./init.vim;
+    home.file."/home/vylpes/.config/nvim/init.lua".source = ./init.lua;
     home.file."/home/vylpes/.config/nvim/coc-settings.json".source = ./coc-settings.json;
 }
diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua
new file mode 100644
index 0000000..d188436
--- /dev/null
+++ b/config/packages/neovim/init.lua
@@ -0,0 +1,242 @@
+-- Leader key
+vim.g.mapleader = " "
+
+-- Disable Copilot by default
+vim.g.copilot_enabled = false
+
+-- Basic settings
+vim.opt.compatible = false
+vim.opt.showmatch = true
+vim.opt.ignorecase = true
+vim.opt.mouse = "v"
+vim.opt.hlsearch = true
+vim.opt.incsearch = true
+
+-- Tab and indentation settings
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.expandtab = true
+vim.opt.shiftwidth = 4
+vim.opt.autoindent = true
+
+-- Line numbering
+vim.opt.number = true
+vim.opt.relativenumber = true
+
+-- Command-line completion mode
+vim.opt.wildmode = { "longest", "list" }
+
+-- Column marker at 80 characters
+vim.opt.colorcolumn = "80"
+
+-- Enable filetype plugins and indentation
+vim.cmd("filetype plugin indent on")
+
+-- Enable syntax highlighting
+vim.cmd("syntax on")
+
+-- Enable mouse support
+vim.opt.mouse = "a"
+
+-- Use system clipboard
+vim.opt.clipboard = "unnamedplus"
+
+-- Enable cursorline
+vim.opt.cursorline = true
+
+-- Optimize for fast terminal
+vim.opt.ttyfast = true
+
+-- Do not add a newline at the end of the file
+vim.opt.fixeol = false
+
+local data_dir = vim.fn.has('nvim') == 1 and vim.fn.stdpath('data') .. '/site' or '~/.vim'
+
+if vim.fn.empty(vim.fn.glob(data_dir .. '/autoload/plug.vim')) == 1 then
+  vim.fn.system({
+    'curl', '-fLo', data_dir .. '/autoload/plug.vim', '--create-dirs',
+    'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+  })
+  vim.cmd('autocmd VimEnter * PlugInstall --sync | source $MYVIMRC')
+end
+
+-- Initialize packer.nvim
+vim.cmd [[packadd packer.nvim]]
+
+return require('packer').startup(function(use)
+    -- Packer can manage itself
+    use 'wbthomason/packer.nvim'
+
+    -- Plugins
+    use 'dracula/vim'
+    use 'ryanoasis/vim-devicons'
+    -- use 'SirVer/ultisnips'
+    use 'honza/vim-snippets'
+    use 'scrooloose/nerdtree'
+    use 'preservim/nerdcommenter'
+    use 'mhinz/vim-startify'
+    use {'neoclide/coc.nvim', branch = 'release'}
+    use 'nvim-lua/plenary.nvim'
+    use 'ThePrimeagen/harpoon'
+    use {'junegunn/fzf', run = function() vim.fn['fzf#install']() end}
+    use 'junegunn/fzf.vim'
+    use 'neovim/nvim-lspconfig'
+    use 'jose-elias-alvarez/null-ls.nvim'
+    use 'MunifTanjim/prettier.nvim'
+    use 'github/copilot.vim'
+    use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'}
+end)
+
+-- Copilot Chat
+local prompts = require('CopilotChat.prompts')
+local select = require('CopilotChat.select')
+
+require("CopilotChat").setup {
+  debug = false,
+
+  question_header = '## User ',
+  answer_header = '## Copilot ',
+  error_header = '## Error ',
+  separator = '---',
+
+  selection = function(source)
+    return select.visual(source) or select.line(source)
+  end,
+
+  window = {
+      layout = 'float',
+  },
+}
+
+if vim.fn.has("termguicolors") == 1 then
+    vim.opt.termguicolors = true
+end
+
+-- Enable syntax highlighting
+vim.cmd("syntax enable")
+
+-- Set colorscheme to dracula
+vim.cmd("colorscheme dracula")
+
+-- Open new vertical splits to the right
+vim.opt.splitright = true
+
+-- Open new horizontal splits below
+vim.opt.splitbelow = true
+
+-- Insert mode mappings
+vim.api.nvim_set_keymap('i', '<A-j>', '<Esc>:m .+1<CR>==gi', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('i', '<A-k>', '<Esc>:m .-2<CR>==gi', { noremap = true, silent = true })
+
+-- Visual mode mappings
+vim.api.nvim_set_keymap('v', '<A-j>', ":m '>+1<CR>gv=gv", { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<A-k>', ":m '<-2<CR>gv=gv", { noremap = true, silent = true })
+
+-- Normal mode mappings for window movement
+vim.api.nvim_set_keymap('n', '<A-h>', '<C-W>H', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<A-j>', '<C-W>J', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<A-k>', '<C-W>K', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<A-l>', '<C-W>L', { noremap = true, silent = true })
+
+-- Normal mode mappings for window navigation
+vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', { noremap = true, silent = true })
+
+-- Normal mode mapping for opening file in vertical split
+vim.api.nvim_set_keymap('n', 'gf', ':vert winc f<CR>', { noremap = true, silent = true })
+
+-- Insert mode mappings for CoC (Conquer of Completion)
+vim.api.nvim_set_keymap('i', '<CR>', [[coc#pum#visible() ? coc#_select_confirm() : "\<C-g>u\<CR>"]], { noremap = true, silent = true, expr = true })
+vim.api.nvim_set_keymap('i', '<Tab>', [[coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"]], { noremap = true, silent = true, expr = true })
+vim.api.nvim_set_keymap('i', '<S-Tab>', [[coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"]], { noremap = true, silent = true, expr = true })
+
+-- Normal mode mappings for NERDTree
+vim.api.nvim_set_keymap('n', '<leader>n', ':NERDTreeFocus<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<C-n>', ':NERDTree<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<C-t>', ':NERDTreeToggle<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<C-f>', ':NERDTreeFind<CR>', { noremap = true, silent = true })
+
+-- Normal mode mapping for opening file explorer
+vim.api.nvim_set_keymap('n', '<leader>ee', ':Ex<CR>', { noremap = true, silent = true })
+
+-- Harpoon mappings
+vim.api.nvim_set_keymap('n', '<leader>ha', '<cmd>lua require("harpoon.mark").add_file()<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>hh', '<cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>1', '<cmd>lua require("harpoon.ui").nav_file(1)<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>2', '<cmd>lua require("harpoon.ui").nav_file(2)<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>3', '<cmd>lua require("harpoon.ui").nav_file(3)<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>4', '<cmd>lua require("harpoon.ui").nav_file(4)<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<A-[>', '<cmd>lua require("harpoon.ui").nav_prev()<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<A-]>', '<cmd>lua require("harpoon.ui").nav_next()<CR>', { noremap = true, silent = true })
+
+-- FZF mapping
+vim.api.nvim_set_keymap('n', '<leader>ff', ':FZF<CR>', { noremap = true, silent = true })
+
+-- Miscellaneous mappings
+vim.api.nvim_set_keymap('n', 'mm', ':nohl<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', 'ml', ':%s/\\r//g<CR>', { noremap = true, silent = true })
+
+-- Yarn mappings
+vim.api.nvim_set_keymap('n', '<leader>yb', ':!yarn build<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>yi', ':!yarn install<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>ys', ':!yarn start<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>yt', ':!yarn test<CR>', { noremap = true, silent = true })
+
+-- Dotnet mapping
+vim.api.nvim_set_keymap('n', '<leader>dr', ':!dotnet run<CR>', { noremap = true, silent = true })
+
+-- Prettier mapping
+vim.api.nvim_set_keymap('n', '<leader>p', '<Plug>(prettier-format)', { noremap = true, silent = true })
+
+-- Copilot Chat mappings
+vim.api.nvim_set_keymap('n', '<C-p>', ':CopilotChatToggle<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>ps', ':CopilotChatStop<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>pr', ':CopilotChatReset<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pe', ':CopilotChatExplain<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pr', ':CopilotChatReview<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pf', ':CopilotChatFix<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>po', ':CopilotChatOptimize<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pd', ':CopilotChatDocs<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pt', ':CopilotChatTests<CR>', { noremap = true, silent = true })
+
+-- Harpoon mappings
+vim.api.nvim_set_keymap('n', '<leader>ha', '<cmd>lua require("harpoon.mark").add_file()<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>hh', '<cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>1', '<cmd>lua require("harpoon.ui").nav_file(1)<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>2', '<cmd>lua require("harpoon.ui").nav_file(2)<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>3', '<cmd>lua require("harpoon.ui").nav_file(3)<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>4', '<cmd>lua require("harpoon.ui").nav_file(4)<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<A-[>', '<cmd>lua require("harpoon.ui").nav_prev()<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<A-]>', '<cmd>lua require("harpoon.ui").nav_next()<CR>', { noremap = true, silent = true })
+
+-- FZF mapping
+vim.api.nvim_set_keymap('n', '<leader>ff', ':FZF<CR>', { noremap = true, silent = true })
+
+-- Miscellaneous mappings
+vim.api.nvim_set_keymap('n', 'mm', ':nohl<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', 'ml', ':%s/\\r//g<CR>', { noremap = true, silent = true })
+
+-- Yarn mappings
+vim.api.nvim_set_keymap('n', '<leader>yb', ':!yarn build<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>yi', ':!yarn install<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>ys', ':!yarn start<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>yt', ':!yarn test<CR>', { noremap = true, silent = true })
+
+-- Dotnet mapping
+vim.api.nvim_set_keymap('n', '<leader>dr', ':!dotnet run<CR>', { noremap = true, silent = true })
+
+-- Prettier mapping
+vim.api.nvim_set_keymap('n', '<leader>p', '<Plug>(prettier-format)', { noremap = true, silent = true })
+
+-- Copilot mappings
+vim.api.nvim_set_keymap('n', '<C-p>', ':CopilotChatToggle<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>ps', ':CopilotChatStop<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>pr', ':CopilotChatReset<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pe', ':CopilotChatExplain<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pr', ':CopilotChatReview<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pf', ':CopilotChatFix<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>po', ':CopilotChatOptimize<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pd', ':CopilotChatDocs<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('v', '<leader>pt', ':CopilotChatTests<CR>', { noremap = true, silent = true })
diff --git a/config/packages/neovim/init.vim b/config/packages/neovim/init.vim
deleted file mode 100644
index 32d91e7..0000000
--- a/config/packages/neovim/init.vim
+++ /dev/null
@@ -1,143 +0,0 @@
-let mapleader = " "
-let g:copilot_enabled = v:false
-
-set nocompatible
-set showmatch
-set ignorecase
-set mouse=v
-set hlsearch
-set incsearch
-set tabstop=4
-set softtabstop=4
-set expandtab
-set shiftwidth=4
-set autoindent
-set number
-set relativenumber
-set wildmode=longest,list
-set cc=80
-filetype plugin indent on
-syntax on
-set mouse=a
-set clipboard=unnamedplus
-filetype plugin on
-set cursorline
-set ttyfast
-set nofixeol
-
-let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
-if empty(glob(data_dir . '/autoload/plug.vim'))
-  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-
-call plug#begin("~/.vim/plugged")
-    Plug 'dracula/vim'
-    Plug 'ryanoasis/vim-devicons'
-    " Plug 'SirVer/ultisnips'
-    Plug 'honza/vim-snippets'
-    Plug 'scrooloose/nerdtree'
-    Plug 'preservim/nerdcommenter'
-    Plug 'mhinz/vim-startify'
-    Plug 'neoclide/coc.nvim', {'branch': 'release'}
-    Plug 'nvim-lua/plenary.nvim'
-    Plug 'ThePrimeagen/harpoon'
-    Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-    Plug 'junegunn/fzf.vim'
-    Plug 'neovim/nvim-lspconfig'
-    Plug 'jose-elias-alvarez/null-ls.nvim'
-    Plug 'MunifTanjim/prettier.nvim'
-    Plug 'github/copilot.vim'
-    Plug 'CopilotC-Nvim/CopilotChat.nvim', { 'branch': 'canary' }
-call plug#end()
-
-lua << EOF
-local prompts = require('CopilotChat.prompts')
-local select = require('CopilotChat.select')
-
-require("CopilotChat").setup {
-  debug = false,
-
-  question_header = '## User ',
-  answer_header = '## Copilot ',
-  error_header = '## Error ',
-  separator = '---',
-
-  selection = function(source)
-    return select.visual(source) or select.line(source)
-  end,
-
-  window = {
-      layout = 'float',
-  },
-}
-EOF
-
-if (has("termguicolors"))
-    set termguicolors
-endif
-syntax enable
-colorscheme dracula
-
-set splitright
-set splitbelow
-
-inoremap <A-j> <Esc>:m .+1<CR>==gi
-inoremap <A-k> <Esc>:m .-2<CR>==gi
-vnoremap <A-j> :m '>+1<CR>gv=gv
-vnoremap <A-k> :m '<-2<CR>gv=gv
-
-nnoremap <A-h> <C-W>H
-nnoremap <A-j> <C-W>J
-nnoremap <A-k> <C-W>K
-nnoremap <A-l> <C-W>L
-
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-
-nnoremap gf :vert winc f<cr>
-
-inoremap <silent><expr> <cr> coc#pum#visible() ? coc#_select_confirm() : "\<C-g>u\<CR>"
-inoremap <expr> <Tab> coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"
-inoremap <expr> <S-Tab> coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"
-
-nnoremap <leader>n :NERDTreeFocus<CR>
-nnoremap <C-n> :NERDTree<CR>
-nnoremap <C-t> :NERDTreeToggle<CR>
-nnoremap <C-f> :NERDTreeFind<CR>
-nnoremap <leader>ee :Ex<CR>
-
-nnoremap <leader>ha <cmd>lua require("harpoon.mark").add_file()<CR>
-nnoremap <leader>hh <cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>
-nnoremap <leader>1 <cmd>lua require("harpoon.ui").nav_file(1)<CR>
-nnoremap <leader>2 <cmd>lua require("harpoon.ui").nav_file(2)<CR>
-nnoremap <leader>3 <cmd>lua require("harpoon.ui").nav_file(3)<CR>
-nnoremap <leader>4 <cmd>lua require("harpoon.ui").nav_file(4)<CR>
-nnoremap <A-[> <cmd>lua require("harpoon.ui").nav_prev()<CR>
-nnoremap <A-]> <cmd>lua require("harpoon.ui").nav_next()<CR>
-
-nnoremap <leader>ff :FZF<CR>
-
-nnoremap mm :nohl<CR>
-nnoremap ml :%s/\r//g<CR>
-
-nnoremap <leader>yb :!yarn build<CR>
-nnoremap <leader>yi :!yarn install<CR>
-nnoremap <leader>ys :!yarn start<CR>
-nnoremap <leader>yt :!yarn test<CR>
-
-nnoremap <leader>dr :!dotnet run<CR>
-
-nnoremap <leader>p <Plug>(prettier-format)<CR>
-
-nnoremap <C-p> :CopilotChatToggle<CR>
-nnoremap <leader>ps :CopilotChatStop<CR>
-nnoremap <leader>pr :CopilotChatReset<CR>
-vnoremap <leader>pe :CopilotChatExplain<CR>
-vnoremap <leader>pr :CopilotChatReview<CR>
-vnoremap <leader>pf :CopilotChatFix<CR>
-vnoremap <leader>po :CopilotChatOptimize<CR>
-vnoremap <leader>pd :CopilotChatDocs<CR>
-vnoremap <leader>pt :CopilotChatTests<CR>

From 49f378d5a35df54509a089058881287b2371d16e Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 21 Sep 2024 13:50:06 +0100
Subject: [PATCH 02/65] Nix flake update

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 992c919..54ad83d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726688310,
-        "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=",
+        "lastModified": 1726838390,
+        "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0",
+        "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
         "type": "github"
       },
       "original": {

From 33b86325aa6812aa7cd6fec324bdd863adba22b7 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 21 Sep 2024 13:51:44 +0100
Subject: [PATCH 03/65] Remove conflict maybe

---
 config/home.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/home.nix b/config/home.nix
index 1f75dab..61a3475 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -102,7 +102,6 @@ in {
         tldr
         unzip
         vim
-        vimPlugins.vim-packer
         vimPlugins.packer-nvim
         virtio-win
         vscode

From c6669af194184d569c966b87aa24d0f4101651cc Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 21 Sep 2024 13:56:26 +0100
Subject: [PATCH 04/65] Try other package

---
 config/home.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/home.nix b/config/home.nix
index 61a3475..87a1f37 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -102,7 +102,7 @@ in {
         tldr
         unzip
         vim
-        vimPlugins.packer-nvim
+        vimPlugins.vim-packer
         virtio-win
         vscode
         wget

From f4149d4d2f9403b2385479d9c4de239a784a4de2 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 21 Sep 2024 14:03:20 +0100
Subject: [PATCH 05/65] Setup packer

---
 config/packages/neovim/init.lua | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua
index d188436..3cde446 100644
--- a/config/packages/neovim/init.lua
+++ b/config/packages/neovim/init.lua
@@ -52,16 +52,27 @@ vim.opt.fixeol = false
 
 local data_dir = vim.fn.has('nvim') == 1 and vim.fn.stdpath('data') .. '/site' or '~/.vim'
 
-if vim.fn.empty(vim.fn.glob(data_dir .. '/autoload/plug.vim')) == 1 then
-  vim.fn.system({
-    'curl', '-fLo', data_dir .. '/autoload/plug.vim', '--create-dirs',
-    'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-  })
-  vim.cmd('autocmd VimEnter * PlugInstall --sync | source $MYVIMRC')
+-- Ensure packer is installed
+local install_path = vim.fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
+  vim.fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+  vim.cmd [[packadd packer.nvim]]
 end
 
--- Initialize packer.nvim
-vim.cmd [[packadd packer.nvim]]
+-- Use a protected call so we don't error out on first use
+local status_ok, packer = pcall(require, "packer")
+if not status_ok then
+  return
+end
+
+-- Have packer use a popup window
+packer.init {
+  display = {
+    open_fn = function()
+      return require('packer.util').float { border = 'rounded' }
+    end,
+  },
+}
 
 return require('packer').startup(function(use)
     -- Packer can manage itself
@@ -86,6 +97,7 @@ return require('packer').startup(function(use)
     use 'github/copilot.vim'
     use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'}
 end)
+vim.cmd [[packadd packer.nvim]]
 
 -- Copilot Chat
 local prompts = require('CopilotChat.prompts')

From 89c34c76892122c946ad792eac3b9c01e3c0873b Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 21 Sep 2024 14:03:33 +0100
Subject: [PATCH 06/65] Remove package

---
 config/home.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/home.nix b/config/home.nix
index 87a1f37..9672dcd 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -102,7 +102,6 @@ in {
         tldr
         unzip
         vim
-        vimPlugins.vim-packer
         virtio-win
         vscode
         wget

From bc8b0d5adc4b9b12b6068f871cfbc873f650a4ca Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 21 Sep 2024 14:09:16 +0100
Subject: [PATCH 07/65] Install vimplugin

---
 config/packages/neovim/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/packages/neovim/default.nix b/config/packages/neovim/default.nix
index dc0b484..a69ed38 100644
--- a/config/packages/neovim/default.nix
+++ b/config/packages/neovim/default.nix
@@ -1,4 +1,11 @@
 {
     home.file."/home/vylpes/.config/nvim/init.lua".source = ./init.lua;
     home.file."/home/vylpes/.config/nvim/coc-settings.json".source = ./coc-settings.json;
+
+    programs.neovim = {
+      enable = true;
+      plugins = with pkgs.vimPlugins; [
+        packer-nvim
+      ];
+    };
 }

From 6b8ee077953d5a7d15f7527cce196b43a6aa7576 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 21 Sep 2024 14:11:18 +0100
Subject: [PATCH 08/65] Move vimplugin

---
 config/home.nix                    | 7 +++++++
 config/packages/neovim/default.nix | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/home.nix b/config/home.nix
index 9672dcd..680397e 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -29,6 +29,13 @@ in {
     gnome-keyring.enable = true;
   };
 
+   programs.neovim = {
+     enable = true;
+     plugins = with pkgs.vimPlugins; [
+       packer-nvim
+     ];
+   };
+
   home = {
     username = "${username}";
     homeDirectory = "/home/${username}";
diff --git a/config/packages/neovim/default.nix b/config/packages/neovim/default.nix
index a69ed38..dc0b484 100644
--- a/config/packages/neovim/default.nix
+++ b/config/packages/neovim/default.nix
@@ -1,11 +1,4 @@
 {
     home.file."/home/vylpes/.config/nvim/init.lua".source = ./init.lua;
     home.file."/home/vylpes/.config/nvim/coc-settings.json".source = ./coc-settings.json;
-
-    programs.neovim = {
-      enable = true;
-      plugins = with pkgs.vimPlugins; [
-        packer-nvim
-      ];
-    };
 }

From 1af3d8796d044bbc245a88d20182bb4f9a16dcf5 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 11:54:17 +0000
Subject: [PATCH 09/65] Add Neoim docs for packer

---
 config/packages/neovim/init.lua | 25 +------------------------
 docs/Neovim.md                  | 13 +++++++++++++
 2 files changed, 14 insertions(+), 24 deletions(-)
 create mode 100644 docs/Neovim.md

diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua
index 3cde446..0ca4f94 100644
--- a/config/packages/neovim/init.lua
+++ b/config/packages/neovim/init.lua
@@ -50,29 +50,7 @@ vim.opt.ttyfast = true
 -- Do not add a newline at the end of the file
 vim.opt.fixeol = false
 
-local data_dir = vim.fn.has('nvim') == 1 and vim.fn.stdpath('data') .. '/site' or '~/.vim'
-
--- Ensure packer is installed
-local install_path = vim.fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
-if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
-  vim.fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
-  vim.cmd [[packadd packer.nvim]]
-end
-
--- Use a protected call so we don't error out on first use
-local status_ok, packer = pcall(require, "packer")
-if not status_ok then
-  return
-end
-
--- Have packer use a popup window
-packer.init {
-  display = {
-    open_fn = function()
-      return require('packer.util').float { border = 'rounded' }
-    end,
-  },
-}
+vim.cmd [[packadd packer.nvim]]
 
 return require('packer').startup(function(use)
     -- Packer can manage itself
@@ -97,7 +75,6 @@ return require('packer').startup(function(use)
     use 'github/copilot.vim'
     use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'}
 end)
-vim.cmd [[packadd packer.nvim]]
 
 -- Copilot Chat
 local prompts = require('CopilotChat.prompts')
diff --git a/docs/Neovim.md b/docs/Neovim.md
new file mode 100644
index 0000000..f15497f
--- /dev/null
+++ b/docs/Neovim.md
@@ -0,0 +1,13 @@
+# Neovim
+
+Neovim is mostly configured in the flake, we just need to install packer
+separately, although this is only required to do once.
+
+## Installation
+
+Run the following command in the terminal
+
+```bash
+git clone --depth 1 https://github.com/wbthomason/packer.nvim\
+ ~/.local/share/nvim/site/pack/packer/start/packer.nvim
+```

From 3560e68e50694146edb2c133682a4726c9526ec0 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 11:57:26 +0000
Subject: [PATCH 10/65] Remove unrequired neovim config

---
 config/home.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/config/home.nix b/config/home.nix
index 95b1e3f..e2fb510 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -29,13 +29,6 @@ in {
     gnome-keyring.enable = true;
   };
 
-   programs.neovim = {
-     enable = true;
-     plugins = with pkgs.vimPlugins; [
-       packer-nvim
-     ];
-   };
-
   home = {
     username = "${username}";
     homeDirectory = "/home/${username}";

From baf6c92c30560162ebe0ac82c24c9d66c07498fe Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 12:05:03 +0000
Subject: [PATCH 11/65] Add plugins.lua

---
 config/packages/neovim/default.nix     |  1 +
 config/packages/neovim/init.lua        | 28 ++------------------------
 config/packages/neovim/lua/plugins.lua | 25 +++++++++++++++++++++++
 3 files changed, 28 insertions(+), 26 deletions(-)
 create mode 100644 config/packages/neovim/lua/plugins.lua

diff --git a/config/packages/neovim/default.nix b/config/packages/neovim/default.nix
index dc0b484..4eb8d90 100644
--- a/config/packages/neovim/default.nix
+++ b/config/packages/neovim/default.nix
@@ -1,4 +1,5 @@
 {
     home.file."/home/vylpes/.config/nvim/init.lua".source = ./init.lua;
     home.file."/home/vylpes/.config/nvim/coc-settings.json".source = ./coc-settings.json;
+    home.file."/home/vylpes/.config/nvim/lua/plugins.lua".source = ./lua/plugins.lua;
 }
diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua
index 0ca4f94..06cbfd7 100644
--- a/config/packages/neovim/init.lua
+++ b/config/packages/neovim/init.lua
@@ -1,3 +1,5 @@
+lua require("plugins")
+
 -- Leader key
 vim.g.mapleader = " "
 
@@ -50,32 +52,6 @@ vim.opt.ttyfast = true
 -- Do not add a newline at the end of the file
 vim.opt.fixeol = false
 
-vim.cmd [[packadd packer.nvim]]
-
-return require('packer').startup(function(use)
-    -- Packer can manage itself
-    use 'wbthomason/packer.nvim'
-
-    -- Plugins
-    use 'dracula/vim'
-    use 'ryanoasis/vim-devicons'
-    -- use 'SirVer/ultisnips'
-    use 'honza/vim-snippets'
-    use 'scrooloose/nerdtree'
-    use 'preservim/nerdcommenter'
-    use 'mhinz/vim-startify'
-    use {'neoclide/coc.nvim', branch = 'release'}
-    use 'nvim-lua/plenary.nvim'
-    use 'ThePrimeagen/harpoon'
-    use {'junegunn/fzf', run = function() vim.fn['fzf#install']() end}
-    use 'junegunn/fzf.vim'
-    use 'neovim/nvim-lspconfig'
-    use 'jose-elias-alvarez/null-ls.nvim'
-    use 'MunifTanjim/prettier.nvim'
-    use 'github/copilot.vim'
-    use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'}
-end)
-
 -- Copilot Chat
 local prompts = require('CopilotChat.prompts')
 local select = require('CopilotChat.select')
diff --git a/config/packages/neovim/lua/plugins.lua b/config/packages/neovim/lua/plugins.lua
new file mode 100644
index 0000000..6660012
--- /dev/null
+++ b/config/packages/neovim/lua/plugins.lua
@@ -0,0 +1,25 @@
+vim.cmd [[packadd packer.nvim]]
+
+return require('packer').startup(function(use)
+    -- Packer can manage itself
+    use 'wbthomason/packer.nvim'
+
+    -- Plugins
+    use 'dracula/vim'
+    use 'ryanoasis/vim-devicons'
+    -- use 'SirVer/ultisnips'
+    use 'honza/vim-snippets'
+    use 'scrooloose/nerdtree'
+    use 'preservim/nerdcommenter'
+    use 'mhinz/vim-startify'
+    use {'neoclide/coc.nvim', branch = 'release'}
+    use 'nvim-lua/plenary.nvim'
+    use 'ThePrimeagen/harpoon'
+    use {'junegunn/fzf', run = function() vim.fn['fzf#install']() end}
+    use 'junegunn/fzf.vim'
+    use 'neovim/nvim-lspconfig'
+    use 'jose-elias-alvarez/null-ls.nvim'
+    use 'MunifTanjim/prettier.nvim'
+    use 'github/copilot.vim'
+    use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'}
+end)

From 026f2be3791231db3b70150e180c7d0078f0f77c Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 12:16:21 +0000
Subject: [PATCH 12/65] Bootstrap packer

---
 config/packages/neovim/init.lua        | 41 ++++++++++++++++++++++++--
 config/packages/neovim/lua/plugins.lua | 25 ----------------
 2 files changed, 39 insertions(+), 27 deletions(-)
 delete mode 100644 config/packages/neovim/lua/plugins.lua

diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua
index 06cbfd7..bf89820 100644
--- a/config/packages/neovim/init.lua
+++ b/config/packages/neovim/init.lua
@@ -1,5 +1,3 @@
-lua require("plugins")
-
 -- Leader key
 vim.g.mapleader = " "
 
@@ -205,3 +203,42 @@ vim.api.nvim_set_keymap('v', '<leader>pf', ':CopilotChatFix<CR>', { noremap = tr
 vim.api.nvim_set_keymap('v', '<leader>po', ':CopilotChatOptimize<CR>', { noremap = true, silent = true })
 vim.api.nvim_set_keymap('v', '<leader>pd', ':CopilotChatDocs<CR>', { noremap = true, silent = true })
 vim.api.nvim_set_keymap('v', '<leader>pt', ':CopilotChatTests<CR>', { noremap = true, silent = true })
+
+local ensure_packer = function()
+  local fn = vim.fn
+  local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+  if fn.empty(fn.glob(install_path)) > 0 then
+    fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+    vim.cmd [[packadd packer.nvim]]
+    return true
+  end
+  return false
+end
+
+local packer_bootstrap = ensure_packer()
+
+vim.cmd [[packadd packer.nvim]]
+
+return require('packer').startup(function(use)
+    -- Packer can manage itself
+    use 'wbthomason/packer.nvim'
+
+    -- Plugins
+    use 'dracula/vim'
+    use 'ryanoasis/vim-devicons'
+    -- use 'SirVer/ultisnips'
+    use 'honza/vim-snippets'
+    use 'scrooloose/nerdtree'
+    use 'preservim/nerdcommenter'
+    use 'mhinz/vim-startify'
+    use {'neoclide/coc.nvim', branch = 'release'}
+    use 'nvim-lua/plenary.nvim'
+    use 'ThePrimeagen/harpoon'
+    use {'junegunn/fzf', run = function() vim.fn['fzf#install']() end}
+    use 'junegunn/fzf.vim'
+    use 'neovim/nvim-lspconfig'
+    use 'jose-elias-alvarez/null-ls.nvim'
+    use 'MunifTanjim/prettier.nvim'
+    use 'github/copilot.vim'
+    use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'}
+end)
diff --git a/config/packages/neovim/lua/plugins.lua b/config/packages/neovim/lua/plugins.lua
deleted file mode 100644
index 6660012..0000000
--- a/config/packages/neovim/lua/plugins.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-vim.cmd [[packadd packer.nvim]]
-
-return require('packer').startup(function(use)
-    -- Packer can manage itself
-    use 'wbthomason/packer.nvim'
-
-    -- Plugins
-    use 'dracula/vim'
-    use 'ryanoasis/vim-devicons'
-    -- use 'SirVer/ultisnips'
-    use 'honza/vim-snippets'
-    use 'scrooloose/nerdtree'
-    use 'preservim/nerdcommenter'
-    use 'mhinz/vim-startify'
-    use {'neoclide/coc.nvim', branch = 'release'}
-    use 'nvim-lua/plenary.nvim'
-    use 'ThePrimeagen/harpoon'
-    use {'junegunn/fzf', run = function() vim.fn['fzf#install']() end}
-    use 'junegunn/fzf.vim'
-    use 'neovim/nvim-lspconfig'
-    use 'jose-elias-alvarez/null-ls.nvim'
-    use 'MunifTanjim/prettier.nvim'
-    use 'github/copilot.vim'
-    use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'}
-end)

From 9f8fce9599ca5fc0a6abc614c3d75729f1e7cf0e Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 12:16:49 +0000
Subject: [PATCH 13/65] Remove plugins.lua

---
 config/packages/neovim/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/packages/neovim/default.nix b/config/packages/neovim/default.nix
index 4eb8d90..dc0b484 100644
--- a/config/packages/neovim/default.nix
+++ b/config/packages/neovim/default.nix
@@ -1,5 +1,4 @@
 {
     home.file."/home/vylpes/.config/nvim/init.lua".source = ./init.lua;
     home.file."/home/vylpes/.config/nvim/coc-settings.json".source = ./coc-settings.json;
-    home.file."/home/vylpes/.config/nvim/lua/plugins.lua".source = ./lua/plugins.lua;
 }

From 50541208e65b08a1d7656fd08dab5ab5bbadd6e7 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 12:17:54 +0000
Subject: [PATCH 14/65] Move copilot chat

---
 config/packages/neovim/init.lua | 42 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua
index bf89820..3efa67b 100644
--- a/config/packages/neovim/init.lua
+++ b/config/packages/neovim/init.lua
@@ -50,27 +50,6 @@ vim.opt.ttyfast = true
 -- Do not add a newline at the end of the file
 vim.opt.fixeol = false
 
--- Copilot Chat
-local prompts = require('CopilotChat.prompts')
-local select = require('CopilotChat.select')
-
-require("CopilotChat").setup {
-  debug = false,
-
-  question_header = '## User ',
-  answer_header = '## Copilot ',
-  error_header = '## Error ',
-  separator = '---',
-
-  selection = function(source)
-    return select.visual(source) or select.line(source)
-  end,
-
-  window = {
-      layout = 'float',
-  },
-}
-
 if vim.fn.has("termguicolors") == 1 then
     vim.opt.termguicolors = true
 end
@@ -242,3 +221,24 @@ return require('packer').startup(function(use)
     use 'github/copilot.vim'
     use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'}
 end)
+
+-- Copilot Chat
+local prompts = require('CopilotChat.prompts')
+local select = require('CopilotChat.select')
+
+require("CopilotChat").setup {
+  debug = false,
+
+  question_header = '## User ',
+  answer_header = '## Copilot ',
+  error_header = '## Error ',
+  separator = '---',
+
+  selection = function(source)
+    return select.visual(source) or select.line(source)
+  end,
+
+  window = {
+      layout = 'float',
+  },
+}

From bb44f0de331fb281f77ccb4de3848f4372d36671 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 12:18:43 +0000
Subject: [PATCH 15/65] Remove return

---
 config/packages/neovim/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua
index 3efa67b..b589ae8 100644
--- a/config/packages/neovim/init.lua
+++ b/config/packages/neovim/init.lua
@@ -198,7 +198,7 @@ local packer_bootstrap = ensure_packer()
 
 vim.cmd [[packadd packer.nvim]]
 
-return require('packer').startup(function(use)
+require('packer').startup(function(use)
     -- Packer can manage itself
     use 'wbthomason/packer.nvim'
 

From da5cdc5220107de11bf68cd838446830a6f90afb Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 12:19:56 +0000
Subject: [PATCH 16/65] Termgui colours

---
 config/packages/neovim/init.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua
index b589ae8..cfbb39d 100644
--- a/config/packages/neovim/init.lua
+++ b/config/packages/neovim/init.lua
@@ -50,10 +50,6 @@ vim.opt.ttyfast = true
 -- Do not add a newline at the end of the file
 vim.opt.fixeol = false
 
-if vim.fn.has("termguicolors") == 1 then
-    vim.opt.termguicolors = true
-end
-
 -- Enable syntax highlighting
 vim.cmd("syntax enable")
 
@@ -242,3 +238,8 @@ require("CopilotChat").setup {
       layout = 'float',
   },
 }
+
+if vim.fn.has("termguicolors") == 1 then
+    vim.opt.termguicolors = true
+end
+

From 58b9a4d94699e423cc86d5ec1c1b21c1886687d6 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 30 Oct 2024 22:51:51 +0000
Subject: [PATCH 17/65] Install brickstore

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index f4c84da..39e29b8 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -43,6 +43,7 @@ in {
         alacritty
         arandr
         autorandr
+        brickstore
         csharp-ls
         cups
         curl

From 56bf25c656a70d38c391e96158e1e106803490dd Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 3 Nov 2024 10:13:08 +0000
Subject: [PATCH 18/65] Nix flake update - 03/11/24

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7490bf9..cd75e4d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729691686,
-        "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
+        "lastModified": 1730327045,
+        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
+        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
         "type": "github"
       },
       "original": {

From 66d11771f24eaab6e85240c78c9a883565dede78 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 4 Nov 2024 17:27:54 +0000
Subject: [PATCH 19/65] Update media keys to go by 2%

---
 config/packages/i3/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index 8ab1209..3c9ca1a 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -45,8 +45,8 @@ exec --no-startup-id "sh /home/vylpes/.screenlayout/default.sh"
 # Use pactl to adjust volume in PulseAudio.
 # Add "&& $refresh_i3status" if needed
 set $refresh_i3status killall -SIGUSR1 polybar
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10%
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10%
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +2%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -2%
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle 
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle 
 

From 09e897c95693c9d6627c27e3604076d544058c67 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 4 Nov 2024 19:35:59 +0000
Subject: [PATCH 20/65] Switch config to 5%

---
 config/packages/i3/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index 3c9ca1a..7d7e0d5 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -45,8 +45,8 @@ exec --no-startup-id "sh /home/vylpes/.screenlayout/default.sh"
 # Use pactl to adjust volume in PulseAudio.
 # Add "&& $refresh_i3status" if needed
 set $refresh_i3status killall -SIGUSR1 polybar
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +2%
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -2%
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle 
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle 
 

From dd8e1d5efa55a2d0237967d968fd3e2f4803ead1 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 10 Nov 2024 10:05:13 +0000
Subject: [PATCH 21/65] nix flake update - 10/11/24

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index cd75e4d..113e077 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730327045,
-        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
+        "lastModified": 1730963269,
+        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
+        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
         "type": "github"
       },
       "original": {

From 49874a029be1a05b44d303de74e0a038d397f068 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 18 Nov 2024 19:21:27 +0000
Subject: [PATCH 22/65] Start plexamp floating

---
 config/packages/i3/config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index 7d7e0d5..da3f738 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -219,6 +219,9 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
+# Windows to force floating
+for_window [class="plexamp"] floating enable
+
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 

From cd662435a0eb0d5da071693efe7372c7cc5c4cde Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 18 Nov 2024 19:26:19 +0000
Subject: [PATCH 23/65] Update vylpes-desktop

---
 system/vylpes-desktop/hardware-configuration.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/vylpes-desktop/hardware-configuration.nix b/system/vylpes-desktop/hardware-configuration.nix
index a3eb4bd..34297ca 100644
--- a/system/vylpes-desktop/hardware-configuration.nix
+++ b/system/vylpes-desktop/hardware-configuration.nix
@@ -8,24 +8,24 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/3c957d4e-06fc-40bc-b5b9-2583d0f7ee94";
+    { device = "/dev/disk/by-uuid/e157d325-4082-493a-8014-42c040feb213";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2D69-3A13";
+    { device = "/dev/disk/by-uuid/3673-F8D0";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/3de826ff-b7e3-44bc-97d2-4bd2248f9555"; }
+    [ { device = "/dev/disk/by-uuid/44178d5c-cecb-47d8-8375-9775a8e32e53"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

From 94a03f789a445ac94cb204dd33b6fc5ff0018651 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 18 Nov 2024 19:28:47 +0000
Subject: [PATCH 24/65] Plexamp float

---
 config/packages/i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index da3f738..bbac9de 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -220,7 +220,7 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 # Windows to force floating
-for_window [class="plexamp"] floating enable
+for_window [class="Plexamp"] floating enable
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)

From dd4c11f9247ac9e3c48bb577e4a51c9c0bc29302 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Tue, 19 Nov 2024 17:56:44 +0000
Subject: [PATCH 25/65] nix flake update - 19/11/24

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 113e077..ad46c7a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730963269,
-        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
+        "lastModified": 1731797254,
+        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
+        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
         "type": "github"
       },
       "original": {

From 211f82f0db2f7d4350b26b03e85bcc0003f64237 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 27 Nov 2024 19:52:50 +0000
Subject: [PATCH 26/65] Install distrobox

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 39e29b8..f4e519d 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -49,6 +49,7 @@ in {
         curl
         dbeaver-bin
         discord
+        distrobox
         dolphin-emu
         dotnet-sdk_8
         dotnetPackages.Nuget

From 2d04c8381e42e5ceeed4d1a917fcb39edfa1de59 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 27 Nov 2024 20:02:28 +0000
Subject: [PATCH 27/65] Install x11docker

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index f4e519d..5bfb946 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -111,6 +111,7 @@ in {
         virtio-win
         vscode
         wget
+        x11docker
         xclip
         yarn
         yt-dlp

From 64d53fc193bf1203a8e3df9c3feba7f9c7e971b2 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 27 Nov 2024 20:07:30 +0000
Subject: [PATCH 28/65] Remoxe x11docker

---
 config/home.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/home.nix b/config/home.nix
index 5bfb946..f4e519d 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -111,7 +111,6 @@ in {
         virtio-win
         vscode
         wget
-        x11docker
         xclip
         yarn
         yt-dlp

From f23f7983d914f9d2acb74804eb36cc6111febad8 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:32:32 +0000
Subject: [PATCH 29/65] Setup power rofi menu

---
 config/home.nix                     |  1 +
 config/home/scripts/system/power.sh | 18 ++++++++++++++++++
 config/packages/i3/config           |  1 +
 3 files changed, 20 insertions(+)
 create mode 100644 config/home/scripts/system/power.sh

diff --git a/config/home.nix b/config/home.nix
index f4e519d..6e641db 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -37,6 +37,7 @@ in {
     file = {
         "/home/${username}/.scripts/audio/get-sink-name.sh".source = ./home/scripts/audio/get-sink-name.sh;
         "/home/${username}/.cache/scripts/get-sink-name.txt".source = ./home/cache/audio/get-sink-name.txt;
+        "/home/${username}/.cache/scripts/power.sh".source = ./home/scripts/system/power.sh;
     };
 
     packages = with pkgs; [
diff --git a/config/home/scripts/system/power.sh b/config/home/scripts/system/power.sh
new file mode 100644
index 0000000..d32c02b
--- /dev/null
+++ b/config/home/scripts/system/power.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+option=$(printf "Sleep\nLogout\nShutdown\nRestart" | rofi -dmenu -theme Arc-Dark -font 'hack 18')
+
+if [ "$option" = "Sleep" ];
+then
+    i3lock-fancy -g -t "System Locked" -f Hack-Regular
+    systemctl sleep
+elif [ "$option" = "Logout" ];
+    i3-msg exit
+then
+elif [ "$option" = "Shutdown" ];
+    poweroff
+then
+elif [ "$option" = "Restart" ];
+    reboot
+then
+fi
diff --git a/config/packages/i3/config b/config/packages/i3/config
index bbac9de..3c51aa1 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -191,6 +191,7 @@ bindsym $mod+Mod1+r reload
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Mod1+delete exec "bash /home/vylpes/.cache/scripts/power.sh"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {

From bdda60a48ea86d4180067034a856afdeb3807247 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:33:23 +0000
Subject: [PATCH 30/65] delete to del

---
 config/packages/i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index 3c51aa1..18b6e4e 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -191,7 +191,7 @@ bindsym $mod+Mod1+r reload
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym $mod+Mod1+delete exec "bash /home/vylpes/.cache/scripts/power.sh"
+bindsym $mod+Mod1+del exec "bash /home/vylpes/.cache/scripts/power.sh"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {

From ddfe7e636251b98570d348e2c495c3aefb5b586d Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:34:10 +0000
Subject: [PATCH 31/65] Use control+alt+delete

---
 config/packages/i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index 18b6e4e..0c4f3ac 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -191,7 +191,7 @@ bindsym $mod+Mod1+r reload
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym $mod+Mod1+del exec "bash /home/vylpes/.cache/scripts/power.sh"
+bindsym Control+Alt+delete exec "bash /home/vylpes/.cache/scripts/power.sh"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {

From b890478dcde43b38dedc830af348ab03b11b07ab Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:34:46 +0000
Subject: [PATCH 32/65] Use del

---
 config/packages/i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index 0c4f3ac..f4b7f83 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -191,7 +191,7 @@ bindsym $mod+Mod1+r reload
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym Control+Alt+delete exec "bash /home/vylpes/.cache/scripts/power.sh"
+bindsym Control+Alt+del exec "bash /home/vylpes/.cache/scripts/power.sh"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {

From 4ffb2792f9bd943214eb347ca55d75f585bbab3d Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:35:53 +0000
Subject: [PATCH 33/65] Use Delete

---
 config/packages/i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index f4b7f83..729df24 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -191,7 +191,7 @@ bindsym $mod+Mod1+r reload
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym Control+Alt+del exec "bash /home/vylpes/.cache/scripts/power.sh"
+bindsym Control+Alt+Delete exec "bash /home/vylpes/.cache/scripts/power.sh"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {

From ecb37e9a3603f75a41c5b45b1ebbf5247c1a007e Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:37:32 +0000
Subject: [PATCH 34/65] Use home

---
 config/packages/i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index 729df24..95470a9 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -191,7 +191,7 @@ bindsym $mod+Mod1+r reload
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym Control+Alt+Delete exec "bash /home/vylpes/.cache/scripts/power.sh"
+bindsym Control+Mod1+Delete exec "bash /home/vylpes/.cache/scripts/power.sh"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {

From 75079368181ae0b246fb53738aa47b8f3926793c Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:39:47 +0000
Subject: [PATCH 35/65] Fix syntax errors

---
 config/home/scripts/system/power.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/home/scripts/system/power.sh b/config/home/scripts/system/power.sh
index d32c02b..54278b0 100644
--- a/config/home/scripts/system/power.sh
+++ b/config/home/scripts/system/power.sh
@@ -7,12 +7,12 @@ then
     i3lock-fancy -g -t "System Locked" -f Hack-Regular
     systemctl sleep
 elif [ "$option" = "Logout" ];
+then
     i3-msg exit
-then
 elif [ "$option" = "Shutdown" ];
+then
     poweroff
-then
 elif [ "$option" = "Restart" ];
-    reboot
 then
+    reboot
 fi

From f8c722050398054ea8c95d278da4923fe54ce2fd Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:40:48 +0000
Subject: [PATCH 36/65] Suspend

---
 config/home/scripts/system/power.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/home/scripts/system/power.sh b/config/home/scripts/system/power.sh
index 54278b0..53e4d57 100644
--- a/config/home/scripts/system/power.sh
+++ b/config/home/scripts/system/power.sh
@@ -5,7 +5,7 @@ option=$(printf "Sleep\nLogout\nShutdown\nRestart" | rofi -dmenu -theme Arc-Dark
 if [ "$option" = "Sleep" ];
 then
     i3lock-fancy -g -t "System Locked" -f Hack-Regular
-    systemctl sleep
+    systemctl suspend
 elif [ "$option" = "Logout" ];
 then
     i3-msg exit

From e4d5df863d24a2c5a12c8a99c8af61efe119ecfe Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Thu, 28 Nov 2024 21:49:28 +0000
Subject: [PATCH 37/65] Use mod shift e

---
 config/packages/i3/config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index 95470a9..e4e97f0 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -190,8 +190,7 @@ bindsym $mod+Mod1+r reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym Control+Mod1+Delete exec "bash /home/vylpes/.cache/scripts/power.sh"
+bindsym $mod+Shift+e exec "bash /home/vylpes/.cache/scripts/power.sh"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {

From ffeea5a19bb02fd5a499ba0b78e8372ee56e45bc Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 30 Nov 2024 10:37:06 +0000
Subject: [PATCH 38/65] Nix flake update - 30/11/2024

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index ad46c7a..a92ec46 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731797254,
-        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
+        "lastModified": 1732749044,
+        "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
+        "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
         "type": "github"
       },
       "original": {

From b139fa9449de886748db2c53e91ba68421d5038e Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 1 Dec 2024 15:34:13 +0000
Subject: [PATCH 39/65] Remove capitalisation on power menu

---
 config/home/scripts/system/power.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/home/scripts/system/power.sh b/config/home/scripts/system/power.sh
index 53e4d57..65121b5 100644
--- a/config/home/scripts/system/power.sh
+++ b/config/home/scripts/system/power.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 
-option=$(printf "Sleep\nLogout\nShutdown\nRestart" | rofi -dmenu -theme Arc-Dark -font 'hack 18')
+option=$(printf "sleep\nlogout\nshutdown\nrestart" | rofi -dmenu -theme Arc-Dark -font 'hack 18')
 
-if [ "$option" = "Sleep" ];
+if [ "$option" = "sleep" ];
 then
     i3lock-fancy -g -t "System Locked" -f Hack-Regular
     systemctl suspend
-elif [ "$option" = "Logout" ];
+elif [ "$option" = "logout" ];
 then
     i3-msg exit
-elif [ "$option" = "Shutdown" ];
+elif [ "$option" = "shutdown" ];
 then
     poweroff
-elif [ "$option" = "Restart" ];
+elif [ "$option" = "restart" ];
 then
     reboot
 fi

From b6337aaa0e718fed250fcd151311d882cc67a471 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 1 Dec 2024 15:35:50 +0000
Subject: [PATCH 40/65] Add rebuild alias

---
 system/shared.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/shared.nix b/system/shared.nix
index 5105a21..c896fb0 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -115,6 +115,7 @@
         gco = "git checkout";
 
         s = "swallow";
+        nrb = "sudo nixos-rebuild switch --flake /home/vylpes/flake#${HOST}";
     };
   };
   

From 10f6beba2a7bdd3ec4494eeb532cd919229cafb0 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 1 Dec 2024 15:36:25 +0000
Subject: [PATCH 41/65] Fix typo

---
 system/shared.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/shared.nix b/system/shared.nix
index c896fb0..85c4655 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -115,7 +115,7 @@
         gco = "git checkout";
 
         s = "swallow";
-        nrb = "sudo nixos-rebuild switch --flake /home/vylpes/flake#${HOST}";
+        nrb = "sudo nixos-rebuild switch --flake /home/vylpes/flake#\${HOST}";
     };
   };
   

From 1704808ade182463455e7a5fdfb99d1d32917d4b Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 7 Dec 2024 18:05:38 +0000
Subject: [PATCH 42/65] Install audacity

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 6e641db..52d32fb 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -43,6 +43,7 @@ in {
     packages = with pkgs; [
         alacritty
         arandr
+        audacity
         autorandr
         brickstore
         csharp-ls

From 83510a722f6714aa3dc9bdb9930215246feafc2c Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 8 Dec 2024 11:54:30 +0000
Subject: [PATCH 43/65] Nix flake update - 08/12/2024

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index a92ec46..fba158e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732749044,
-        "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
+        "lastModified": 1733384649,
+        "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
+        "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
         "type": "github"
       },
       "original": {

From 8fe6a0fb355ef5466fe6c77cc6bba523128611cf Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 9 Dec 2024 21:30:25 +0000
Subject: [PATCH 44/65] Install nfs-utils

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 52d32fb..31feb03 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -83,6 +83,7 @@ in {
         neovim
         networkmanager
         nextcloud-client
+        nfs-utils
         nitrogen
         nodejs
         nodePackages.npm

From d07d828773c56a97996b679f66206ce28e140973 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 14 Dec 2024 21:17:19 +0000
Subject: [PATCH 45/65] Nix flake update - 14/12/2024

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index fba158e..61029d2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733384649,
-        "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
+        "lastModified": 1734017764,
+        "narHash": "sha256-msOfmyJSjAHgIygI/JD0Ae3JsDv4rT54Nlfr5t6MQMQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
+        "rev": "64e9404f308e0f0a0d8cdd7c358f74e34802494b",
         "type": "github"
       },
       "original": {

From a7b156c6738076949e029d74d66ad4f51f436bd3 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 16 Dec 2024 17:35:53 +0000
Subject: [PATCH 46/65] Update vylpes-framework hardware configuration

---
 system/vylpes-framework/hardware-configuration.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/system/vylpes-framework/hardware-configuration.nix b/system/vylpes-framework/hardware-configuration.nix
index 96b3d17..7441555 100644
--- a/system/vylpes-framework/hardware-configuration.nix
+++ b/system/vylpes-framework/hardware-configuration.nix
@@ -14,19 +14,17 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d3ac6957-c669-410a-836c-dbe67e684b55";
+    { device = "/dev/disk/by-uuid/d1af6f1f-dc2d-4e09-9f1e-06bf052ede22";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/877D-2522";
+    { device = "/dev/disk/by-uuid/3470-FE54";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/552e97ec-9516-4c0e-bab8-411a7bbdbb69"; }
-    ];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

From 28ff19756bcca07ac93802d5e5bbf8886290e831 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 16 Dec 2024 17:48:18 +0000
Subject: [PATCH 47/65] Install brightnessctl

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 31feb03..0e157ca 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -46,6 +46,7 @@ in {
         audacity
         autorandr
         brickstore
+        brightnessctl
         csharp-ls
         cups
         curl

From b7823f18ba423cf5e324db2d18d25ed8aee79e8b Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 16 Dec 2024 17:51:35 +0000
Subject: [PATCH 48/65] Setup brightness keys

---
 config/packages/i3/config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index e4e97f0..e7c6a17 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -56,6 +56,10 @@ bindsym XF86AudioPause exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
+# Use brightnessctl to adjust brightness
+bindsym XF86MonBrightnessUp exec brightnessctl set +5%
+bindsym XF86MonBrightnessDown exec brightnessctl set -5%
+
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 

From 0d1d67db352fbc550546c5975c2c28a9c7d5d4d6 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 16 Dec 2024 17:53:15 +0000
Subject: [PATCH 49/65] Fix brightness keys script

---
 config/packages/i3/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index e7c6a17..d11cc2a 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -57,8 +57,8 @@ bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
 # Use brightnessctl to adjust brightness
-bindsym XF86MonBrightnessUp exec brightnessctl set +5%
-bindsym XF86MonBrightnessDown exec brightnessctl set -5%
+bindsym XF86MonBrightnessUp exec brightnessctl set 5%+
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod

From 2d146fc8aedb822c0416bee579049ede4f3628cf Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Mon, 16 Dec 2024 17:54:19 +0000
Subject: [PATCH 50/65] Use 10% for brightness

---
 config/packages/i3/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/packages/i3/config b/config/packages/i3/config
index d11cc2a..a0aa2d1 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -57,8 +57,8 @@ bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
 # Use brightnessctl to adjust brightness
-bindsym XF86MonBrightnessUp exec brightnessctl set 5%+
-bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
+bindsym XF86MonBrightnessUp exec brightnessctl set 10%+
+bindsym XF86MonBrightnessDown exec brightnessctl set 10%-
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod

From f4c358bea664c0016356f440fadbed6eed877423 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 18 Dec 2024 18:15:19 +0000
Subject: [PATCH 51/65] Install asunder

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 0e157ca..72e4c44 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -43,6 +43,7 @@ in {
     packages = with pkgs; [
         alacritty
         arandr
+        asunder
         audacity
         autorandr
         brickstore

From b18b65b06f1e6d1bd2a05d6f434a023612d35322 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Wed, 18 Dec 2024 18:17:30 +0000
Subject: [PATCH 52/65] Install lame

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 72e4c44..2e8248e 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -78,6 +78,7 @@ in {
         i3lock-fancy
         keepassxc
         keepmenu
+        lame
         lightdm
         lua
         meslo-lgs-nf

From b794998f20e91208a77f67e7dbcde11fafd834a0 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 14 Feb 2025 18:01:00 +0000
Subject: [PATCH 53/65] Update framework hardware config

---
 system/vylpes-framework/hardware-configuration.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/vylpes-framework/hardware-configuration.nix b/system/vylpes-framework/hardware-configuration.nix
index 7441555..01e1627 100644
--- a/system/vylpes-framework/hardware-configuration.nix
+++ b/system/vylpes-framework/hardware-configuration.nix
@@ -14,12 +14,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d1af6f1f-dc2d-4e09-9f1e-06bf052ede22";
+    { device = "/dev/disk/by-uuid/0a7cd202-311d-4ece-a487-ade7c847036b";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3470-FE54";
+    { device = "/dev/disk/by-uuid/4158-074D";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };

From cbf688e561f0d6a3d80653cb8bf03b1f223fd29f Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 14 Feb 2025 18:19:40 +0000
Subject: [PATCH 54/65] Update desktop hardware config

---
 system/vylpes-desktop/hardware-configuration.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/system/vylpes-desktop/hardware-configuration.nix b/system/vylpes-desktop/hardware-configuration.nix
index 34297ca..da4aed6 100644
--- a/system/vylpes-desktop/hardware-configuration.nix
+++ b/system/vylpes-desktop/hardware-configuration.nix
@@ -8,25 +8,23 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e157d325-4082-493a-8014-42c040feb213";
+    { device = "/dev/disk/by-uuid/b05ff56e-2fdb-4472-a380-b2a0ef9229cc";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3673-F8D0";
+    { device = "/dev/disk/by-uuid/725A-BE77";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/44178d5c-cecb-47d8-8375-9775a8e32e53"; }
-    ];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

From 9c4588ab9fe857bb4f460fbe360c5764816b9c92 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 14 Feb 2025 18:31:05 +0000
Subject: [PATCH 55/65] Install gnupg

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 2e8248e..a4ed6d9 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -68,6 +68,7 @@ in {
         gimp
         git
         gnome.gnome-keyring
+        gnupg
         grip
         grub2
         hack-font

From 4a8ca39bcbfebdad8b9f0e62d64b953f2ff88ae1 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 14 Feb 2025 18:34:58 +0000
Subject: [PATCH 56/65] Install kleopatra

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index a4ed6d9..4f8c5bc 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -77,6 +77,7 @@ in {
         i3
         i3-swallow
         i3lock-fancy
+        kdePackages.kleopatra
         keepassxc
         keepmenu
         lame

From 0bb68808ac21846b14a060f226a7190785857073 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 14 Feb 2025 18:41:59 +0000
Subject: [PATCH 57/65] Install pinentry-rofi

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 4f8c5bc..a77e17b 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -98,6 +98,7 @@ in {
         os-prober
         pavucontrol
         picom
+        pinentry-rofi
         playerctl
         plexamp
         pm2

From c9d1325f4f1a6ad3060defed84b282b3d1363012 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 14 Feb 2025 18:44:04 +0000
Subject: [PATCH 58/65] Use pinentry-rofi

---
 system/shared.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/shared.nix b/system/shared.nix
index 85c4655..b9ab77f 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -121,6 +121,8 @@
   
   programs.neovim.defaultEditor = true;
 
+  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-rofi
+
   fonts = {
     packages = with pkgs; [
       noto-fonts

From e03c28be914f431665d5d623730a4c5226046a72 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 14 Feb 2025 18:44:30 +0000
Subject: [PATCH 59/65] Fix typo

---
 system/shared.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/shared.nix b/system/shared.nix
index b9ab77f..0aebe22 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -121,7 +121,7 @@
   
   programs.neovim.defaultEditor = true;
 
-  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-rofi
+  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-rofi;
 
   fonts = {
     packages = with pkgs; [

From d482f9c43aebd567d6e2eb47ccdf86a3f1f09e9c Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 14 Feb 2025 18:46:47 +0000
Subject: [PATCH 60/65] Install pinentry-curses

---
 config/home.nix   | 2 +-
 system/shared.nix | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/home.nix b/config/home.nix
index a77e17b..f0d3b13 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -98,7 +98,7 @@ in {
         os-prober
         pavucontrol
         picom
-        pinentry-rofi
+        pinentry-curses
         playerctl
         plexamp
         pm2
diff --git a/system/shared.nix b/system/shared.nix
index 0aebe22..85c4655 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -121,8 +121,6 @@
   
   programs.neovim.defaultEditor = true;
 
-  programs.gnupg.agent.pinentryPackage = pkgs.pinentry-rofi;
-
   fonts = {
     packages = with pkgs; [
       noto-fonts

From 56ac4307a49e2bac3f7c92707e12ee0f5bb03b31 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 15 Feb 2025 10:43:15 +0000
Subject: [PATCH 61/65] Nix flake update - 15/02/2025

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 61029d2..a836bfe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734017764,
-        "narHash": "sha256-msOfmyJSjAHgIygI/JD0Ae3JsDv4rT54Nlfr5t6MQMQ=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "64e9404f308e0f0a0d8cdd7c358f74e34802494b",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
         "type": "github"
       },
       "original": {

From 1d3ff764fc1d7f5627177a0e92f794f158a13d66 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 15 Feb 2025 14:52:20 +0000
Subject: [PATCH 62/65] Install libreoffice

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index 4f8c5bc..69a90e9 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -81,6 +81,7 @@ in {
         keepassxc
         keepmenu
         lame
+        libreoffice-fresh
         lightdm
         lua
         meslo-lgs-nf

From bf7e2f7b5f1bd517e3aca073d994e8643f2bb2fc Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 16 Feb 2025 11:33:14 +0000
Subject: [PATCH 63/65] Remove virtualbox

---
 system/shared.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/shared.nix b/system/shared.nix
index 85c4655..52157d6 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -167,7 +167,6 @@
             ovmf.packages = [ pkgs.OVMFFull.fd ];
         };
     };
-    virtualbox.host.enable = true;
   };
 
   xdg.portal = {

From 687b1521323267f4d28c5e6b3bbe483c4399638d Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 16 Feb 2025 19:20:07 +0000
Subject: [PATCH 64/65] Install fonts

---
 config/home.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/home.nix b/config/home.nix
index e938438..b8d0fda 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -48,6 +48,7 @@ in {
         autorandr
         brickstore
         brightnessctl
+        corefonts
         csharp-ls
         cups
         curl
@@ -119,6 +120,7 @@ in {
         vim
         vimPlugins.vim-plug
         virtio-win
+        vistafonts
         vscode
         wget
         xclip

From 2fb5b1b839d5cb0b2c170147db6c5caa478d7692 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Tue, 18 Feb 2025 20:25:38 +0000
Subject: [PATCH 65/65] Install Prismlauncher

---
 config/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/home.nix b/config/home.nix
index b8d0fda..34ed2e4 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -106,6 +106,7 @@ in {
         pm2
         polybar
         polybar-pulseaudio-control
+        prismlauncher
         pulseaudio
         ranger
         remmina