revert be99293472

revert Added configuration-common.nix

configuration-server.nix

@@ -9,11 +9,10 @@
 		[ # Include the results of the hardware scan.
 			./hardware-configuration.nix
 			./server-partitioning.nix
-			./modules/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.allowedTCPPorts = [ 21 22 80 443 5900 8080 ];
-	networking.firewall.allowedUDPPorts = [ 21 22 80 443 5900 8080 8384];
+	networking.firewall.allowedUDPPorts = [ 21 22 80 443 5900 8080 ];
 	# Or disable the firewall altogether.
 	# networking.firewall.enable = false;
 

configuration.nix

@@ -8,11 +8,11 @@
 	imports =
 		[ # Include the results of the hardware scan.
 			./xps13-hardware-configuration.nix
-			./modules/configuration-common.nix
+			./modules/shares.nix
-			# ./modules/shares.nix
+			./modules/sops.nix
-			# ./modules/sops.nix
 			./modules/laptop.nix
 		];
+	nix.settings.experimental-features = [ "nix-command" "flakes" ];
 	# Bootloader.
 	boot = {
 		kernelPackages = pkgs.linuxPackages_latest;
@@ -30,8 +30,23 @@
 			options ath10k_core rawmode=1
 		'';
 	};
-	services.udisks2.enable = true;
 	# 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.
@@ -107,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
@@ -122,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.nix

@@ -35,8 +35,7 @@
       modules = [
         { nixpkgs.overlays = overlays; }
 				sops-nix.nixosModules.sops
-				./configuration.nix
+        ./xps13-hardware-configuration.nix.nix
-        ./xps13-hardware-configuration.nix
         home-manager.nixosModules.home-manager {
           # home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
@@ -52,7 +51,7 @@
         }
       ];
     };
-    nixosConfigurations.Titan = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.server = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit overlays; };
       modules = [

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

@@ -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

@@ -53,34 +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
 	];
-	services.udiskie = {
-		enable = true;
-		settings = {
-			program_options = {
-				file_manager = "${pkgs.nemo-with-extensions}/bin/nemo";
-			};
-		};
-	};
 	programs.wofi = {
 		enable = true;
 		settings = {

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_battery_widget 1
-					set -g @tokyo-night-tmux_show_netspeed 1
+				set -g @tokyo-night-tmux_battery_name "BAT0"  # some linux distro have 'BAT0'
-					set -g @tokyo-night-tmux_netspeed_iface 'wlp2s0'
+				set -g @tokyo-night-tmux_battery_low_threshold 21 # default
-					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
-				}
 				'';
 			}
+			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 C-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'
@@ -254,28 +177,6 @@ bind F3 send-keys 'igrep .' C-m
 		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