chore: format code

This commit is contained in:
Ryan Yin
2024-01-02 17:15:55 +08:00
parent 4a76601970
commit 18ac49f165
16 changed files with 29 additions and 27 deletions

View File

@@ -4,7 +4,6 @@
home = { home = {
inherit username; inherit username;
# This value determines the Home Manager release that your # This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage # configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards # when a new Home Manager release introduces backwards

View File

@@ -4,7 +4,7 @@
# general tools # general tools
pulumi pulumi
pulumictl pulumictl
packer # machine image builder packer # machine image builder
# aws # aws
awscli2 awscli2

View File

@@ -30,11 +30,10 @@
}; };
# consistent with wezterm # consistent with wezterm
keybindings = keybindings = {
{ "ctrl+shift+m" = "toggle_maximized";
"ctrl+shift+m" = "toggle_maximized"; "ctrl+shift+f" = "show_scrollback"; # search in the current window
"ctrl+shift+f" = "show_scrollback"; # search in the current window };
};
settings = { settings = {
background_opacity = "0.93"; background_opacity = "0.93";

View File

@@ -23,7 +23,7 @@
gnugrep # GNU grep, provides `grep`/`egrep`/`fgrep` gnugrep # GNU grep, provides `grep`/`egrep`/`fgrep`
gnused # GNU sed, very powerful(mainly for replacing text in files) gnused # GNU sed, very powerful(mainly for replacing text in files)
gnumake gnumake
just # a command runner like make, but simpler just # a command runner like make, but simpler
gawk # GNU awk, a pattern scanning and processing language gawk # GNU awk, a pattern scanning and processing language
sad # CLI search and replace, with diff preview, really useful!!! sad # CLI search and replace, with diff preview, really useful!!!
delta # A viewer for git and diff output delta # A viewer for git and diff output

View File

@@ -1,10 +1,12 @@
{
{config, username, ...}: let config,
username,
...
}: let
d = config.xdg.dataHome; d = config.xdg.dataHome;
c = config.xdg.configHome; c = config.xdg.configHome;
cache = config.xdg.cacheHome; cache = config.xdg.cacheHome;
in rec { in rec {
home.homeDirectory = "/home/${username}"; home.homeDirectory = "/home/${username}";
# environment variables that always set at login # environment variables that always set at login

View File

@@ -1,4 +1,8 @@
{pkgs, pkgs-unstable, ...}: { {
pkgs,
pkgs-unstable,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# GUI apps # GUI apps
# e-book viewer(.epub/.mobi/...) # e-book viewer(.epub/.mobi/...)

View File

@@ -13,7 +13,7 @@
]; ];
hardware.firmware = [ hardware.firmware = [
(import ./brcm-firmware { inherit pkgs;}) (import ./brcm-firmware {inherit pkgs;})
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod"];

View File

@@ -1,7 +1,4 @@
{ {nixos-rk3588, ...}:
nixos-rk3588,
...
}:
############################################################# #############################################################
# #
# Aquamarine - A NixOS VM running on Proxmox # Aquamarine - A NixOS VM running on Proxmox

View File

@@ -95,7 +95,7 @@
# doom-emacs # doom-emacs
".config/emacs" ".config/emacs"
"org" # org files "org" # org files
# browsers # browsers
".mozilla" ".mozilla"

View File

@@ -10,7 +10,7 @@
(lib.attrsets.filterAttrs (lib.attrsets.filterAttrs
( (
path: _type: path: _type:
(_type == "directory") # include directories (_type == "directory") # include directories
|| ( || (
(path != "default.nix") # ignore default.nix (path != "default.nix") # ignore default.nix
&& (lib.strings.hasSuffix ".nix" path) # include .nix files && (lib.strings.hasSuffix ".nix" path) # include .nix files

View File

@@ -1,4 +1,8 @@
{lib, nixpkgs, ...}: { {
lib,
nixpkgs,
...
}: {
# make `nix run nixpkgs#nixpkgs` use the same nixpkgs as the one used by this flake. # make `nix run nixpkgs#nixpkgs` use the same nixpkgs as the one used by this flake.
nix.registry.nixpkgs.flake = nixpkgs; nix.registry.nixpkgs.flake = nixpkgs;
nix.channel.enable = false; # remove nix-channel related tools & configs, we use flakes instead. nix.channel.enable = false; # remove nix-channel related tools & configs, we use flakes instead.

View File

@@ -35,7 +35,6 @@
"adbusers" "adbusers"
"libvirtd" "libvirtd"
]; ];
}; };
users.users.root = { users.users.root = {
initialHashedPassword = "$7$CU..../....X6uvZYnFD.i1CqqFFNl4./$4vgqzIPyw5XBr0aCDFbY/UIRRJr7h5SMGoQ/ZvX3FP2"; initialHashedPassword = "$7$CU..../....X6uvZYnFD.i1CqqFFNl4./$4vgqzIPyw5XBr0aCDFbY/UIRRJr7h5SMGoQ/ZvX3FP2";

View File

@@ -40,7 +40,7 @@
# nixos-hardware.nixosModules.apple-t2 # nixos-hardware.nixosModules.apple-t2
({pkgs, ...}: { ({pkgs, ...}: {
networking.hostName = "shoukei"; networking.hostName = "shoukei";
boot.kernelPackages = pkgs.linuxPackages_latest; # Use latest kernel for the initial installation. boot.kernelPackages = pkgs.linuxPackages_latest; # Use latest kernel for the initial installation.
# hardware.apple-t2.enableAppleSetOsLoader = true; # hardware.apple-t2.enableAppleSetOsLoader = true;
}) })

View File

@@ -58,7 +58,7 @@
source = config.age.secrets."wg-business.conf".path; source = config.age.secrets."wg-business.conf".path;
}; };
"agenix/ssh-key-romantic" = { "agenix/ssh-key-romantic" = {
source = config.age.secrets."ssh-key-romantic".path; source = config.age.secrets."ssh-key-romantic".path;
}; };

View File

@@ -66,7 +66,7 @@
source = config.age.secrets."wg-business.conf".path; source = config.age.secrets."wg-business.conf".path;
}; };
"agenix/ssh-key-romantic" = { "agenix/ssh-key-romantic" = {
source = config.age.secrets."ssh-key-romantic".path; source = config.age.secrets."ssh-key-romantic".path;
mode = "0600"; mode = "0600";
user = username; user = username;

View File

@@ -8,9 +8,7 @@ export def nixos-switch [
nixos-rebuild switch --use-remote-sudo --flake $".#($name)" --show-trace --verbose nixos-rebuild switch --use-remote-sudo --flake $".#($name)" --show-trace --verbose
} else { } else {
nixos-rebuild switch --use-remote-sudo --flake $".#($name)" nixos-rebuild switch --use-remote-sudo --flake $".#($name)"
} }
} }