Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-apply nixfmt formatting #362

Merged
merged 2 commits into from
Aug 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Some lines stopped being formatted with nixfmt somehow
62a605b7c5ce7f9334dd946ef3de8fedfb4cdfaa
4 changes: 1 addition & 3 deletions home-config/config/applications/tty/emacs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ in
libnotify
sqlite.dev
])
++ [
nixd
];
++ [ nixd ];

xdg.configFile."emacs" = {
source = "${self}/home-config/dotfiles/emacs.d/";
Expand Down
12 changes: 8 additions & 4 deletions nixos-config/hosts/yui/nvidia/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{ pkgs, flake-inputs, config, lib, ... }:
{
pkgs,
flake-inputs,
config,
lib,
...
}:
{
imports = [ ./vaapi.nix ];

Expand Down Expand Up @@ -34,9 +40,7 @@
};

boot = {
kernelParams = [
"nvidia-drm.fbdev=1"
];
kernelParams = [ "nvidia-drm.fbdev=1" ];

extraModprobeConfig =
"options nvidia "
Expand Down
16 changes: 10 additions & 6 deletions pkgs/applications/emacs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions pkgs/applications/emacs/eglot-x.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{ sources, trivialBuild }:
trivialBuild {
inherit (sources.eglot-x) pname version src;
}
{ sources, trivialBuild }: trivialBuild { inherit (sources.eglot-x) pname version src; }