From 4285f6330d938a33194971fd165c3a14dd235803 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 15 Jan 2024 12:18:06 +0800 Subject: [PATCH] sed 's/_: {/{/g' --- darwin/hosts/Plato/hardware-configuration.nix | 2 +- darwin/profiles/common/core/networking.nix | 2 +- darwin/profiles/common/core/nix/gc.nix | 2 +- darwin/profiles/common/opt-in/gaming.nix | 2 +- darwin/profiles/desktop/packages/homebrew.nix | 2 +- nixos/profiles/common/core/hardening/sysctl.nix | 2 +- nixos/profiles/common/core/networking/default.nix | 2 +- nixos/profiles/common/core/nix/gc.nix | 2 +- nixos/profiles/common/opt-in/_flatpak.nix | 2 +- nixos/profiles/common/opt-in/_legacy-boot.nix | 2 +- nixos/profiles/common/opt-in/_virt-manager.nix | 2 +- nixos/profiles/common/opt-in/_virtualbox.nix | 2 +- nixos/profiles/common/opt-in/zram-generator.nix | 2 +- nixos/profiles/common/physical/default.nix | 2 +- .../darwin/profiles/common/opt-in/gaming/default.nix | 2 +- users/guanranwang/darwin/profiles/desktop/default.nix | 2 +- .../guanranwang/home-manager/applications/alacritty/default.nix | 2 +- users/guanranwang/home-manager/applications/bat/default.nix | 2 +- .../guanranwang/home-manager/applications/batsignal/default.nix | 2 +- users/guanranwang/home-manager/applications/bottom/default.nix | 2 +- .../guanranwang/home-manager/applications/chromium/default.nix | 2 +- .../guanranwang/home-manager/applications/cliphist/default.nix | 2 +- users/guanranwang/home-manager/applications/eza/default.nix | 2 +- users/guanranwang/home-manager/applications/foot/default.nix | 2 +- users/guanranwang/home-manager/applications/git/default.nix | 2 +- .../home-manager/applications/i3status-rust/default.nix | 2 +- users/guanranwang/home-manager/applications/joshuto/default.nix | 2 +- users/guanranwang/home-manager/applications/kitty/default.nix | 2 +- .../guanranwang/home-manager/applications/mangohud/default.nix | 2 +- users/guanranwang/home-manager/applications/polybar/default.nix | 2 +- users/guanranwang/home-manager/applications/ripgrep/default.nix | 2 +- users/guanranwang/home-manager/applications/skim/default.nix | 2 +- users/guanranwang/home-manager/applications/sxhkd/default.nix | 2 +- .../guanranwang/home-manager/applications/tealdeer/default.nix | 2 +- users/guanranwang/home-manager/applications/udiskie/default.nix | 2 +- users/guanranwang/home-manager/applications/wezterm/default.nix | 2 +- users/guanranwang/home-manager/applications/zellij/default.nix | 2 +- users/guanranwang/home-manager/applications/zoxide/default.nix | 2 +- users/guanranwang/nixos/profiles/common/mobile/default.nix | 2 +- users/guanranwang/nixos/profiles/common/mobile/home/default.nix | 2 +- .../guanranwang/nixos/profiles/common/opt-in/gaming/default.nix | 2 +- .../nixos/profiles/common/opt-in/torrenting/default.nix | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/darwin/hosts/Plato/hardware-configuration.nix b/darwin/hosts/Plato/hardware-configuration.nix index f08a03b..dec39c2 100644 --- a/darwin/hosts/Plato/hardware-configuration.nix +++ b/darwin/hosts/Plato/hardware-configuration.nix @@ -1,5 +1,5 @@ # iMac 18,3 (2017) -_: { +{ networking.knownNetworkServices = [ "Ethernet" "Wi-Fi" diff --git a/darwin/profiles/common/core/networking.nix b/darwin/profiles/common/core/networking.nix index 1145c44..e5fda1f 100644 --- a/darwin/profiles/common/core/networking.nix +++ b/darwin/profiles/common/core/networking.nix @@ -1,4 +1,4 @@ -_: { +{ networking.dns = [ ### AliDNS "223.5.5.5" diff --git a/darwin/profiles/common/core/nix/gc.nix b/darwin/profiles/common/core/nix/gc.nix index d9db29f..e2ce054 100755 --- a/darwin/profiles/common/core/nix/gc.nix +++ b/darwin/profiles/common/core/nix/gc.nix @@ -1,4 +1,4 @@ -_: { +{ nix = { ### Auto hard linking settings.auto-optimise-store = true; diff --git a/darwin/profiles/common/opt-in/gaming.nix b/darwin/profiles/common/opt-in/gaming.nix index cf9d236..8669e65 100644 --- a/darwin/profiles/common/opt-in/gaming.nix +++ b/darwin/profiles/common/opt-in/gaming.nix @@ -1,4 +1,4 @@ -_: { +{ homebrew.casks = [ "steam" ]; diff --git a/darwin/profiles/desktop/packages/homebrew.nix b/darwin/profiles/desktop/packages/homebrew.nix index 0ee9e66..ee1f61c 100644 --- a/darwin/profiles/desktop/packages/homebrew.nix +++ b/darwin/profiles/desktop/packages/homebrew.nix @@ -1,4 +1,4 @@ -_: { +{ homebrew = { enable = true; casks = [ diff --git a/nixos/profiles/common/core/hardening/sysctl.nix b/nixos/profiles/common/core/hardening/sysctl.nix index 28dda70..219e86f 100644 --- a/nixos/profiles/common/core/hardening/sysctl.nix +++ b/nixos/profiles/common/core/hardening/sysctl.nix @@ -1,4 +1,4 @@ -_: { +{ boot.kernel.sysctl = { ### https://madaidans-insecurities.github.io/guides/linux-hardening.html#sysctl # Kernel self-protection diff --git a/nixos/profiles/common/core/networking/default.nix b/nixos/profiles/common/core/networking/default.nix index 94972c4..9b708fd 100644 --- a/nixos/profiles/common/core/networking/default.nix +++ b/nixos/profiles/common/core/networking/default.nix @@ -1,4 +1,4 @@ -_: { +{ networking.wireless.iwd.enable = true; networking.nameservers = [ ### AliDNS diff --git a/nixos/profiles/common/core/nix/gc.nix b/nixos/profiles/common/core/nix/gc.nix index a7f48ca..5fa497c 100755 --- a/nixos/profiles/common/core/nix/gc.nix +++ b/nixos/profiles/common/core/nix/gc.nix @@ -1,4 +1,4 @@ -_: { +{ nix = { ### Auto hard linking settings.auto-optimise-store = true; diff --git a/nixos/profiles/common/opt-in/_flatpak.nix b/nixos/profiles/common/opt-in/_flatpak.nix index ae30727..6ba8919 100755 --- a/nixos/profiles/common/opt-in/_flatpak.nix +++ b/nixos/profiles/common/opt-in/_flatpak.nix @@ -1,4 +1,4 @@ -_: { +{ services.flatpak.enable = true; services.gnome.core-utilities.enable = false; # remove default gnome pkgs, for example, gnome-music, to use flatpaks instead diff --git a/nixos/profiles/common/opt-in/_legacy-boot.nix b/nixos/profiles/common/opt-in/_legacy-boot.nix index 9551c28..303af1f 100755 --- a/nixos/profiles/common/opt-in/_legacy-boot.nix +++ b/nixos/profiles/common/opt-in/_legacy-boot.nix @@ -1,4 +1,4 @@ -_: { +{ boot.loader = { grub.enable = true; grub.device = "/dev/vda"; # or "nodev" for efi only diff --git a/nixos/profiles/common/opt-in/_virt-manager.nix b/nixos/profiles/common/opt-in/_virt-manager.nix index 4b02628..d923a08 100644 --- a/nixos/profiles/common/opt-in/_virt-manager.nix +++ b/nixos/profiles/common/opt-in/_virt-manager.nix @@ -1,4 +1,4 @@ -_: { +{ virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; } diff --git a/nixos/profiles/common/opt-in/_virtualbox.nix b/nixos/profiles/common/opt-in/_virtualbox.nix index 51fdf9b..10c2718 100644 --- a/nixos/profiles/common/opt-in/_virtualbox.nix +++ b/nixos/profiles/common/opt-in/_virtualbox.nix @@ -1,3 +1,3 @@ -_: { +{ virtualisation.virtualbox.host.enable = true; } diff --git a/nixos/profiles/common/opt-in/zram-generator.nix b/nixos/profiles/common/opt-in/zram-generator.nix index 47bde06..14425f6 100644 --- a/nixos/profiles/common/opt-in/zram-generator.nix +++ b/nixos/profiles/common/opt-in/zram-generator.nix @@ -1,4 +1,4 @@ -_: { +{ services.zram-generator = { enable = true; settings.zram0 = { diff --git a/nixos/profiles/common/physical/default.nix b/nixos/profiles/common/physical/default.nix index 71c670d..4c37fe0 100644 --- a/nixos/profiles/common/physical/default.nix +++ b/nixos/profiles/common/physical/default.nix @@ -1,4 +1,4 @@ -_: { +{ networking.stevenblack.enable = true; services.system76-scheduler.enable = true; services.power-profiles-daemon.enable = true; diff --git a/users/guanranwang/darwin/profiles/common/opt-in/gaming/default.nix b/users/guanranwang/darwin/profiles/common/opt-in/gaming/default.nix index e5bfab2..534d82f 100644 --- a/users/guanranwang/darwin/profiles/common/opt-in/gaming/default.nix +++ b/users/guanranwang/darwin/profiles/common/opt-in/gaming/default.nix @@ -1,4 +1,4 @@ -_: { +{ ### home-manager home-manager.users.guanranwang = import ./home; } diff --git a/users/guanranwang/darwin/profiles/desktop/default.nix b/users/guanranwang/darwin/profiles/desktop/default.nix index f4e70c2..44e2bfd 100644 --- a/users/guanranwang/darwin/profiles/desktop/default.nix +++ b/users/guanranwang/darwin/profiles/desktop/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ../common/core ]; diff --git a/users/guanranwang/home-manager/applications/alacritty/default.nix b/users/guanranwang/home-manager/applications/alacritty/default.nix index 0413a1f..3eafede 100644 --- a/users/guanranwang/home-manager/applications/alacritty/default.nix +++ b/users/guanranwang/home-manager/applications/alacritty/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.alacritty = { enable = true; settings.env.WINIT_X11_SCALE_FACTOR = "1"; # workaround for scaling in X11 diff --git a/users/guanranwang/home-manager/applications/bat/default.nix b/users/guanranwang/home-manager/applications/bat/default.nix index 08f417b..cf9d4f6 100644 --- a/users/guanranwang/home-manager/applications/bat/default.nix +++ b/users/guanranwang/home-manager/applications/bat/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.bat.enable = true; home.sessionVariables = { "MANPAGER" = "sh -c 'col -bx | bat -l man -p'"; diff --git a/users/guanranwang/home-manager/applications/batsignal/default.nix b/users/guanranwang/home-manager/applications/batsignal/default.nix index 47eb590..049a19d 100644 --- a/users/guanranwang/home-manager/applications/batsignal/default.nix +++ b/users/guanranwang/home-manager/applications/batsignal/default.nix @@ -1,3 +1,3 @@ -_: { +{ services.batsignal.enable = true; } diff --git a/users/guanranwang/home-manager/applications/bottom/default.nix b/users/guanranwang/home-manager/applications/bottom/default.nix index 83496a6..4bc1015 100644 --- a/users/guanranwang/home-manager/applications/bottom/default.nix +++ b/users/guanranwang/home-manager/applications/bottom/default.nix @@ -1,3 +1,3 @@ -_: { +{ programs.bottom.enable = true; } diff --git a/users/guanranwang/home-manager/applications/chromium/default.nix b/users/guanranwang/home-manager/applications/chromium/default.nix index 96cacfa..f5916ad 100644 --- a/users/guanranwang/home-manager/applications/chromium/default.nix +++ b/users/guanranwang/home-manager/applications/chromium/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.chromium = { enable = true; #package = pkgs.ungoogled-chromium; diff --git a/users/guanranwang/home-manager/applications/cliphist/default.nix b/users/guanranwang/home-manager/applications/cliphist/default.nix index b5c0921..b2dd112 100644 --- a/users/guanranwang/home-manager/applications/cliphist/default.nix +++ b/users/guanranwang/home-manager/applications/cliphist/default.nix @@ -1,3 +1,3 @@ -_: { +{ services.cliphist.enable = true; } diff --git a/users/guanranwang/home-manager/applications/eza/default.nix b/users/guanranwang/home-manager/applications/eza/default.nix index d9048f6..2780a3e 100644 --- a/users/guanranwang/home-manager/applications/eza/default.nix +++ b/users/guanranwang/home-manager/applications/eza/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.eza = { enable = true; git = true; diff --git a/users/guanranwang/home-manager/applications/foot/default.nix b/users/guanranwang/home-manager/applications/foot/default.nix index 8d417e6..169e275 100644 --- a/users/guanranwang/home-manager/applications/foot/default.nix +++ b/users/guanranwang/home-manager/applications/foot/default.nix @@ -1,3 +1,3 @@ -_: { +{ programs.foot.enable = true; } diff --git a/users/guanranwang/home-manager/applications/git/default.nix b/users/guanranwang/home-manager/applications/git/default.nix index 70349c2..db755a0 100644 --- a/users/guanranwang/home-manager/applications/git/default.nix +++ b/users/guanranwang/home-manager/applications/git/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.git = { enable = true; userName = "Guanran Wang"; diff --git a/users/guanranwang/home-manager/applications/i3status-rust/default.nix b/users/guanranwang/home-manager/applications/i3status-rust/default.nix index 313cab7..74d072f 100644 --- a/users/guanranwang/home-manager/applications/i3status-rust/default.nix +++ b/users/guanranwang/home-manager/applications/i3status-rust/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.i3status-rust = { enable = true; bars = { diff --git a/users/guanranwang/home-manager/applications/joshuto/default.nix b/users/guanranwang/home-manager/applications/joshuto/default.nix index c471aac..1cbea05 100644 --- a/users/guanranwang/home-manager/applications/joshuto/default.nix +++ b/users/guanranwang/home-manager/applications/joshuto/default.nix @@ -1,3 +1,3 @@ -_: { +{ programs.joshuto.enable = true; } diff --git a/users/guanranwang/home-manager/applications/kitty/default.nix b/users/guanranwang/home-manager/applications/kitty/default.nix index a712742..4534c2c 100644 --- a/users/guanranwang/home-manager/applications/kitty/default.nix +++ b/users/guanranwang/home-manager/applications/kitty/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.kitty = { enable = true; settings.confirm_os_window_close = 0; diff --git a/users/guanranwang/home-manager/applications/mangohud/default.nix b/users/guanranwang/home-manager/applications/mangohud/default.nix index 1a018ae..ab66356 100644 --- a/users/guanranwang/home-manager/applications/mangohud/default.nix +++ b/users/guanranwang/home-manager/applications/mangohud/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.mangohud = { enable = true; # TODO: add configuration, i have no idea how to display stuff with nix syntax diff --git a/users/guanranwang/home-manager/applications/polybar/default.nix b/users/guanranwang/home-manager/applications/polybar/default.nix index 08498a2..dc03e21 100644 --- a/users/guanranwang/home-manager/applications/polybar/default.nix +++ b/users/guanranwang/home-manager/applications/polybar/default.nix @@ -1,4 +1,4 @@ -_: { +{ services.polybar = { enable = true; script = "polybar bar"; diff --git a/users/guanranwang/home-manager/applications/ripgrep/default.nix b/users/guanranwang/home-manager/applications/ripgrep/default.nix index e2f3b95..34cc7c5 100644 --- a/users/guanranwang/home-manager/applications/ripgrep/default.nix +++ b/users/guanranwang/home-manager/applications/ripgrep/default.nix @@ -1,3 +1,3 @@ -_: { +{ programs.ripgrep.enable = true; } diff --git a/users/guanranwang/home-manager/applications/skim/default.nix b/users/guanranwang/home-manager/applications/skim/default.nix index 60e1fa4..fe139cf 100644 --- a/users/guanranwang/home-manager/applications/skim/default.nix +++ b/users/guanranwang/home-manager/applications/skim/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.skim = { enable = true; defaultCommand = "rg --files || fd --type f || find ."; diff --git a/users/guanranwang/home-manager/applications/sxhkd/default.nix b/users/guanranwang/home-manager/applications/sxhkd/default.nix index cabdf38..3893bd7 100644 --- a/users/guanranwang/home-manager/applications/sxhkd/default.nix +++ b/users/guanranwang/home-manager/applications/sxhkd/default.nix @@ -1,4 +1,4 @@ -_: { +{ services.sxhkd = { enable = true; keybindings = { diff --git a/users/guanranwang/home-manager/applications/tealdeer/default.nix b/users/guanranwang/home-manager/applications/tealdeer/default.nix index a7b2fb7..f2da5b2 100644 --- a/users/guanranwang/home-manager/applications/tealdeer/default.nix +++ b/users/guanranwang/home-manager/applications/tealdeer/default.nix @@ -1,3 +1,3 @@ -_: { +{ programs.tealdeer.enable = true; } diff --git a/users/guanranwang/home-manager/applications/udiskie/default.nix b/users/guanranwang/home-manager/applications/udiskie/default.nix index 08a5850..f3ea3b8 100644 --- a/users/guanranwang/home-manager/applications/udiskie/default.nix +++ b/users/guanranwang/home-manager/applications/udiskie/default.nix @@ -1,3 +1,3 @@ -_: { +{ services.udiskie.enable = true; } diff --git a/users/guanranwang/home-manager/applications/wezterm/default.nix b/users/guanranwang/home-manager/applications/wezterm/default.nix index a4ea8b2..079e1fd 100644 --- a/users/guanranwang/home-manager/applications/wezterm/default.nix +++ b/users/guanranwang/home-manager/applications/wezterm/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.wezterm = { enable = true; extraConfig = '' diff --git a/users/guanranwang/home-manager/applications/zellij/default.nix b/users/guanranwang/home-manager/applications/zellij/default.nix index b8747c9..da21e21 100644 --- a/users/guanranwang/home-manager/applications/zellij/default.nix +++ b/users/guanranwang/home-manager/applications/zellij/default.nix @@ -1,4 +1,4 @@ -_: { +{ programs.zellij = { enable = true; enableFishIntegration = true; diff --git a/users/guanranwang/home-manager/applications/zoxide/default.nix b/users/guanranwang/home-manager/applications/zoxide/default.nix index c6620f4..c4b4530 100644 --- a/users/guanranwang/home-manager/applications/zoxide/default.nix +++ b/users/guanranwang/home-manager/applications/zoxide/default.nix @@ -1,3 +1,3 @@ -_: { +{ programs.zoxide.enable = true; } diff --git a/users/guanranwang/nixos/profiles/common/mobile/default.nix b/users/guanranwang/nixos/profiles/common/mobile/default.nix index 3519407..efb439a 100644 --- a/users/guanranwang/nixos/profiles/common/mobile/default.nix +++ b/users/guanranwang/nixos/profiles/common/mobile/default.nix @@ -1,3 +1,3 @@ -_: { +{ home-manager.users.guanranwang = import ./home; } diff --git a/users/guanranwang/nixos/profiles/common/mobile/home/default.nix b/users/guanranwang/nixos/profiles/common/mobile/home/default.nix index 47eb590..049a19d 100644 --- a/users/guanranwang/nixos/profiles/common/mobile/home/default.nix +++ b/users/guanranwang/nixos/profiles/common/mobile/home/default.nix @@ -1,3 +1,3 @@ -_: { +{ services.batsignal.enable = true; } diff --git a/users/guanranwang/nixos/profiles/common/opt-in/gaming/default.nix b/users/guanranwang/nixos/profiles/common/opt-in/gaming/default.nix index e875d31..fb90e23 100644 --- a/users/guanranwang/nixos/profiles/common/opt-in/gaming/default.nix +++ b/users/guanranwang/nixos/profiles/common/opt-in/gaming/default.nix @@ -1,4 +1,4 @@ -_: { +{ ### home-manager home-manager.users.guanranwang.imports = [./home]; diff --git a/users/guanranwang/nixos/profiles/common/opt-in/torrenting/default.nix b/users/guanranwang/nixos/profiles/common/opt-in/torrenting/default.nix index e5bfab2..534d82f 100644 --- a/users/guanranwang/nixos/profiles/common/opt-in/torrenting/default.nix +++ b/users/guanranwang/nixos/profiles/common/opt-in/torrenting/default.nix @@ -1,4 +1,4 @@ -_: { +{ ### home-manager home-manager.users.guanranwang = import ./home; }