revert be99293472

revert Added configuration-common.nix

configuration-server.nix

@@ -6,14 +6,13 @@
 
 {
 	imports =
-		[
+		[ # Include the results of the hardware scan.
 			./hardware-configuration.nix
 			./server-partitioning.nix
-			./configuration-common.nix
+			./modules/shares.nix
+			./modules/sops.nix
 		];
 	nix.settings.experimental-features = [ "nix-command" "flakes" ];
-	nix.settings.trusted-users = [ "root" "th3r00t" ];
-	networking.hostName = "Titan"; # Define your hostname.
 	# Bootloader.
 	boot = {
 		kernelPackages = pkgs.linuxPackages_latest;
@@ -121,8 +120,8 @@
   ];
 
 	# Open ports in the firewall.
-	networking.firewall.allowedTCPPorts = [ 21 22 80 443 5900 8080 8384];
-	networking.firewall.allowedUDPPorts = [ 21 22 80 443 5900 8080 8384];
+	networking.firewall.allowedTCPPorts = [ 21 22 80 443 5900 8080 ];
+	networking.firewall.allowedUDPPorts = [ 21 22 80 443 5900 8080 ];
 	# Or disable the firewall altogether.
 	# networking.firewall.enable = false;
 

configuration.nix

@@ -6,16 +6,14 @@
 
 {
 	imports =
-		[
-			./configuration-common.nix
-			./laptop.nix
+		[ # Include the results of the hardware scan.
+			./xps13-hardware-configuration.nix
+			./modules/shares.nix
+			./modules/sops.nix
+			./modules/laptop.nix
 		];
+	nix.settings.experimental-features = [ "nix-command" "flakes" ];
 	# Bootloader.
-	nix.settings.trusted-users = [ "root" "th3r00t" ];
-	nix.extraOptions = ''
-		extra-substituters = https://devenv.cachix.org
-		extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=
-	'';
 	boot = {
 		kernelPackages = pkgs.linuxPackages_latest;
 		initrd.availableKernelModules = [
@@ -25,18 +23,50 @@
 		initrd.kernelModules = [ "ath10k_pci" ];
 		loader.systemd-boot.enable = true;
 		loader.efi.canTouchEfiVariables = true;
-		supportedFilesystems = [ "vfat" "ext4" "cifs" "exfat" ];
+		supportedFilesystems = [ "vfat" "ext4" "cifs" ];
 		extraModulePackages = [ ];
 		extraModprobeConfig = ''
 			options ath10k_pcs irq_mode=1
 			options ath10k_core rawmode=1
 		'';
 	};
-	services.udisks2.enable = false;
+	# Set your time zone.
+	time.timeZone = "America/New_York";
+
+	# Select internationalisation properties.
+	i18n.defaultLocale = "en_US.UTF-8";
+
+	i18n.extraLocaleSettings = {
+		LC_ADDRESS = "en_US.UTF-8";
+		LC_IDENTIFICATION = "en_US.UTF-8";
+		LC_MEASUREMENT = "en_US.UTF-8";
+		LC_MONETARY = "en_US.UTF-8";
+		LC_NAME = "en_US.UTF-8";
+		LC_NUMERIC = "en_US.UTF-8";
+		LC_PAPER = "en_US.UTF-8";
+		LC_TELEPHONE = "en_US.UTF-8";
+		LC_TIME = "en_US.UTF-8";
+	};
+
+	# 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;
@@ -46,14 +76,24 @@
 		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
@@ -61,6 +101,7 @@
 			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’.
@@ -81,9 +122,11 @@
 	programs.firefox.enable = true;
 	programs.hyprland.enable = true;
 
+	nixpkgs.config.allowUnfree = true;
 
 	# List packages installed in system profile. To search, run:
 	# $ nix search wget
+	environment.variables.EDITOR = "nvim";
 	environment.systemPackages = with pkgs; [
 		#  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
 		#  wget
@@ -96,6 +139,10 @@
 	# Some programs need SUID wrappers, can be configured further or are
 	# started in user sessions.
 	programs.mtr.enable = true;
+	programs.gnupg.agent = {
+		enable = true;
+		enableSSHSupport = true;
+	};
 
 	# List services that you want to enable:
 

flake.lock

@@ -240,22 +240,6 @@
         "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,
@@ -310,7 +294,6 @@
         "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,13 +13,8 @@
 		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,
-		nixos-hardware, ...
-	}@inputs:
+  outputs = { self, nixpkgs, home-manager, nix-index-database, sops-nix, disko,  ... }@inputs:
     let
       overlays = [
        inputs.neovim-nightly-overlay.overlays.default
@@ -40,9 +35,7 @@
       modules = [
         { nixpkgs.overlays = overlays; }
 				sops-nix.nixosModules.sops
-				./modules/configuration-xps13.nix
-        ./modules/hardware-configuration-xps13.nix
-				nixos-hardware.nixosModules.dell-xps-13-9370
+        ./xps13-hardware-configuration.nix.nix
         home-manager.nixosModules.home-manager {
           # home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
@@ -53,19 +46,20 @@
 							nix-index-database.homeModules.nix-index
 						];
 					};
+          # home-manager.users.th3r00t = import ./home.nix;
           # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
         }
       ];
     };
-    nixosConfigurations.Titan = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.server = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit overlays; };
       modules = [
         { nixpkgs.overlays = overlays; }
 				disko.nixosModules.disko
 				sops-nix.nixosModules.sops
-				./modules/hardware-configuration.nix
-        ./modules/configuration-server.nix
+				./hardware-configuration.nix
+        ./configuration-server.nix
         home-manager.nixosModules.home-manager {
           # home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;

hardware-configuration.nix

@@ -12,7 +12,6 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
-	networking.hostName = "Titan"; # Define your hostname.
 
   # 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

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; 
 	};
@@ -38,6 +38,67 @@
 		PLATFORMTHEME = "kde";
 	};
 	home.packages = with pkgs; [
+		autossh
+		fastfetch
+		ranger
+		zip
+		unzip
+		xz
+		p7zip
+		ripgrep
+		jq
+		ripgrep
+		eza
+		fzf
+		tmux
+		cowsay
+		lolcat
+		fortune
+		gnused
+		gnutar
+		gnupg
+		hugo
+		bat
+		which
+		nix-output-monitor
+		devenv
+		irssi
+		luarocks
+		lua5_1
+		lua-language-server
+		go
+		nodejs
+		uv
+		readline
+		cachix
+		sqlite
+		vifm-full
+		ranger
+		zoxide
+		(
+			python313.withPackages (
+				python-pkgs: 
+				[
+					python-pkgs.prompt_toolkit
+					python-pkgs.pygments
+					python-pkgs.pynvim
+					python-pkgs.pudb
+					python-pkgs.ptpython
+					python-pkgs.ipython
+				]
+			)
+		)
+		neovim
+		zig
+		syncthing
+		lazygit
+		wofi
+		gopls
+		pyright
+		ncurses
+		rustup
+		wayvnc
+		gvfs
 	];
 	home.stateVersion = "25.05";
 }

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; 
 	};
