diff --git a/home-manager/common/software/cli/neovim.nix b/home-manager/common/software/cli/neovim.nix
index 015ca48e..74480cd1 100644
--- a/home-manager/common/software/cli/neovim.nix
+++ b/home-manager/common/software/cli/neovim.nix
@@ -20,15 +20,15 @@
 
       # https://github.com/figsoda/cfg/blob/main/src/programs/neovim/configure/packages.nix
       bufferline-nvim                 # https://github.com/akinsho/bufferline.nvim/#configuration
-      cmp-buffer                      #
+      cmp-buffer                      # 
       cmp-cmdline                     # 
       cmp-dap                         # 
       cmp-nvim-lsp                    # 
-      cmp-nvim-lsp-document-symbol    #  
+      cmp-nvim-lsp-document-symbol    # 
       cmp-path                        # 
       cmp_luasnip                     # 
       comment-nvim                    # https://github.com/numtostr/comment.nvim/
-      dressing-nvim                   #
+      dressing-nvim                   # 
       gitsigns-nvim                   # https://github.com/lewis6991/gitsigns.nvim/
       indent-blankline-nvim           # https://github.com/lukas-reineke/indent-blankline.nvim/
       leap-nvim                       # https://github.com/ggandor/leap.nvim/ 
@@ -40,20 +40,20 @@
       noice-nvim                      # https://github.com/folke/noice.nvim/
       numb-nvim                       # https://github.com/nacro90/numb.nvim/
       nvim-cmp                        # https://github.com/hrsh7th/nvim-cmp
-      nvim-colorizer-lua              #   
+      nvim-colorizer-lua              # 
       nvim-dap                        # 
       nvim-dap-ui                     # 
       nvim-lspconfig                  # 
       nvim-navic                      # 
       nvim-notify                     # 
-      nvim-treesitter-textobjects     #            
-      nvim-treesitter.withAllGrammars #                
-      nvim-web-devicons               #  
+      nvim-treesitter-textobjects     # 
+      nvim-treesitter.withAllGrammars # 
+      nvim-web-devicons               # 
       nvim_context_vt                 # 
       playground                      # 
       refactoring-nvim                # 
       ron-vim                         # 
-      telescope-fzf-native-nvim       #          
+      telescope-fzf-native-nvim       # 
       telescope-nvim                  # 
       trouble-nvim                    # 
       vim-fugitive                    # https://github.com/tpope/vim-fugitive 
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 7192c0f2..9a28759e 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -13,5 +13,5 @@
   ]
   ++ lib.optional (builtins.isString desktop) ./common/software/gui/firefox.nix 
   ++ lib.optional (builtins.isString desktop) ./common/software/gui/thunderbird.nix 
-  ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop};
+  ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop}; # Machine-specific desktop configs
 }
\ No newline at end of file
diff --git a/home-manager/users/albert/default.nix b/home-manager/users/albert/default.nix
index dbb5b4f9..aa30c16d 100644
--- a/home-manager/users/albert/default.nix
+++ b/home-manager/users/albert/default.nix
@@ -1,6 +1,4 @@
 { config, pkgs, hostname, hmStateVersion, ... }: {
-  home.stateVersion = hmStateVersion;
-
   programs.git = {
     userName  = "albert";
     userEmail = "albert@sysctl.io";
diff --git a/home-manager/users/root/default.nix b/home-manager/users/root/default.nix
index 9e44813d..9e2b9294 100644
--- a/home-manager/users/root/default.nix
+++ b/home-manager/users/root/default.nix
@@ -1,6 +1,4 @@
 { config, pkgs, hostname, hmStateVersion, ... }: {
-  home.stateVersion = hmStateVersion;
-
   programs.git = {
     userName  = "albert";
     userEmail = "albert@sysctl.io";
diff --git a/nixos/default.nix b/nixos/default.nix
index f9d06e48..d2845d5e 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -33,8 +33,8 @@
     du-dust
     home-manager
     btop
-    iftop 
-    nload 
+    iftop
+    nload
     iotop
   ];