Merge branch 'master' of github.com:/kropatz/nix-config

This commit is contained in:
Kopatz
2025-12-08 15:33:15 +01:00
3 changed files with 7 additions and 2 deletions

View File

@@ -54,7 +54,10 @@ in
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
}; };
home.packages = with pkgs; [ nixfmt-rfc-style ]; # nixd config option to set nixpkgs-fmt should work, but it doesn't home.packages = with pkgs; [
nixfmt-rfc-style
plantuml
]; # nixd config option to set nixpkgs-fmt should work, but it doesn't
programs.nixvim = merged; programs.nixvim = merged;
xdg.desktopEntries = { xdg.desktopEntries = {
neovim = { neovim = {

View File

@@ -2,6 +2,7 @@
{ {
plugins = { plugins = {
image.enable = true; image.enable = true;
diagram.enable = true;
clipboard-image = { clipboard-image = {
# todo change based on graphical settings # todo change based on graphical settings
clipboardPackage = pkgs.wl-clipboard; clipboardPackage = pkgs.wl-clipboard;

View File

@@ -3,7 +3,8 @@
environment.etc."current-system-packages".text = environment.etc."current-system-packages".text =
let let
packages = builtins.map (p: "${p.name}") config.environment.systemPackages; packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique packages); homePackages = builtins.map (p: "${p.name}") config.home-manager.users.${config.mainUser.name}.home.packages;
sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique (packages ++ homePackages));
formatted = builtins.concatStringsSep "\n" sortedUnique; formatted = builtins.concatStringsSep "\n" sortedUnique;
in in
formatted; formatted;