@@ -53,59 +53,86 @@
 		PLATFORMTHEME = "kde";
 	};
 	home.packages = with pkgs; [
+		autossh
 		mesa-demos
 		bluez
 		bluez-tools
 		bluez-alsa
+		fastfetch
+		ranger
 		kdePackages.dolphin
+		zip
+		unzip
+		xz
+		p7zip
+		ripgrep
+		jq
+		ripgrep
+		eza
+		fzf
+		tmux
+		cowsay
+		lolcat
+		fortune
+		gnused
+		gnutar
+		gnupg
+		hugo
+		bat
+		which
+		nix-output-monitor
+		devenv
+		irssi
+		luarocks
+		lua5_1
 		gimp
+		lua-language-server
+		go
+		nodejs
+		uv
+		readline
+		cachix
+		sqlite
 		rofi
 		qutebrowser
 		foot
+		vifm-full
+		ranger
+		zoxide
 		hyprsysteminfo
+		(
+			python313.withPackages (
+				python-pkgs: 
+				[
+					python-pkgs.prompt_toolkit
+					python-pkgs.pygments
+					python-pkgs.pynvim
+					python-pkgs.pudb
+					python-pkgs.ptpython
+					python-pkgs.ipython
+				]
+			)
+		)
+		neovim
+		zig
+		nodejs
+		go
+		syncthing
 		dosbox-x
+		lazygit
 		wofi
 		qutebrowser
 		waybar
 		uwsm
+		gopls
+		pyright
+		ncurses
+		rustup
+		wayvnc
 		power-profiles-daemon
 		wpa_supplicant_gui
 		gvfs
-		nemo-with-extensions
-		wayvnc
-		xdg-desktop-portal-wlr
-		exfatprogs
-		neovide
 	];
