From 150fd4d6c0c437ba7a745afbde97f51e9eb39065 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Fri, 6 Feb 2026 00:43:37 +0100 Subject: [PATCH] Changed: minor stuff; Added: Optimisation of nix --- darwin/default.nix | 20 ++++++++++++++++++- darwin/homebrew.nix | 6 +----- home/fastfetch.jsonc | 9 ++------- home/neovim/alpha.nix | 2 +- home/neovim/default.nix | 2 +- home/neovim/jupytext.nix | 18 ----------------- home/neovim/molten.nix | 43 ++++++++++++++++++++++++++++++++++++++++ home/onlyoffice.nix | 1 + 8 files changed, 68 insertions(+), 33 deletions(-) delete mode 100644 home/neovim/jupytext.nix create mode 100644 home/neovim/molten.nix create mode 100644 home/onlyoffice.nix diff --git a/darwin/default.nix b/darwin/default.nix index f9195c4..e2f6f1a 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -11,10 +11,27 @@ nix = { settings = { experimental-features = [ "nix-command" "flakes" ]; + max-jobs = "auto"; # Use all CPU cores + cores = 0; # Use all cores per build # disabled due to https://github.com/NixOS/nix/issues/7273 # auto-optimise-store = true; }; - enable = false; # using determinate installer + enable = true; # using determinate installer + + # Garbage collection + gc = { + automatic = true; + interval = { Weekday = 7; }; # Run weekly + options = "--delete-older-than 30d"; + }; + }; + + # Disable Docs + documentation = { + enable = true; + doc.enable = false; # Skip large documentation + man.enable = true; # Keep man pages + info.enable = false; # Skip info pages }; nixpkgs.config = { allowUnfree = true; }; @@ -35,6 +52,7 @@ # macOS-specific settings programs.fish.enable = true; + environment.shells = [ pkgs.fish ]; system.primaryUser = primaryUser; users.users.${primaryUser} = { home = "/Users/${primaryUser}"; diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix index e593081..f9724d0 100644 --- a/darwin/homebrew.nix +++ b/darwin/homebrew.nix @@ -13,11 +13,7 @@ # homebrew is best for GUI apps # nixpkgs is best for CLI tools - casks = [ - "element" - "affinity" - - ]; + casks = [ "element" "affinity" "onlyoffice" ]; brews = [ ]; taps = [ ]; }; diff --git a/home/fastfetch.jsonc b/home/fastfetch.jsonc index 25ef9ad..052e1d9 100644 --- a/home/fastfetch.jsonc +++ b/home/fastfetch.jsonc @@ -3,8 +3,8 @@ "logo": { "type": "kitty-icat", "source": "~/Pictures/Avatar/avatar_no_bg.png", - //"height": 15, - "width": 40, + // "height": 15, + "width": 36, "padding": { "top": 0, "left": 0 @@ -31,11 +31,6 @@ "key": "│ ├󰍛", "keyColor": "green" }, - { - "type": "memory", - "key": "│ ├󰍛", - "keyColor": "green" - }, { "type": "disk", "key": "│ ├", diff --git a/home/neovim/alpha.nix b/home/neovim/alpha.nix index 325dd23..52357f4 100644 --- a/home/neovim/alpha.nix +++ b/home/neovim/alpha.nix @@ -106,7 +106,7 @@ #on_press.__raw = "function() require('yazi').yazi() end"; opts = { keymap = [ "n" "a" ":AvanteChatNew" { } ]; - shortcut = "y"; + shortcut = "a"; position = "center"; cursor = 3; width = 50; diff --git a/home/neovim/default.nix b/home/neovim/default.nix index 2cc369b..65b492d 100644 --- a/home/neovim/default.nix +++ b/home/neovim/default.nix @@ -12,7 +12,7 @@ ./alpha.nix ./avante.nix ./openscad.nix - ./jupytext.nix + ./molten.nix ./live-server.nix ./which-key.nix ]; diff --git a/home/neovim/jupytext.nix b/home/neovim/jupytext.nix deleted file mode 100644 index 048ebfc..0000000 --- a/home/neovim/jupytext.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ... }: { - # Jupytext: Execute Jupyter notebooks directly in Neovim - programs.nixvim.jupytext = { - enable = true; - settings = { - custom_language_formatting = { - python = { - extension = "md"; - force_ft = "markdown"; - style = "markdown"; - }; - }; - force_ft = null; - output_extension = "auto"; - style = "light"; - }; - }; -} diff --git a/home/neovim/molten.nix b/home/neovim/molten.nix new file mode 100644 index 0000000..6b816ff --- /dev/null +++ b/home/neovim/molten.nix @@ -0,0 +1,43 @@ +{ pkgs, ... }: { + programs.nixvim = { + plugins.molten = { + enable = true; + python3Dependencies = p: + with p; [ + pynvim + jupyter-client + cairosvg + ipython + nbformat + ipykernel + pnglatex + plotly + kaleido + pyperclip + ]; + settings = { + kernel_name = "python3"; + auto_open_output = true; + output_win_max_width = 80; + output_win_max_height = 20; + }; + }; + + keymaps = [ + { + mode = "n"; + key = "ml"; + action = "MoltenEvaluateLine"; + options.desc = "Molten: Evaluate line"; + options.silent = true; + } + { + mode = "v"; + key = "mv"; + action = "MoltenEvaluateVisual"; + options.desc = "Molten: Evaluate selection"; + options.silent = true; + } + ]; + }; +} diff --git a/home/onlyoffice.nix b/home/onlyoffice.nix new file mode 100644 index 0000000..94d72fd --- /dev/null +++ b/home/onlyoffice.nix @@ -0,0 +1 @@ +_: { programs.onlyoffice.enable = true; }