diff --git a/home/base/core.nix b/home/base/core.nix index d7c9fc1e..d13a2aea 100644 --- a/home/base/core.nix +++ b/home/base/core.nix @@ -4,7 +4,6 @@ home = { inherit username; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/home/base/desktop/cloud/default.nix b/home/base/desktop/cloud/default.nix index 6ce0d55e..d516a536 100644 --- a/home/base/desktop/cloud/default.nix +++ b/home/base/desktop/cloud/default.nix @@ -4,7 +4,7 @@ # general tools pulumi pulumictl - packer # machine image builder + packer # machine image builder # aws awscli2 diff --git a/home/base/desktop/terminal/kitty.nix b/home/base/desktop/terminal/kitty.nix index fe7b6a01..0ea34265 100644 --- a/home/base/desktop/terminal/kitty.nix +++ b/home/base/desktop/terminal/kitty.nix @@ -30,11 +30,10 @@ }; # consistent with wezterm - keybindings = - { - "ctrl+shift+m" = "toggle_maximized"; - "ctrl+shift+f" = "show_scrollback"; # search in the current window - }; + keybindings = { + "ctrl+shift+m" = "toggle_maximized"; + "ctrl+shift+f" = "show_scrollback"; # search in the current window + }; settings = { background_opacity = "0.93"; diff --git a/home/base/server/core.nix b/home/base/server/core.nix index 559910fe..3e6345f1 100644 --- a/home/base/server/core.nix +++ b/home/base/server/core.nix @@ -23,7 +23,7 @@ gnugrep # GNU grep, provides `grep`/`egrep`/`fgrep` gnused # GNU sed, very powerful(mainly for replacing text in files) 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 sad # CLI search and replace, with diff preview, really useful!!! delta # A viewer for git and diff output diff --git a/home/linux/base/shell.nix b/home/linux/base/shell.nix index a530468c..35f1e302 100644 --- a/home/linux/base/shell.nix +++ b/home/linux/base/shell.nix @@ -1,10 +1,12 @@ - -{config, username, ...}: let +{ + config, + username, + ... +}: let d = config.xdg.dataHome; c = config.xdg.configHome; cache = config.xdg.cacheHome; in rec { - home.homeDirectory = "/home/${username}"; # environment variables that always set at login diff --git a/home/linux/desktop/base/misc.nix b/home/linux/desktop/base/misc.nix index f2d1fec6..1d51c128 100644 --- a/home/linux/desktop/base/misc.nix +++ b/home/linux/desktop/base/misc.nix @@ -1,4 +1,8 @@ -{pkgs, pkgs-unstable, ...}: { +{ + pkgs, + pkgs-unstable, + ... +}: { home.packages = with pkgs; [ # GUI apps # e-book viewer(.epub/.mobi/...) diff --git a/hosts/12kingdoms/shoukei/hardware-configuration.nix b/hosts/12kingdoms/shoukei/hardware-configuration.nix index 52e91bd9..57c5cd05 100644 --- a/hosts/12kingdoms/shoukei/hardware-configuration.nix +++ b/hosts/12kingdoms/shoukei/hardware-configuration.nix @@ -13,7 +13,7 @@ ]; hardware.firmware = [ - (import ./brcm-firmware { inherit pkgs;}) + (import ./brcm-firmware {inherit pkgs;}) ]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod"]; diff --git a/hosts/12kingdoms/suzu/default.nix b/hosts/12kingdoms/suzu/default.nix index ce41bcfd..0802d2e9 100644 --- a/hosts/12kingdoms/suzu/default.nix +++ b/hosts/12kingdoms/suzu/default.nix @@ -1,7 +1,4 @@ -{ - nixos-rk3588, - ... -}: +{nixos-rk3588, ...}: ############################################################# # # Aquamarine - A NixOS VM running on Proxmox diff --git a/hosts/idols/ai/impermanence.nix b/hosts/idols/ai/impermanence.nix index 7f8f9356..b10fe9f7 100644 --- a/hosts/idols/ai/impermanence.nix +++ b/hosts/idols/ai/impermanence.nix @@ -95,7 +95,7 @@ # doom-emacs ".config/emacs" - "org" # org files + "org" # org files # browsers ".mozilla" diff --git a/lib/default.nix b/lib/default.nix index 0d295431..edb0c822 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -10,7 +10,7 @@ (lib.attrsets.filterAttrs ( path: _type: - (_type == "directory") # include directories + (_type == "directory") # include directories || ( (path != "default.nix") # ignore default.nix && (lib.strings.hasSuffix ".nix" path) # include .nix files diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix index 1afb6bec..41c35031 100644 --- a/modules/nixos/base/nix.nix +++ b/modules/nixos/base/nix.nix @@ -1,4 +1,8 @@ -{lib, nixpkgs, ...}: { +{ + lib, + nixpkgs, + ... +}: { # make `nix run nixpkgs#nixpkgs` use the same nixpkgs as the one used by this flake. nix.registry.nixpkgs.flake = nixpkgs; nix.channel.enable = false; # remove nix-channel related tools & configs, we use flakes instead. diff --git a/modules/nixos/base/user-group.nix b/modules/nixos/base/user-group.nix index 83e09f52..9518fe77 100644 --- a/modules/nixos/base/user-group.nix +++ b/modules/nixos/base/user-group.nix @@ -35,7 +35,6 @@ "adbusers" "libvirtd" ]; - }; users.users.root = { initialHashedPassword = "$7$CU..../....X6uvZYnFD.i1CqqFFNl4./$4vgqzIPyw5XBr0aCDFbY/UIRRJr7h5SMGoQ/ZvX3FP2"; diff --git a/nixos-installer/flake.nix b/nixos-installer/flake.nix index dc8176a8..fe7fa90c 100644 --- a/nixos-installer/flake.nix +++ b/nixos-installer/flake.nix @@ -40,7 +40,7 @@ # nixos-hardware.nixosModules.apple-t2 ({pkgs, ...}: { 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; }) diff --git a/secrets/darwin.nix b/secrets/darwin.nix index 570bb8da..eee480b0 100644 --- a/secrets/darwin.nix +++ b/secrets/darwin.nix @@ -58,7 +58,7 @@ source = config.age.secrets."wg-business.conf".path; }; - "agenix/ssh-key-romantic" = { + "agenix/ssh-key-romantic" = { source = config.age.secrets."ssh-key-romantic".path; }; diff --git a/secrets/nixos.nix b/secrets/nixos.nix index 8c922273..f78b455f 100644 --- a/secrets/nixos.nix +++ b/secrets/nixos.nix @@ -66,7 +66,7 @@ source = config.age.secrets."wg-business.conf".path; }; - "agenix/ssh-key-romantic" = { + "agenix/ssh-key-romantic" = { source = config.age.secrets."ssh-key-romantic".path; mode = "0600"; user = username; diff --git a/utils.nu b/utils.nu index 300bd11d..23df0d71 100644 --- a/utils.nu +++ b/utils.nu @@ -8,9 +8,7 @@ export def nixos-switch [ nixos-rebuild switch --use-remote-sudo --flake $".#($name)" --show-trace --verbose } else { nixos-rebuild switch --use-remote-sudo --flake $".#($name)" - } - - + } }