diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..39c38de2 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Some lines stopped being formatted with nixfmt somehow +62a605b7c5ce7f9334dd946ef3de8fedfb4cdfaa diff --git a/home-config/config/applications/tty/emacs.nix b/home-config/config/applications/tty/emacs.nix index 9bf1eab2..ba5ccbbe 100644 --- a/home-config/config/applications/tty/emacs.nix +++ b/home-config/config/applications/tty/emacs.nix @@ -39,9 +39,7 @@ in libnotify sqlite.dev ]) - ++ [ - nixd - ]; + ++ [ nixd ]; xdg.configFile."emacs" = { source = "${self}/home-config/dotfiles/emacs.d/"; diff --git a/nixos-config/hosts/yui/nvidia/default.nix b/nixos-config/hosts/yui/nvidia/default.nix index dc40c879..19c5a987 100644 --- a/nixos-config/hosts/yui/nvidia/default.nix +++ b/nixos-config/hosts/yui/nvidia/default.nix @@ -1,4 +1,10 @@ -{ pkgs, flake-inputs, config, lib, ... }: +{ + pkgs, + flake-inputs, + config, + lib, + ... +}: { imports = [ ./vaapi.nix ]; @@ -34,9 +40,7 @@ }; boot = { - kernelParams = [ - "nvidia-drm.fbdev=1" - ]; + kernelParams = [ "nvidia-drm.fbdev=1" ]; extraModprobeConfig = "options nvidia " diff --git a/pkgs/applications/emacs/default.nix b/pkgs/applications/emacs/default.nix index a216f108..ddb3c485 100644 --- a/pkgs/applications/emacs/default.nix +++ b/pkgs/applications/emacs/default.nix @@ -26,12 +26,16 @@ let required-packages = builtins.fromJSON (builtins.readFile package-list) ++ [ "leaf" ]; custom-emacs = emacsPkgs.emacs.pkgs.withPackages ( - epkgs: (map (package: builtins.getAttr package epkgs) required-packages) ++ [ - (epkgs.treesit-grammars.with-grammars (grammars: with grammars; [ - tree-sitter-bash - tree-sitter-typescript - tree-sitter-tsx - ])) + epkgs: + (map (package: builtins.getAttr package epkgs) required-packages) + ++ [ + (epkgs.treesit-grammars.with-grammars ( + grammars: with grammars; [ + tree-sitter-bash + tree-sitter-typescript + tree-sitter-tsx + ] + )) ] ); in diff --git a/pkgs/applications/emacs/eglot-x.nix b/pkgs/applications/emacs/eglot-x.nix index d9e24f76..c2ae79d6 100644 --- a/pkgs/applications/emacs/eglot-x.nix +++ b/pkgs/applications/emacs/eglot-x.nix @@ -1,4 +1 @@ -{ sources, trivialBuild }: -trivialBuild { - inherit (sources.eglot-x) pname version src; -} +{ sources, trivialBuild }: trivialBuild { inherit (sources.eglot-x) pname version src; }