starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-07-10 22:52:41 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

chore: nix fmt

Browse Source
This commit is contained in:
Ryan Yin
2023-12-23 21:39:51 +08:00
parent e61116140d
commit 7dd55a5de9
7 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
home/linux/desktop/base/misc.nix
+1 -5
View File
@@ -1,8 +1,4 @@
{ {pkgs, ...}: {
pkgs,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# GUI apps # GUI apps
# e-book viewer(.epub/.mobi/...) # e-book viewer(.epub/.mobi/...)
modules/darwin/nix-core.nix
+7 -8
View File
@@ -11,20 +11,19 @@
# Fix: https://github.com/LnL7/nix-darwin/issues/149#issuecomment-1741720259 # Fix: https://github.com/LnL7/nix-darwin/issues/149#issuecomment-1741720259
# nix is installed via DeterminateSystems's nix-installer. # nix is installed via DeterminateSystems's nix-installer.
environment.etc."zshrc".knownSha256Hashes = [ environment.etc."zshrc".knownSha256Hashes = [
"b9902f2020c636aeda956a74b5ae11882d53e206d1aa50b3abe591a8144fa710" # nix-installer on harmonica "b9902f2020c636aeda956a74b5ae11882d53e206d1aa50b3abe591a8144fa710" # nix-installer on harmonica
]; ];
environment.etc."bashrc".knownSha256Hashes = [ environment.etc."bashrc".knownSha256Hashes = [
"53ab77cddb5c9aa2954efe42e9af0b8a2829f94dd31b6c33f8082ed194dcc0cb" # nix-installer on harmonica "53ab77cddb5c9aa2954efe42e9af0b8a2829f94dd31b6c33f8082ed194dcc0cb" # nix-installer on harmonica
"6ffdf5a198ffe73fbcd17def767f52093b42b29149d4a3e911b49ebcb9785101" # nix-installer on fern "6ffdf5a198ffe73fbcd17def767f52093b42b29149d4a3e911b49ebcb9785101" # nix-installer on fern
]; ];
environment.etc."zshenv".knownSha256Hashes = [ environment.etc."zshenv".knownSha256Hashes = [
"bb96fe80a72ea9cd3291f09e4dc13a64e7db3b401f5889e43edc1fe34ed02d2c" # nix-installer on harmonica "bb96fe80a72ea9cd3291f09e4dc13a64e7db3b401f5889e43edc1fe34ed02d2c" # nix-installer on harmonica
"0c544e42afe7836de9ba933d93f46043b12f58ae484ff8cfb02716353f1dba5f" # nix-installer on fern "0c544e42afe7836de9ba933d93f46043b12f58ae484ff8cfb02716353f1dba5f" # nix-installer on fern
]; ];
environment.etc."shells".knownSha256Hashes = [ environment.etc."shells".knownSha256Hashes = [
"9d5aa72f807091b481820d12e693093293ba33c73854909ad7b0fb192c2db193" # nix-installer on fern "9d5aa72f807091b481820d12e693093293ba33c73854909ad7b0fb192c2db193" # nix-installer on fern
]; ];
# Allow unfree packages # Allow unfree packages
modules/nixos/base/misc.nix
+6 -7
View File
@@ -2,8 +2,7 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: {
{
################################################################################### ###################################################################################
# #
# NixOS's core configuration suitable for all my machines # NixOS's core configuration suitable for all my machines
@@ -28,20 +27,20 @@
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
# Enable in-memory compressed devices and swap space provided by the zram kernel module. # Enable in-memory compressed devices and swap space provided by the zram kernel module.
# By enable this, we can store more data in memory instead of fallback to disk-based swap devices directly, # By enable this, we can store more data in memory instead of fallback to disk-based swap devices directly,
# and thus improve I/O performance when we have a lot of memory. # and thus improve I/O performance when we have a lot of memory.
# #
# https://www.kernel.org/doc/Documentation/blockdev/zram.txt # https://www.kernel.org/doc/Documentation/blockdev/zram.txt
zramSwap = { zramSwap = {
enable = true; enable = true;
# one of "lzo", "lz4", "zstd" # one of "lzo", "lz4", "zstd"
algorithm = "zstd"; algorithm = "zstd";
# Priority of the zram swap devices. # Priority of the zram swap devices.
# It should be a number higher than the priority of your disk-based swap devices # It should be a number higher than the priority of your disk-based swap devices
# (so that the system will fill the zram swap devices before falling back to disk swap). # (so that the system will fill the zram swap devices before falling back to disk swap).
priority = 5; priority = 5;
# Maximum total amount of memory that can be stored in the zram swap devices (as a percentage of your total memory). # Maximum total amount of memory that can be stored in the zram swap devices (as a percentage of your total memory).
# Defaults to 1/2 of your total RAM. Run zramctl to check how good memory is compressed. # Defaults to 1/2 of your total RAM. Run zramctl to check how good memory is compressed.
# This doesn’t define how much memory will be used by the zram swap devices. # This doesn’t define how much memory will be used by the zram swap devices.
memoryPercent = 50; memoryPercent = 50;
}; };
modules/nixos/base/networking.nix
-2
View File
@@ -14,6 +14,4 @@
}; };
openFirewall = true; openFirewall = true;
}; };
} }
modules/nixos/base/user-group.nix
+5 -1
View File
@@ -1,4 +1,8 @@
{username, config, ...}: { {
username,
config,
...
}: {
# Don't allow mutation of users outside the config. # Don't allow mutation of users outside the config.
users.mutableUsers = false; users.mutableUsers = false;
modules/nixos/desktop/security.nix
+1 -2
View File
@@ -1,5 +1,4 @@
{ config, ...}: {config, ...}: {
{
nix.extraOptions = '' nix.extraOptions = ''
!include ${config.age.secrets.nix-access-tokens.path} !include ${config.age.secrets.nix-access-tokens.path}
''; '';
systems/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@
constants, constants,
}: let }: let
inherit (inputs.nixpkgs) lib; inherit (inputs.nixpkgs) lib;
mylib = import ../lib { inherit lib; }; mylib = import ../lib {inherit lib;};
vars = import ./vars.nix; vars = import ./vars.nix;
specialArgsForSystem = system: specialArgsForSystem = system: