Refactored home and hardware files, and added new plugins to neovim.

flake.lock

@@ -240,6 +240,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1755330281,
+        "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1752596105,
@@ -294,6 +310,7 @@
         "home-manager": "home-manager",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nix-index-database": "nix-index-database",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "sops-nix": "sops-nix"
       }

flake.nix

@@ -13,8 +13,13 @@
 		disko.url = "github:nix-community/disko";
 		sops-nix.url = "github:Mic92/sops-nix";
 		sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+	  nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
   };
-  outputs = { self, nixpkgs, home-manager, nix-index-database, sops-nix, disko,  ... }@inputs:
+  outputs = { 
+		self, nixpkgs, home-manager, nix-index-database, sops-nix, disko,
+		nixos-hardware, ...
+	}@inputs:
     let
       overlays = [
        inputs.neovim-nightly-overlay.overlays.default
@@ -35,8 +40,9 @@
       modules = [
         { nixpkgs.overlays = overlays; }
 				sops-nix.nixosModules.sops
-				./configuration.nix
+				./modules/configuration-xps13.nix
-        ./xps13-hardware-configuration.nix
+        ./modules/hardware-configuration-xps13.nix
+				nixos-hardware.nixosModules.dell-xps-13-9370
         home-manager.nixosModules.home-manager {
           # home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
@@ -47,7 +53,6 @@
 							nix-index-database.homeModules.nix-index
 						];
 					};
-          # home-manager.users.th3r00t = import ./home.nix;
           # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
         }
       ];
@@ -59,8 +64,8 @@
         { nixpkgs.overlays = overlays; }
 				disko.nixosModules.disko
 				sops-nix.nixosModules.sops
-				./hardware-configuration.nix
+				./modules/hardware-configuration.nix
-        ./configuration-server.nix
+        ./modules/configuration-server.nix
         home-manager.nixosModules.home-manager {
           # home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;

home-server.nix

@@ -13,7 +13,7 @@
 		executable = true; 
 	};
 	home.file.".config/nvim" = {
-		source = ./home/config/nvim;
+		source = ./home/.config/nvim;
 		recursive = true;
 		executable = true; 
 	};

home-xps13.nix

@@ -13,7 +13,7 @@
 		executable = true; 
 	};
 	home.file.".config/nvim" = {
-		source = ./home/config/nvim;
+		source = ./home/.config/nvim;
 		recursive = true;
 		executable = true; 
 	};
@@ -23,17 +23,17 @@
 		executable = true; 
 	};
 	home.file.".config/dosbox-x" = {
-		source = ./home/config/dosbox-x;
+		source = ./home/.config/dosbox-x;
 		recursive = true;
 		executable = true; 
 	};
 	home.file.".config/waybar/power_menu.xml" = {
-		source = ./home/config/waybar/power_menu.xml;
+		source = ./home/.config/waybar/power_menu.xml;
 		recursive = true;
 		executable = true; 
 	};
 	home.file.".config/qutebrowser/blocked-hosts" = {
-		source = ./home/config/qutebrowser/blocked-hosts;
+		source = ./home/.config/qutebrowser/blocked-hosts;
 		recursive = true;
 		executable = true; 
 	};

home/.config/nvim/init.lua

@@ -1,30 +1,48 @@
 local vim = vim
