Skip to content

Commit

Permalink
Merge branch 'master' into keymapper-module
Browse files Browse the repository at this point in the history
  • Loading branch information
@spitulax
spitulax authored Oct 27, 2024
2 parents 99b8d5e + 4b192e6 commit cd69bad
Show file tree
Hide file tree
Showing 20,451 changed files with 1,070,095 additions and 557,381 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ indent_size = 4
indent_size = 2
indent_style = space

# Match package.json, which are generally pulled from upstream and accept them as they are
[package.json]
indent_style = unset

# Disable file types or individual files
# some of these files may be auto-generated and/or require significant changes

Expand Down
1 change: 0 additions & 1 deletion .envrc
View file

This file was deleted.

42 changes: 42 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
# fix indentation in meteor default.nix
a37a6de881ec4c6708e6b88fd16256bbc7f26bbd

# pkgs/stdenv/make-derivation: Reindent
b4cc2a2479a7ab0f6440b2e1319221920ef72699

# treewide: automatically md-convert option descriptions
2e751c0772b9d48ff6923569adfa661b030ab6a2

Expand Down Expand Up @@ -150,3 +153,42 @@ ff5c8f6cc3d1f2e017e86d50965c14b71f00567b

# ollama: format with nixfmt-rfc-style (#329353)
bdfde18037f8d9f9b641a4016c8ada4dc4cbf856

# nixos/ollama: format with nixfmt-rfc-style (#329561)
246d1ee533810ac1946d863bbd9de9b525818d56

# steam: cleanup (#216972)
ad815aebfbfe1415ff6436521d545029c803c3fb

# nixos/nvidia: apply nixfmt-rfc-style (#313440)
fbdcdde04a7caa007e825a8b822c75fab9adb2d6

# treewide: reformat files which need reformatting after (#341407)
e0464e47880a69896f0fb1810f00e0de469f770a

# step-cli: format package.nix with nixfmt (#331629)
fc7a83f8b62e90de5679e993d4d49ca014ea013d

# ndn-cxx: format with nixfmt-rfc-style
160b2b769c3b8a6d1ae9947afa77520fa2887db7

# ndn-tools: format with nixfmt-rfc-style
4882ef721ce3d7bb3b5e48ff80125255db515013

# nfd: format with nixfmt-rfc-style
548c2377fa81e2abfc192fbf4f521e601251c468

# darwin.stdenv: format with nixfmt-rfc-style (#333962)
93c10ac9e561c6594d3baaeaff2341907390d9b8

# nrr: format with nixfmt-rfc-style (#334578)
cffc27daf06c77c0d76bc35d24b929cb9d68c3c9

# nixos/kanidm: inherit lib, nixfmt
8f18393d380079904d072007fb19dc64baef0a3a

# fetchurl: nixfmt-rfc-style
ce21e97a1f20dee15da85c084f9d1148d84f853b

# percona: apply nixfmt
8d14fa2886fec877690c6d28cfcdba4503dbbcea
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ nixos/doc/default.nix linguist-documentation=false

nixos/modules/module-list.nix merge=union
# pkgs/top-level/all-packages.nix merge=union

ci/OWNERS linguist-language=CODEOWNERS
Loading

0 comments on commit cd69bad

Please sign in to comment.