-	services.udiskie = {
-		enable = false;
-		settings = {
-			program_options = {
-				file_manager = "${pkgs.nemo-with-extensions}/bin/nemo";
-			};
-		};
-	};
-	programs.neovide = {
-		enable = true;
-		settings = {
-			fork = false;
-			frame = "full";
-			idle = true;
-			maximized = false;
-			neovim-bin = "${pkgs.neovim}/bin/nvim";
-			no-multigrid = false;
-			srgb = false;
-			tabs = true;
-			title-hidden = true;
-			vsync = true;
-			wsl = false;
-
-			font = {
-				normal = "SauceCodePro Nerd Font Mono";
-				size = 8;
-			};
-		};
-	};
 	programs.wofi = {
 		enable = true;
 		settings = {

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

@@ -1,32 +0,0 @@
-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
-			}
-		},
-	}
-}

home/config/nvim/init.lua

@@ -1,48 +1,30 @@
 local vim = vim
-local host = vim.loop.os_gethostname()
-require("options") -- /etc/nixos/home/.config/nvim/lua/options.lua
-require("plugins") -- /etc/nixos/home/.config/nvim/lua/plugins.lua
-require("utils.t3_functions") -- /etc/nixos/home/.config/nvim/lua/utils/t3_functions.lua
-require("utils.t3_overrides") -- /etc/nixos/home/.config/nvim/lua/utils/t3_overrides.lua
-require("utils.reload") -- /etc/nixos/home/.config/nvim/lua/utils/reload.lua
-require("vimwiki") -- /etc/nixos/home/.config/nvim/lua/vimwiki.lua
-require("keymaps") -- /etc/nixos/home/.config/nvim/lua/keymaps.lua
-require("lsp") -- /etc/nixos/home/.config/nvim/lua/lsp.lua
-require("completion") -- /etc/nixos/home/.config/nvim/lua/completion.lua
-require("treesitter") -- /etc/nixos/home/.config/nvim/lua/treesitter.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("options") -- ~/.nixos/home/config/nvim/lua/options.lua
+require("plugins") -- ~/.nixos/home/config/nvim/lua/plugins.lua
+require("utils.t3_functions") -- ~/.nixos/home/config/nvim/lua/utils/t3_functions.lua
+require("utils.t3_overrides") -- ~/.nixos/home/config/nvim/lua/utils/t3_overrides.lua
+require("utils.reload") -- ~/.nixos/home/config/nvim/lua/utils/reload.lua
+require("vimwiki") -- ~/.nixos/home/config/nvim/lua/vimwiki.lua
+require("keymaps") -- ~/.nixos/home/config/nvim/lua/keymaps.lua
+require("lsp") -- ~/.nixos/home/config/nvim/lua/lsp.lua
+require("completion") -- ~/.nixos/home/config/nvim/lua/completion.lua
+require("treesitter") -- ~/.nixos/home/config/nvim/lua/treesitter.lua
+require("autocmds")  -- ~/.nixos/home/config/nvim/lua/autocmds.lua
+require("diagnostics") -- ~/.nixos/home/config/nvim/lua/diagnostics.lua
 
-if host == "xps13" then
-	require('tokyonight').setup({
-		style = "moon", -- "storm", "moon", "day", "night"
-		transparent = true, -- 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
-		},
-	})
-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
+require('tokyonight').setup({
+	style = "moon", -- "storm", "moon", "day", "night"
+	transparent = true, -- 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
+	},
+})
 
 local function is_linux_console()
   return vim.env.TERM == "linux"

home/config/nvim/lua/keymaps.lua

@@ -64,33 +64,6 @@ 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"})
@@ -99,6 +72,10 @@ 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 })
@@ -106,7 +83,3 @@ 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 = "shadow"
+vim.o.winborder = "double"
 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 = 20
+vim.g.netrw_winsize = 15
 vim.g.netrw_banner = 0
 vim.g.netrw_localcopydircmd = 'cp -avr'
 vim.g.netrw_liststyle = 3

home/config/nvim/lua/plugins.lua

@@ -1,6 +1,4 @@
 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" },
@@ -27,6 +25,9 @@ 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" },
@@ -48,18 +49,8 @@ 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({})
@@ -91,6 +82,12 @@ 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({
@@ -117,22 +114,3 @@ 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
-  },
-})
-

modules/configuration-common.nix