-require("options") -- ~/.nixos/home/config/nvim/lua/options.lua
+local host = vim.loop.os_gethostname()
-require("plugins") -- ~/.nixos/home/config/nvim/lua/plugins.lua
+require("options") -- /etc/nixos/home/.config/nvim/lua/options.lua
-require("utils.t3_functions") -- ~/.nixos/home/config/nvim/lua/utils/t3_functions.lua
+require("plugins") -- /etc/nixos/home/.config/nvim/lua/plugins.lua
-require("utils.t3_overrides") -- ~/.nixos/home/config/nvim/lua/utils/t3_overrides.lua
+require("utils.t3_functions") -- /etc/nixos/home/.config/nvim/lua/utils/t3_functions.lua
-require("utils.reload") -- ~/.nixos/home/config/nvim/lua/utils/reload.lua
+require("utils.t3_overrides") -- /etc/nixos/home/.config/nvim/lua/utils/t3_overrides.lua
-require("vimwiki") -- ~/.nixos/home/config/nvim/lua/vimwiki.lua
+require("utils.reload") -- /etc/nixos/home/.config/nvim/lua/utils/reload.lua
-require("keymaps") -- ~/.nixos/home/config/nvim/lua/keymaps.lua
+require("vimwiki") -- /etc/nixos/home/.config/nvim/lua/vimwiki.lua
-require("lsp") -- ~/.nixos/home/config/nvim/lua/lsp.lua
+require("keymaps") -- /etc/nixos/home/.config/nvim/lua/keymaps.lua
-require("completion") -- ~/.nixos/home/config/nvim/lua/completion.lua
+require("lsp") -- /etc/nixos/home/.config/nvim/lua/lsp.lua
-require("treesitter") -- ~/.nixos/home/config/nvim/lua/treesitter.lua
+require("completion") -- /etc/nixos/home/.config/nvim/lua/completion.lua
-require("autocmds")  -- ~/.nixos/home/config/nvim/lua/autocmds.lua
+require("treesitter") -- /etc/nixos/home/.config/nvim/lua/treesitter.lua
-require("diagnostics") -- ~/.nixos/home/config/nvim/lua/diagnostics.lua
+require("autocmds")  -- /etc/nixos/home/.config/nvim/lua/autocmds.lua
+require("diagnostics") -- /etc/nixos/home/.config/nvim/lua/diagnostics.lua
+require('telescope_configuration') -- /etc/nixos/home/.config/nvim/lua/telescope_configuration.lua
 
-require('tokyonight').setup({
+if host == "xps13" then
-	style = "moon", -- "storm", "moon", "day", "night"
+	require('tokyonight').setup({
-	transparent = true, -- Enable transparent background
+		style = "moon", -- "storm", "moon", "day", "night"
-	terminal_colors = true, -- Enable terminal colors
+		transparent = true, -- Enable transparent background
-	styles = {
+		terminal_colors = true, -- Enable terminal colors
-		comments = { italic = true }, -- Italic comments
+		styles = {
-		keywords = { italic = true }, -- Italic keywords
+			comments = { italic = true }, -- Italic comments
-		functions = { bold = true }, -- Bold functions
+			keywords = { italic = true }, -- Italic keywords
-		variables = {}, -- No special style for variables
+			functions = { bold = true }, -- Bold functions
-		sidebars = "dark", -- Dark sidebars
+			variables = {}, -- No special style for variables
-		floats = "dark", -- Dark floating windows
+			sidebars = "dark", -- Dark sidebars
-	},
+			floats = "dark", -- Dark floating windows
-})
+		},
+	})
+elseif host == "Titan" then
+	require('tokyonight').setup({
+		style = "storm", -- "storm", "moon", "day", "night"
+		transparent = false, -- Enable transparent background
+		terminal_colors = true, -- Enable terminal colors
+		styles = {
+			comments = { italic = true }, -- Italic comments
+			keywords = { italic = true }, -- Italic keywords
+			functions = { bold = true }, -- Bold functions
+			variables = {}, -- No special style for variables
+			sidebars = "dark", -- Dark sidebars
+			floats = "dark", -- Dark floating windows
+		},
+	})
+end
 
 local function is_linux_console()
   return vim.env.TERM == "linux"

home/.config/nvim/lua/keymaps.lua

