remove ff sponsored

README.md

@@ -64,44 +64,3 @@ rsync -av --exclude='.git' . root@HOST:/etc/nixos
 ```bash
 sudo nixos-rebuild switch
 ```
-
-# Nix Home Manager Configuration - macOS
-
-## Upgrade
-
-```bash
-# Update System Channels
-sudo nix-channel --add https://nixos.org/channels/nixpkgs-24.11-darwin nixpkgs
-sudo nix-channel --update
-
-# Update Home Manager
-nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager
-nix-channel --update
-
-# Link Repo
-ln -s /Users/evanreichard/Development/git/personal/nix/home-manager ~/.config/home-manager
-
-# Build Home Manager
-home-manager switch
-```
-
-## Clean Garbage
-
-NOTE: This will remove previous generations
-
-```bash
-sudo nix-collect-garbage --delete-old
-nix-collect-garbage --delete-old
-```
-
-## OS Update
-
-`/etc/bashrc` may get overridden. To properly load Nix, prepend the following:
-
-```bash
-# Nix
-if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
-  . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
-fi
-# End Nix
-```

homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix

@@ -43,7 +43,7 @@ in
     android-tools
     imagemagick
     mosh
-    python312
+    python311
     texliveSmall # Pandoc PDF Dep
     google-cloud-sdk
     tldr

homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix

@@ -26,7 +26,6 @@ in
       graphical = {
         wms.hyprland = enabled;
         ghostty = enabled;
-        gimp = enabled;
         ghidra = enabled;
         browsers.firefox = {
           enable = true;
@@ -45,9 +44,9 @@ in
     };
   };
 
-  home.packages = with pkgs; [
+  # home.packages = with pkgs; [
-    jellyfin-media-player
+  #   catppuccin-gtk
-  ];
+  # ];
 
   dconf = {
     settings = {

modules/home/programs/graphical/gimp/default.nix

@@ -1,17 +0,0 @@
-{ pkgs, lib, config, namespace, ... }:
-let
-  inherit (lib) mkIf mkEnableOption;
-
-  cfg = config.${namespace}.programs.graphical.gimp;
-in
-{
-  options.${namespace}.programs.graphical.gimp = {
-    enable = mkEnableOption "GIMP";
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      gimp-with-plugins
-    ];
-  };
-}

modules/home/programs/graphical/wms/hyprland/default.nix

@@ -39,8 +39,8 @@ in
           "$mainMod, Q, killactive"
           "$mainMod, M, exit"
           "$mainMod, V, togglefloating"
-          "$mainMod, P, pin"
+          "$mainMod, P, pseudo" # dwindle
-          "$mainMod, J, togglesplit"
+          "$mainMod, J, togglesplit" # dwindle
           "$mainMod, S, togglespecialworkspace, magic"
           "$mainMod SHIFT, S, movetoworkspace, special:magic"
 

modules/home/programs/terminal/nvim/config/lua/base.lua

@@ -20,7 +20,7 @@ vim.g.loaded_netrwPlugin = 1
 vim.opt.termguicolors = true
 
 -- Synchronize with system clipboard
-vim.opt.clipboard:append("unnamedplus")
+vim.opt.clipboard = "unnamed"
 
 -- Always show the signcolumn
 vim.opt.signcolumn = "yes"

modules/home/programs/terminal/nvim/config/lua/lsp-config.lua

@@ -80,7 +80,6 @@ nvim_lsp.pyright.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 	capabilities = capabilities,
-	filetypes = { "starlark", "python" },
 })
 
 -- HTML LSP Configuration
@@ -184,9 +183,9 @@ nvim_lsp.golangci_lint_ls.setup({
 })
 
 ------------------------------------------------------
---------------------- None-LS LSP --------------------
+--------------------- Null-LS LSP --------------------
 ------------------------------------------------------