@@ -1,51 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-	imports = 
-		[
-			./shares.nix
-			./sops.nix
-		];
-
-	nix.settings.experimental-features = [ "nix-command" "flakes" ];
-	time.timeZone = "America/New_York";
-	i18n.defaultLocale = "en_US.UTF-8";
-	i18n.extraLocaleSettings = {
-		LC_ADDRESS = "en_US.UTF-8";
-		LC_IDENTIFICATION = "en_US.UTF-8";
-		LC_MEASUREMENT = "en_US.UTF-8";
-		LC_MONETARY = "en_US.UTF-8";
-		LC_NAME = "en_US.UTF-8";
-		LC_NUMERIC = "en_US.UTF-8";
-		LC_PAPER = "en_US.UTF-8";
-		LC_TELEPHONE = "en_US.UTF-8";
-		LC_TIME = "en_US.UTF-8";
-	};
-
-	nixpkgs.config.allowUnfree = true;
-	environment.variables.EDITOR = "nvim";
-
-	programs.gnupg.agent = {
-		enable = true;
-		enableSSHSupport = true;
-	};
-
-	networking = {
-		hosts = {
-			"10.0.0.76" = [ "nas nas.lan" ];
-			"10.0.0.125" = [ "git" "git.lan" ];
-			"10.0.0.153" = [ "samphone" "samphone.lan" ];
-			"10.0.0.223" = [ "pve" "pve.lan" ];
-			"10.0.0.39" = [ "chronos" "chronos.lan" ];
-			"10.0.0.78" = [ "pyshelf" "pyshelf.lan" ];
-			"10.0.0.121" = [ "titan" "titan.lan" ];
-			"10.0.0.107" = [ "psql" "psql.lan" ];
-			"10.0.0.99" = [ "jelly" "jelly.lan" ];
-			"10.0.0.207" = [ "sync" "sync.lan" ];
-			"10.0.0.14" = [ "radios" "radios.lan" ];
-			"10.0.0.172" = [ "vault" "vault.lan" ];
-			"10.0.0.109" = [ "adguard" "adguard.lan" ];
-			"10.0.0.50" = [ "dashy" "dashy.lan" ];
-		};
-	};
-}

modules/home-manager-common.nix