@@ -64,6 +64,33 @@ vim.keymap.set("n", "<A-8>", "<Cmd>BufferGoto 8<CR>", { desc = "Go to Buffer 8"
 vim.keymap.set("n", "<A-9>", "<Cmd>BufferGoto 9<CR>", { desc = "Go to Buffer 9" })
 vim.keymap.set("n", "<A-0>", "<Cmd>BufferLast<CR>", { desc = "Go to Last Buffer" })
 
+-- Meta X Maps
+vim.keymap.set("n", "<M-x><M-x>", ":Telescope commands<CR>", { desc = "Commands"})
+vim.keymap.set("n", "<M-x>b", ":Telescope buffers<CR>", { desc = "Buffers"})
+vim.keymap.set("n", "<M-x>f", ":Telescope find_files<CR>", { desc = "Find Files"})
+vim.keymap.set("n", "<M-x>g", ":Telescope live_grep<CR>", { desc = "Live Grep"})
+vim.keymap.set("n", "<M-x>h", ":Telescope help_tags<CR>", { desc = "Help Tags"})
+vim.keymap.set("n", "<M-x>p", ":Telescope project<CR>", { desc = "Projects"})
+vim.keymap.set("n", "<M-x>l", ":Telescope resume<CR>", { desc = "Resume Last Search"})
+vim.keymap.set("n", "<M-x>c", ":Telescope colorscheme<CR>", { desc = "Colorschemes"})
+vim.keymap.set("n", "<M-x>n", ":enew<CR>", { desc = "New File"})
+vim.keymap.set("n", "<M-x>s", ":w<CR>", { desc = "Save File"})
+vim.keymap.set("n", "<M-x>q", ":q<CR>", { desc = "Quit"})
+vim.keymap.set("n", "<M-x>w", ":bd<CR>", { desc = "Close Buffer"})
+vim.keymap.set("n", "<M-x>a", "ggVG", { desc = "Select All"})
+vim.keymap.set("n", "<M-x>z", "u", { desc = "Undo"})
+vim.keymap.set("n", "<M-x>y", "<C-r>", { desc = "Redo"})
+vim.keymap.set("n", "<M-x>/", ":nohlsearch<CR>", { desc = "Clear Search Highlight"})
+vim.keymap.set("n", "<M-x>=", ":vertical resize +5<CR>", { desc = "Increase Window Width"})
+vim.keymap.set("n", "<M-x>-"," :vertical resize -5<CR>", { desc = "Decrease Window Width"})
+vim.keymap.set("n", "<M-x>+", ":resize +5<CR>", { desc = "Increase Window Height"})
+vim.keymap.set("n", "<M-x>_", ":resize -5<CR>", { desc = "Decrease Window Height"})
+vim.keymap.set("n", "<M-x>Left", ":vertical resize -5<CR>", { desc = "Decrease Window Width"})
+vim.keymap.set("n", "<M-x>Right"," :vertical resize +5<CR>", { desc = "Increase Window Width"})
+vim.keymap.set("n", "<M-x>Up", ":resize +5<CR>", { desc = "Increase Window Height"})
+vim.keymap.set("n", "<M-x>Down", ":resize -5<CR>", { desc = "Decrease Window Height"})
+vim.keymap.set("n", "<M-x>Enter", ":ToggleTerm<CR>", { desc = "Toggle Terminal"})
+
 
 -- CTRL X Maps
 vim.keymap.set("n", "<C-x><C-b>", ":Pick buffers<CR>", { desc = "Buffer Picker"})
@@ -72,10 +99,6 @@ vim.keymap.set("n", "<C-x><C-h>", ":Pick help<CR>", { desc = "Help Picker"})
 vim.keymap.set("n", "<C-x><C-g>", "", { desc = "Grep"})
 vim.keymap.set("n", "<C-x><C-g>g", ":Pick grep<CR>", { desc = "Grep"})
 vim.keymap.set("n", "<C-x><C-g>l", ":Pick grep_live<CR>", { desc = "Live Grep"})
-vim.keymap.set("v", "<C-x><C-c>", ":'<,'>SnipRun<CR>", { silent = true, desc = "Run Selection" })
-vim.keymap.set("n", "<C-x><C-c>", ":<Plug>SnipRun<CR>", { desc = "Run Current Line" })
-vim.keymap.set("n", "<C-x><C-b>", ":%SnipRun<CR>", { desc = "Run Buffer" })
-vim.keymap.set("n", "<C-x><C-k>", "<Plug>SnipReset<CR>", { desc = "Run Buffer" })
 vim.keymap.set("n", "<C-x><C-n>", "", { desc = "Notes"})
 vim.keymap.set("n", "<C-x><C-n>e", "<cmd>TWEditTask<cr>", { desc = "TaskWarrior Edit", noremap = true, silent = true })
 vim.keymap.set("n", "<C-x><C-n>v", "<cmd>TWView<cr>", { desc = "View Tasks", noremap = true, silent = true })
@@ -83,3 +106,7 @@ vim.keymap.set("n", "<C-x><C-n>u", "<cmd>TWUpdateCurrent<cr>", { desc="Update Ta
 vim.keymap.set("n", "<C-x><C-n>s", "<cmd>TWSyncTasks<cr>", { desc = "Sync Tasks", noremap = true, silent = true })
 vim.keymap.set("n", "<C-x><C-n><c-space>",  "<cmd>TWToggle<cr>",	{ desc = "Toggle Taskwarrior", silent = true })
 
+vim.keymap.set("v", "<C-;><C-c>", ":'<,'>SnipRun<CR>", { silent = true, desc = "Run Selection" })
+vim.keymap.set("n", "<C-;><C-c>", ":<Plug>SnipRun<CR>", { desc = "Run Current Line" })
+vim.keymap.set("n", "<C-;><C-b>", ":%SnipRun<CR>", { desc = "Run Buffer" })
+vim.keymap.set("n", "<C-;><C-k>", "<Plug>SnipReset<CR>", { desc = "Run Buffer" })

home/.config/nvim/lua/options.lua

@@ -12,14 +12,14 @@ vim.o.wildmode = "longest:full,full"
 vim.o.wildoptions = "pum"
 vim.g.mapleader = " "
 vim.o.termguicolors = true
-vim.o.winborder = "double"
+vim.o.winborder = "shadow"
 vim.o.clipboard = "unnamedplus"
 vim.o.completeopt = "menuone"
 -- vim.o.completeopt = "menuone,noinsert,noselect"
 vim.o.cursorline = true
 vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
 vim.g.netrw_keepdir = 1
-vim.g.netrw_winsize = 15
+vim.g.netrw_winsize = 20
 vim.g.netrw_banner = 0
 vim.g.netrw_localcopydircmd = 'cp -avr'
 vim.g.netrw_liststyle = 3

home/.config/nvim/lua/plugins.lua

@@ -1,4 +1,6 @@
 local vim = vim
+local host = vim.loop.os_gethostname()
+
 vim.pack.add({
 	{ src = "https://github.com/folke/tokyonight.nvim" },
 	{ src = "https://github.com/nvim-tree/nvim-web-devicons" },
@@ -25,9 +27,6 @@ vim.pack.add({
 	{ src = "https://github.com/saadparwaiz1/cmp_luasnip" },
 	{ src = "https://github.com/github/copilot.vim" },
 	{ src = "https://github.com/pysan3/pathlib.nvim" },
-	-- { src = "https://github.com/nvim-orgmode/orgmode" },
-	-- { src = "https://github.com/chipsenkbeil/org-roam.nvim" },
-	-- { src = "https://github.com/danilshvalov/org-modern.nvim" },
 	{ src = "https://github.com/nvim-orgmode/org-bullets.nvim" },
 	{ src = "https://github.com/lukas-reineke/headlines.nvim" },
 	{ src = "https://github.com/michaelb/sniprun", run = "bash install.sh 1" },
@@ -49,8 +48,18 @@ vim.pack.add({
 	{ src = "https://github.com/rmagatti/logger.nvim" },
 	{ src = "https://github.com/rmagatti/goto-preview" },
 	{ src = "https://github.com/norcalli/nvim-colorizer.lua" },
+	{ src = "https://github.com/nvim-lua/plenary.nvim" },
+	{ src = "https://github.com/nvim-telescope/telescope.nvim" },
+	{ src = "https://github.com/nvim-telescope/telescope-project.nvim"},
+	{ src = "https://github.com/nvim-telescope/telescope-ui-select.nvim" },
+	{ src = "https://github.com/luckasRanarison/nvim-devdocs" },
+	{ src = "https://github.com/folke/noice.nvim" },
+	{ src = "https://github.com/mbbill/undotree.git" },
 })
 
+if host == "xps13" then
+end
+
 require('mini.icons').setup({})
 require('mini.pick').setup({})
 require('mini.pairs').setup({})
@@ -82,12 +91,6 @@ require('todo-comments').setup({
 	}
 })
 require('trouble').setup({})
--- require('orgmode').setup({
--- 	org_agenda_files = { '~/org/*' },
--- 	org_default_notes_file = '~/org/notes.org',
--- })
--- require('org-roam').setup({ directory = '~/org/roam' })
--- require("orgmode").setup({})
 require('org-bullets').setup({})
 require('headlines').setup({})
 require('sniprun').setup({
@@ -114,3 +117,22 @@ require("auto-session").setup({
 require('barbar').setup({})
 require('goto-preview').setup({ default_mappings = true })
 require('colorizer').setup({})
+require('telescope').setup({})
+require('nvim-devdocs').setup({})
+require('noice').setup({
+	  lsp = {
+    override = {
+      ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+      ["vim.lsp.util.stylize_markdown"] = true,
+      ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
+    },
+  },
+  presets = {
+    bottom_search = true, -- use a classic bottom cmdline for search
+    command_palette = true, -- position the cmdline and popupmenu together
+    long_message_to_split = true, -- long messages will be sent to a split
+    inc_rename = false, -- enables an input dialog for inc-rename.nvim
+    lsp_doc_border = false, -- add a border to hover docs and signature help
+  },
+})
+

home/.config/nvim/lua/telescope_configuration.lua

@@ -0,0 +1,32 @@
+local vim = vim
+local host = vim.loop.os_gethostname()
+
+require('telescope').load_extension('project')
+require('telescope').load_extension('ui-select')
+
+require('telescope').setup{
+	defaults = {
+		mappings = {
+			i = {
+				["<C-u>"] = false,
+				["<C-d>"] = false,
+			},
+		},
+	},
+	pickers = {
+		-- Default configuration for builtin pickers goes here:
+		-- picker_name = {
+		--   picker_config_key = value,
+		--   ...
+		-- }
+		-- Now the picker_config_key will be applied every time you call this
+		-- builtin picker
+	},
+	extensions = {
+		["ui-select"] = {
+			require("telescope.themes").get_dropdown {
+				-- even more opts
+			}
+		},
+	}
+}

modules/configuration-server.nix

@@ -6,10 +6,10 @@
 
 {
 	imports =
-		[ # Include the results of the hardware scan.
+		[
 			./hardware-configuration.nix
 			./server-partitioning.nix
-			./modules/configuration-common.nix
+			./configuration-common.nix
 		];
 	nix.settings.experimental-features = [ "nix-command" "flakes" ];
 	nix.settings.trusted-users = [ "root" "th3r00t" ];

modules/configuration-xps13.nix

@@ -6,12 +6,9 @@
 
 {
 	imports =
-		[ # Include the results of the hardware scan.
+		[
-			./xps13-hardware-configuration.nix
+			./configuration-common.nix
-			./modules/configuration-common.nix
+			./laptop.nix
-			# ./modules/shares.nix
-			# ./modules/sops.nix
-			./modules/laptop.nix
 		];
 	# Bootloader.
 	boot = {
@@ -31,27 +28,10 @@
 		'';
 	};
 	services.udisks2.enable = false;
-	# Set your time zone.
-
-	# Enable the X11 windowing system.
-	# You can disable this if you're only using the Wayland session.
-	# services.xserver.enable = true;
-
-	# Enable the KDE Plasma Desktop Environment.
-	# services.displayManager.sddm.enable = true;
-	# services.desktopManager.plasma6.enable = true;
-
-	# Configure keymap in X11
-	# services.xserver.xkb = {
-	#   layout = "us";
-	#   variant = "";
-	# };
-
 	# Enable CUPS to print documents.
 	services.printing.enable = true;
 	programs.uwsm.enable = true;
 	programs.hyprland.withUWSM = true;
-
 	# Enable sound with pipewire.
 	services.pulseaudio.enable = false;
 	security.rtkit.enable = true;
@@ -61,24 +41,14 @@
 		alsa.support32Bit = true;
 		pulse.enable = true;
 		jack.enable = true;
-
-		# use the example session manager (no others are packaged yet so this is enabled by default,
-		# no need to redefine it in your config for now)
 		#media-session.enable = true;
 	};
-
 	# Enable touchpad support (enabled default in most desktopManager).
 	services.libinput.enable = true;
 	fonts = {
 		enableDefaultPackages = true;
 		fontDir.enable = true;
 		packages = with pkgs; [
-			# nerd-fonts.fira-code
-			# nerd-fonts.space-mono
-			# nerd-fonts.sauce-code-pro
-			# nerd-fonts.monofur
-			# nerd-fonts.noto
-			# nerd-fonts.fira-mono
 			noto-fonts
 			noto-fonts-cjk-sans
 			noto-fonts-emoji
@@ -86,7 +56,6 @@
 			material-design-icons
 			noto-fonts-emoji
 		]++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-
 	};
 
 	# Define a user account. Don't forget to set a password with ‘passwd’.

modules/hyprland.nix

@@ -19,7 +19,7 @@
 				};
 			};
 			decoration = {
-				rounding = "10";
+				rounding = "0";
 				rounding_power = "2";
 				active_opacity = "1";
 				inactive_opacity = ".7";
@@ -45,8 +45,8 @@
 		};
 		extraConfig = ''
 		general {
-			gaps_in = 5
+			gaps_in = 0
-			gaps_out = 5
+			gaps_out = 0
 			border_size = 1
 			col.active_border = rgb(b000b5)
 			col.inactive_border = rgb(1f2335)