diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..ca08f81 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,4 @@ +root = true + +[*.nix] +indent_size = 2 diff --git a/configuration.nix b/configuration.nix index deae75d..28603a7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,3 +1,5 @@ +# vim:tabstop=2:shiftwidth=2 + # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). @@ -170,14 +172,14 @@ global = { gpgsign = true; }; user = { name = "June Clementine Strawberry"; - email = "strawberry@puppygock.gay"; - signingkey = "~/.ssh/id_ed25519"; + email = "strawberry@puppygock.gay"; + signingkey = "~/.ssh/id_ed25519"; }; core = { compression = 9; }; alias = { # i use this for conduwuit so i can push to all my mirrors easily pushall = "!git remote | grep -E 'origin' | xargs -L1 -P 0 git push"; - fetchall = "!git remote | grep -E 'origin' | xargs -L1 -P 0 git fetch"; + fetchall = "!git remote | grep -E 'origin' | xargs -L1 -P 0 git fetch"; }; # no meme gpg pls @@ -224,7 +226,7 @@ "https://cache.nixos.org/" ]; trusted-public-keys = [ - "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE=" "conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" diff --git a/flake.nix b/flake.nix index 815a952..75dfbe8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,3 +1,5 @@ +# vim:tabstop=2:shiftwidth=2 + { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index ac180d4..abe1e06 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,3 +1,5 @@ +# vim:tabstop=2:shiftwidth=2 + # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. @@ -28,23 +30,23 @@ fsType = "ext4"; options = [ # asynchronously flushes commit blocks to disk without waiting for descriptor block to be written. - # improves i/o perf - # - # must use data=writeback or data=journal - # - # this will prevent this drive being mounted on ancient kernels. - "journal_async_commit" - # highest safety guarantees, and theoretically higher throughput - "data=writeback" - # im on a laptop so 5 -> 15 second commit is fine - "commit=15" - # forcefully fsync()'s file replacements if not done by the bad application - "auto_da_alloc" - # 64-bit inode version support - "i_version" - # journal checksumming for e2fsck recovery support - # internally enabled if using journal_async_commit - "journal_checksum" + # improves i/o perf + # + # must use data=writeback or data=journal + # + # this will prevent this drive being mounted on ancient kernels. + "journal_async_commit" + # highest safety guarantees, and theoretically higher throughput + "data=writeback" + # im on a laptop so 5 -> 15 second commit is fine + "commit=15" + # forcefully fsync()'s file replacements if not done by the bad application + "auto_da_alloc" + # 64-bit inode version support + "i_version" + # journal checksumming for e2fsck recovery support + # internally enabled if using journal_async_commit + "journal_checksum" ]; }; @@ -54,28 +56,28 @@ options = [ # bind mount because this is under / already "bind" - # /nix/store is I/O heavy and doesn't need access times - "noatime" - # nix default - "ro" + # /nix/store is I/O heavy and doesn't need access times + "noatime" + # nix default + "ro" # asynchronously flushes commit blocks to disk without waiting for descriptor block to be written. - # improves i/o perf - # - # must use data=writeback or data=journal - # - # this will prevent this drive being mounted on ancient kernels. - "journal_async_commit" - # highest safety guarantees, and theoretically higher throughput - "data=writeback" - # im on a laptop so 5 -> 15 second commit is fine - "commit=15" - # forcefully fsync()'s file replacements if not done by the bad application - "auto_da_alloc" - # 64-bit inode version support - "i_version" - # journal checksumming for e2fsck recovery support - # internally enabled if using journal_async_commit - "journal_checksum" + # improves i/o perf + # + # must use data=writeback or data=journal + # + # this will prevent this drive being mounted on ancient kernels. + "journal_async_commit" + # highest safety guarantees, and theoretically higher throughput + "data=writeback" + # im on a laptop so 5 -> 15 second commit is fine + "commit=15" + # forcefully fsync()'s file replacements if not done by the bad application + "auto_da_alloc" + # 64-bit inode version support + "i_version" + # journal checksumming for e2fsck recovery support + # internally enabled if using journal_async_commit + "journal_checksum" ]; }; @@ -102,16 +104,16 @@ options = [ # /boot doesn't need any of this "noexec" - "nosuid" - "nodev" + "nosuid" + "nodev" # /boot doesnt need access times - "noatime" + "noatime" # /boot is just used by root - "umask=0077" - "fmask=0077" - "dmask=0077" + "umask=0077" + "fmask=0077" + "dmask=0077" ]; };