This commit is contained in:
2024-06-22 15:32:03 +08:00
parent 64a2492ddb
commit 91cb8926a3
3 changed files with 42 additions and 39 deletions
+31 -29
View File
@@ -6,7 +6,8 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
]; ];
@@ -30,7 +31,7 @@
time.timeZone = "Asia/Shanghai"; time.timeZone = "Asia/Shanghai";
nix.settings = { nix.settings = {
trusted-users = ["origami"]; trusted-users = [ "origami" ];
substituters = [ substituters = [
"https://mirrors.ustc.edu.cn/nix-channels/store" "https://mirrors.ustc.edu.cn/nix-channels/store"
]; ];
@@ -45,7 +46,7 @@
curl curl
# Shell & Editor # Shell & Editor
fish # better shell fish # better shell
#helix.packages."${pkgs.system}".helix #helix.packages."${pkgs.system}".helix
# Archives # Archives
@@ -55,40 +56,40 @@
p7zip p7zip
zstd zstd
gnutar gnutar
atool # all-in-one tar atool # all-in-one tar
# Modern unix # Modern unix
ripgrep # better grep ripgrep # better grep
jq # better cat on json jq # better cat on json
bat # better cat on everything bat # better cat on everything
eza # better ls eza # better ls
fzf # A command-line fuzzy finder fzf # A command-line fuzzy finder
du-dust # better du du-dust # better du
duf # better df duf # better df
fd # better find fd # better find
btop # better top btop # better top
procs # better ps procs # better ps
zoxide # better cd zoxide # better cd
scc # better cloc scc # better cloc
# Networking # Networking
mtr # better traceroute mtr # better traceroute
iperf3 iperf3
q # better dig/nslookup q # better dig/nslookup
socat # better netcat socat # better netcat
nmap nmap
# Misc # Misc
file file
which which
tree tree
gnused # sed gnused # sed
gawk # awk gawk # awk
gnupg gnupg
pciutils # lspci pciutils # lspci
usbutils # lsusb usbutils # lsusb
neofetch neofetch
v2raya # Only for Chinese user v2raya # Only for Chinese user
# nix related # nix related
# #
@@ -96,14 +97,15 @@
# with more details log output # with more details log output
nix-output-monitor nix-output-monitor
nixd nixd
nixpkgs-fmt
# system call monitoring # system call monitoring
strace # system call monitoring strace # system call monitoring
ltrace # library call monitoring ltrace # library call monitoring
lsof # list open files lsof # list open files
# Desktop Utils # Desktop Utils
chromium # Web browser chromium # Web browser
gnome3.gnome-tweaks gnome3.gnome-tweaks
]; ];
@@ -143,7 +145,7 @@
group = "origami"; group = "origami";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZxRoweHoLfoaydPqhsLnc4EGgwTp7Uz1DZ2DG447B+ origami@fedora" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZxRoweHoLfoaydPqhsLnc4EGgwTp7Uz1DZ2DG447B+ origami@fedora"
]; ];
}; };
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
+2 -1
View File
@@ -17,7 +17,8 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./configuration.nix ./configuration.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.origami = import ./home.nix; home-manager.users.origami = import ./home.nix;
+1 -1
View File
@@ -6,7 +6,7 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
home.packages = with pkgs;[]; home.packages = with pkgs;[ ];
programs.vscode = { programs.vscode = {
enable = true; enable = true;
}; };