-local none_ls = require("null-ls")
+local null_ls = require("null-ls")
 
 local eslintFiles = {
 	".eslintrc",
@@ -203,27 +202,26 @@ local eslintFiles = {
 	"eslint.config.cts",
 }
 
-local has_eslint_in_parents = function(fname)
+has_eslint_in_parents = function(fname)
-	local root_file = nvim_lsp.util.insert_package_json(eslintFiles, "eslintConfig", fname)
+	root_file = nvim_lsp.util.insert_package_json(eslintFiles, "eslintConfig", fname)
 	return nvim_lsp.util.root_pattern(unpack(root_file))(fname)
 end
 
-none_ls.setup({
+null_ls.setup({
 	sources = {
 		-- Prettier Formatting
-		none_ls.builtins.formatting.prettier,
+		null_ls.builtins.formatting.prettier,
-		none_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }),
+		null_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }),
 		require("none-ls.diagnostics.eslint_d").with({
 			condition = function(utils)
 				return has_eslint_in_parents(vim.fn.getcwd())
 			end,
 		}),
-		none_ls.builtins.completion.spell,
+		null_ls.builtins.completion.spell,
-		none_ls.builtins.formatting.nixpkgs_fmt,
+		null_ls.builtins.formatting.nixpkgs_fmt,
-		none_ls.builtins.formatting.stylua,
+		null_ls.builtins.formatting.stylua,
-		none_ls.builtins.diagnostics.sqlfluff,
+		null_ls.builtins.diagnostics.sqlfluff,
-		none_ls.builtins.formatting.sqlfluff,
+		null_ls.builtins.formatting.sqlfluff,
-		require("none-ls.formatting.autopep8").with({ filetypes = { "starlark", "python" } }),
 	},
 	on_attach = function(client, bufnr)
 		if client.supports_method("textDocument/formatting") then

modules/home/programs/terminal/nvim/config/lua/telescope-config.lua

@@ -1,22 +1,20 @@
-require("telescope").setup({
+require('telescope').setup {
-	extensions = {
+    extensions = {
-		fzf = {
+        fzf = {
-			fuzzy = true,
+            fuzzy = true,
-			override_generic_sorter = true,
+            override_generic_sorter = true,
-			override_file_sorter = true,
+            override_file_sorter = true,
-			case_mode = "smart_case",
+            case_mode = "smart_case"
-		},
+        }
-	},
+    }
-})
+}
 
-require("telescope").load_extension("fzf")
+require('telescope').load_extension('fzf')
 require("telescope").load_extension("ui-select")
-require("telescope").load_extension("undo")
 
-local builtin = require("telescope.builtin")
+local builtin = require('telescope.builtin')
-vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
-vim.keymap.set("n", "<leader>fj", builtin.jumplist, {})
+vim.keymap.set('n', '<leader>fj', builtin.jumplist, {})
-vim.keymap.set("n", "<leader>fu", "<cmd>Telescope undo<cr>")

modules/home/programs/terminal/nvim/default.nix

@@ -47,7 +47,6 @@ in
         telescope-fzf-native-nvim # Faster Telescope
         telescope-nvim # Fuzzy Finder
         telescope-ui-select-nvim # UI
-        telescope-undo-nvim # Undo Tree
         toggleterm-nvim # Terminal Helper
         vim-nix # Nix Helpers
         which-key-nvim # Shortcut Helper
@@ -82,12 +81,12 @@ in
         (
           pkgs.vimUtils.buildVimPlugin {
             pname = "none-ls-extras.nvim";
-            version = "2025-05-01";
+            version = "2024-06-11";
             src = pkgs.fetchFromGitHub {
               owner = "nvimtools";
               repo = "none-ls-extras.nvim";
-              rev = "80dfc30b674c45ad892726f656440cc9e69b82e3";
+              rev = "336e84b9e43c0effb735b08798ffac382920053b";
-              sha256 = "sha256-VwI3jIqSYkhMS1S1sVZbyGb9mXliBoFytkFXkks4PD0=";
+              sha256 = "sha256-UtU4oWSRTKdEoMz3w8Pk95sROuo3LEwxSDAm169wxwk=";
             };
             meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/";
           }
@@ -166,7 +165,6 @@ in
         nodePackages.vscode-langservers-extracted
         pyright
         eslint_d
-        python312Packages.autopep8
 
         # Formatters
         luaformatter

modules/nixos/programs/graphical/wms/hyprland/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, namespace, ... }:
+{ config, lib, namespace, ... }:
 let
   inherit (lib) mkIf;
 
@@ -17,10 +17,6 @@ in
       };
     };
 
-    environment.systemPackages = with pkgs; [
-      wl-clipboard
-    ];
-
     reichard = {
       display-managers = {
         sddm = {