@@ -3,72 +3,6 @@
 {
 	imports = [
 	];
-	home.packages = with pkgs; [
-		autossh
-		fastfetch
-		ranger
-		zip
-		unzip
-		xz
-		p7zip
-		ripgrep
-		jq
-		ripgrep
-		eza
-		fzf
-		tmux
-		cowsay
-		lolcat
-		fortune
-		gnused
-		gnutar
-		gnupg
-		hugo
-		bat
-		which
-		nix-output-monitor
-		devenv
-		direnv
-		irssi
-		luarocks
-		lua5_1
-		lua-language-server
-		go
-		nodejs
-		uv
-		readline
-		cachix
-		sqlite
-		vifm-full
-		ranger
-		zoxide
-		(
-			python313.withPackages (
-				python-pkgs: 
-				[
-					python-pkgs.prompt_toolkit
-					python-pkgs.pygments
-					python-pkgs.pynvim
-					python-pkgs.pudb
-					python-pkgs.ptpython
-					python-pkgs.ipython
-				]
-			)
-		)
-		pyenv
-		neovim
-		zig
-		nodejs
-		go
-		syncthing
-		lazygit
-		gopls
-		pyright
-		ncurses
-		rustup
-		wayvnc
-		gvfs
-	];
 
 	programs.neovim.plugins = [
 		pkgs.vimPlugins.nvim-treesitter.withAllGrammars
@@ -78,7 +12,6 @@
 	};
 	services.syncthing  = {
 		enable = true;
-		guiAddress = "0.0.0.0:8384";
 	};
 	programs.ranger = {
 		enable = true;
@@ -157,26 +90,24 @@
 			tmuxPlugins.vim-tmux-navigator
 			tmuxPlugins.vim-tmux-focus-events
 			tmuxPlugins.urlview
-			tmuxPlugins.tmux-fzf
 			{
 				plugin = tmuxPlugins.tokyo-night-tmux;
 				extraConfig = ''
 				set -g @tokyo-night-tmux_window_id_style digital
 				set -g @tokyo-night-tmux_pane_id_style hsquare
 				set -g @tokyo-night-tmux_zoom_id_style dsquare
+				set -g @tokyo-night-tmux_show_netspeed 1
+				set -g @tokyo-night-tmux_netspeed_iface "wlp2s0" # Detected via default route
+				set -g @tokyo-night-tmux_netspeed_showip 1      # Display IPv4 address (default 0)
+				set -g @tokyo-night-tmux_netspeed_refresh 1     # Update interval in seconds (default 1)
 				set -g @tokyo-night-tmux_show_path 1
 				set -g @tokyo-night-tmux_path_format relative # 'relative' or 'full'
-				if-shell "[[ $(hostname) = 'xps13' ]]" {
-					set -g @tokyo-night-tmux_show_netspeed 1
-					set -g @tokyo-night-tmux_netspeed_iface 'wlp2s0'
-					set -g @tokyo-night-tmux_netspeed_showip 1
-					set -g @tokyo-night-tmux_netspeed_refresh 1
-					set -g @tokyo-night-tmux_show_battery_widget 1
-					set -g @tokyo-night-tmux_battery_name "BAT0"
-					set -g @tokyo-night-tmux_battery_low_threshold 21
-				}
+				set -g @tokyo-night-tmux_show_battery_widget 1
+				set -g @tokyo-night-tmux_battery_name "BAT0"  # some linux distro have 'BAT0'
+				set -g @tokyo-night-tmux_battery_low_threshold 21 # default
 				'';
 			}
+			tmuxPlugins.tmux-fzf
 			# {
 			#   plugin = tmuxPlugins.tilish;
 			#   extraConfig = ''
@@ -194,18 +125,11 @@
 		# terminal = "xterm-kitty:RGB";
 		tmuxinator.enable = true;
 		extraConfig = ''
-		if-shell "[[ $(hostname) = 'xps13' ]]" {
-			set-option -as terminal-features 'foot:RGB'
-		}
-		if-shell "[[ $(hostname) = 'Titan' ]]" {
-			set-option -as terminal-features 'xterm-256color:RGB'
-			set -g default-terminal "tmux-256color"
-			set -g terminal-overrides ",xterm-256color:RGB"
-		}
 		set-option -g update-environment "DISPLAY XAUTHORITY WAYLAND_DISPLAY XDG_RUNTIME_DIR HYPRLAND_INSTANCE_SIGNATURE"
 		set -g focus-events on
 		set -g escape-time 3
 		set-option -g status-position top
+		set-option -as terminal-features 'foot:RGB'
 		set -g default-terminal 'tmux-256color'
 		bind-key b choose-tree -Z "run-shell 'tmux swap-pane -s %%'" 
 		# bind C-p display-popup -E -w 60% -h 70% 'tmuxsessions.sh'
@@ -215,7 +139,6 @@
 		# bind C-c display-popup -E -w 50% -h 50% 'nvim +":cd ~/org" ~/org/refile.norg'
 		# bind C-c display-popup -E -w 50% -h 50% 'nvim +"VimwikiIndex"
 		bind C-c display-popup -E -w 60% -h 60% "pytui -n"
-		bind m display-popup -E -w 60% -h 60% "pytui -m"
 		# bind C-w display-popup -E -w 40% -h 60% "pytui -D"
 
 		bind C-o display-popup -E -w 50% -h 50% 'igrep ~/wiki/notes'
@@ -229,7 +152,7 @@
 # bind-key -n C-e split-window -v -c '\
 #{pane_current_path}' 'vifm\'
 		bind-key -n C-f split-window 'ranger .'
-bind F3 send-keys 'igrep .'
+bind F3 send-keys 'igrep .' C-m
 		'';
 	};
 	programs.git = {
@@ -254,28 +177,6 @@ bind F3 send-keys 'igrep .'
 		enableBashIntegration = true;
 		enableZshIntegration = true;
 	};
-	programs.ssh = {
-		enable = true;
-		extraConfig = ''
-			Host *
-				ServerAliveInterval 30
-				ServerAliveCountMax 3
-				AddKeysToAgent yes
-		'';
-		matchBlocks = {
-			samphone = {
-				host = "10.0.0.153";
-				user = "u0_a771";
-				port = 8022;
-				identityFile = "~/.ssh/id_ed25519";
-			};
-			git = {
-				host = "10.0.0.125";
-				user = "git";
-				identityFile = "~/.ssh/id_ed25519";
-			};
-		};
-	};
 	programs.starship = {
 		enable = true;
 		# custom settings

modules/hyprland.nix

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