diff --git a/darwin/hardware/apple/imac/18-3/default.nix b/darwin/hardware/apple/imac/18-3/default.nix index 1e8db51..d952e6f 100644 --- a/darwin/hardware/apple/imac/18-3/default.nix +++ b/darwin/hardware/apple/imac/18-3/default.nix @@ -1,4 +1,4 @@ -{...}: { +_: { networking.knownNetworkServices = [ "Ethernet" "Wi-Fi" diff --git a/darwin/profiles/core/nix/flake.nix b/darwin/profiles/core/nix/flake.nix index 85bc3cc..39c65cb 100755 --- a/darwin/profiles/core/nix/flake.nix +++ b/darwin/profiles/core/nix/flake.nix @@ -1,4 +1,4 @@ -{...}: { +_: { # Enable Flakes nix.settings.experimental-features = ["nix-command" "flakes"]; } diff --git a/darwin/profiles/core/nix/gc.nix b/darwin/profiles/core/nix/gc.nix index 7aa7038..d9db29f 100755 --- a/darwin/profiles/core/nix/gc.nix +++ b/darwin/profiles/core/nix/gc.nix @@ -1,4 +1,4 @@ -{...}: { +_: { nix = { ### Auto hard linking settings.auto-optimise-store = true; diff --git a/darwin/profiles/device-type/desktop/packages/homebrew.nix b/darwin/profiles/device-type/desktop/packages/homebrew.nix index f747276..ef85b01 100644 --- a/darwin/profiles/device-type/desktop/packages/homebrew.nix +++ b/darwin/profiles/device-type/desktop/packages/homebrew.nix @@ -1,4 +1,4 @@ -{...}: { +_: { homebrew = { enable = true; brews = [ diff --git a/darwin/profiles/device-type/desktop/system/system.nix b/darwin/profiles/device-type/desktop/system/system.nix index 357a5f4..11ef8cd 100644 --- a/darwin/profiles/device-type/desktop/system/system.nix +++ b/darwin/profiles/device-type/desktop/system/system.nix @@ -1,4 +1,4 @@ -{...}: { +_: { system.defaults = { # Apple... Do I really have to change literally # every setting in macOS to make it actually usable. diff --git a/darwin/profiles/opt-in/gaming.nix b/darwin/profiles/opt-in/gaming.nix index 24f4fc8..cf9d236 100644 --- a/darwin/profiles/opt-in/gaming.nix +++ b/darwin/profiles/opt-in/gaming.nix @@ -1,4 +1,4 @@ -{...}: { +_: { homebrew.casks = [ "steam" ]; diff --git a/flake.nix b/flake.nix index 7b537d8..d2dfaf3 100755 --- a/flake.nix +++ b/flake.nix @@ -150,7 +150,7 @@ }; }; - outputs = {...} @ inputs: { + outputs = inputs: { formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.x86_64-darwin = inputs.nixpkgs.legacyPackages.x86_64-darwin.alejandra; diff --git a/nixos/profiles/core/nix/gc.nix b/nixos/profiles/core/nix/gc.nix index c6c9b1a..a7f48ca 100755 --- a/nixos/profiles/core/nix/gc.nix +++ b/nixos/profiles/core/nix/gc.nix @@ -1,4 +1,4 @@ -{...}: { +_: { nix = { ### Auto hard linking settings.auto-optimise-store = true; diff --git a/nixos/profiles/core/packages/hardware.nix b/nixos/profiles/core/packages/hardware.nix index 9918e28..59cf49b 100644 --- a/nixos/profiles/core/packages/hardware.nix +++ b/nixos/profiles/core/packages/hardware.nix @@ -1,4 +1,4 @@ -{...}: { +_: { hardware = { enableRedistributableFirmware = true; #enableAllFirmware = true; diff --git a/nixos/profiles/core/packages/overlays/default.nix b/nixos/profiles/core/packages/overlays/default.nix index 7ccfbd1..d8c13ea 100644 --- a/nixos/profiles/core/packages/overlays/default.nix +++ b/nixos/profiles/core/packages/overlays/default.nix @@ -1,4 +1,4 @@ -{...}: { +_: { nixpkgs.overlays = [ (import ./nautilus.nix) (import ./prismlauncher.nix) diff --git a/nixos/profiles/core/sysctl.nix b/nixos/profiles/core/sysctl.nix index 06b5fab..7725401 100644 --- a/nixos/profiles/core/sysctl.nix +++ b/nixos/profiles/core/sysctl.nix @@ -1,4 +1,4 @@ -{...}: { +_: { boot.kernelModules = ["tcp_bbr"]; boot.kernel.sysctl = { ### https://madaidans-insecurities.github.io/guides/linux-hardening.html#sysctl diff --git a/nixos/profiles/opt-in/flatpak.nix b/nixos/profiles/opt-in/flatpak.nix index 8dad920..ae30727 100755 --- a/nixos/profiles/opt-in/flatpak.nix +++ b/nixos/profiles/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/opt-in/legacy-boot.nix b/nixos/profiles/opt-in/legacy-boot.nix index 5ba523f..9551c28 100755 --- a/nixos/profiles/opt-in/legacy-boot.nix +++ b/nixos/profiles/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/opt-in/systemd-resolved.nix b/nixos/profiles/opt-in/systemd-resolved.nix index 36a17e1..a749cb3 100644 --- a/nixos/profiles/opt-in/systemd-resolved.nix +++ b/nixos/profiles/opt-in/systemd-resolved.nix @@ -1,4 +1,4 @@ -{...}: { +_: { ### systemd-resolved services.resolved = { enable = true; diff --git a/nixos/profiles/opt-in/virt-manager.nix b/nixos/profiles/opt-in/virt-manager.nix index 37f8b42..4b02628 100644 --- a/nixos/profiles/opt-in/virt-manager.nix +++ b/nixos/profiles/opt-in/virt-manager.nix @@ -1,4 +1,4 @@ -{...}: { +_: { virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; } diff --git a/nixos/profiles/opt-in/virtualbox.nix b/nixos/profiles/opt-in/virtualbox.nix index 5817b86..51fdf9b 100644 --- a/nixos/profiles/opt-in/virtualbox.nix +++ b/nixos/profiles/opt-in/virtualbox.nix @@ -1,3 +1,3 @@ -{...}: { +_: { virtualisation.virtualbox.host.enable = true; } diff --git a/nixos/profiles/opt-in/wayland.nix b/nixos/profiles/opt-in/wayland.nix index 5a490a7..f6a01d1 100755 --- a/nixos/profiles/opt-in/wayland.nix +++ b/nixos/profiles/opt-in/wayland.nix @@ -1,4 +1,4 @@ -{...}: { +_: { programs.xwayland.enable = true; # enable XWayland hardware.nvidia.nvidiaSettings = false; # NVIDIA settings menu, wont do anything on wayland environment.sessionVariables = { diff --git a/nixos/profiles/opt-in/zram-generator.nix b/nixos/profiles/opt-in/zram-generator.nix index 3fe230b..7cd02e6 100644 --- a/nixos/profiles/opt-in/zram-generator.nix +++ b/nixos/profiles/opt-in/zram-generator.nix @@ -1,4 +1,4 @@ -{...}: { +_: { services.zram-generator = { enable = true; settings.zram0 = { diff --git a/users/guanranwang/darwin/profiles/device-type/desktop/default.nix b/users/guanranwang/darwin/profiles/device-type/desktop/default.nix index e592e4f..639be49 100644 --- a/users/guanranwang/darwin/profiles/device-type/desktop/default.nix +++ b/users/guanranwang/darwin/profiles/device-type/desktop/default.nix @@ -1,4 +1,4 @@ -{...}: { +_: { ### home-manager home-manager.users.guanranwang.imports = map (n: ../../../../home-manager/${n}) [ "profiles/graphical-stuff/darwin" diff --git a/users/guanranwang/darwin/profiles/opt-in/gaming.nix b/users/guanranwang/darwin/profiles/opt-in/gaming.nix index 94bc614..f6f3e77 100644 --- a/users/guanranwang/darwin/profiles/opt-in/gaming.nix +++ b/users/guanranwang/darwin/profiles/opt-in/gaming.nix @@ -1,4 +1,4 @@ -{...}: { +_: { home-manager.users.guanranwang.imports = [ ../../../../../home-manager/profiles/gaming/darwin ]; diff --git a/users/guanranwang/home-manager/applications/alacritty/default.nix b/users/guanranwang/home-manager/applications/alacritty/default.nix index a2a99e3..0413a1f 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 53157b6..08f417b 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 22d5780..47eb590 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 09306f9..83496a6 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 ad029c3..96cacfa 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/eza/default.nix b/users/guanranwang/home-manager/applications/eza/default.nix index d0680a4..d9048f6 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/fish/default.nix b/users/guanranwang/home-manager/applications/fish/default.nix index 00f3871..76ce7fa 100644 --- a/users/guanranwang/home-manager/applications/fish/default.nix +++ b/users/guanranwang/home-manager/applications/fish/default.nix @@ -14,11 +14,11 @@ plugins = [ { name = "autopair"; - src = pkgs.fishPlugins.autopair.src; + inherit (pkgs.fishPlugins.autopair) src; } { name = "done"; - src = pkgs.fishPlugins.done.src; + inherit (pkgs.fishPlugins.done) src; } #{ # name = "tide"; @@ -26,11 +26,11 @@ #} { name = "sponge"; - src = pkgs.fishPlugins.sponge.src; + inherit (pkgs.fishPlugins.sponge) src; } { name = "puffer"; - src = pkgs.fishPlugins.puffer.src; + inherit (pkgs.fishPlugins.puffer) src; } { name = "sudope"; diff --git a/users/guanranwang/home-manager/applications/git/default.nix b/users/guanranwang/home-manager/applications/git/default.nix index 9ea39a0..70349c2 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/joshuto/default.nix b/users/guanranwang/home-manager/applications/joshuto/default.nix index a5698ae..c471aac 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 a2f392e..a712742 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 8059944..1a018ae 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/mpv/default.nix b/users/guanranwang/home-manager/applications/mpv/default.nix index fc16fb4..589159c 100644 --- a/users/guanranwang/home-manager/applications/mpv/default.nix +++ b/users/guanranwang/home-manager/applications/mpv/default.nix @@ -1,3 +1,3 @@ -{...}: { +_: { programs.mpv.enable = true; } diff --git a/users/guanranwang/home-manager/applications/neovim/default.nix b/users/guanranwang/home-manager/applications/neovim/default.nix index a83292e..7561cca 100644 --- a/users/guanranwang/home-manager/applications/neovim/default.nix +++ b/users/guanranwang/home-manager/applications/neovim/default.nix @@ -1,4 +1,4 @@ -{...}: { +_: { programs.neovim = { enable = true; #defaultEditor = true; diff --git a/users/guanranwang/home-manager/applications/picom/default.nix b/users/guanranwang/home-manager/applications/picom/default.nix index e7727d0..a609170 100644 --- a/users/guanranwang/home-manager/applications/picom/default.nix +++ b/users/guanranwang/home-manager/applications/picom/default.nix @@ -1,4 +1,4 @@ -{...}: { +_: { services.picom = { enable = true; settings = { diff --git a/users/guanranwang/home-manager/applications/polybar/default.nix b/users/guanranwang/home-manager/applications/polybar/default.nix index 3ddb607..08498a2 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 2a27259..e2f3b95 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 ac42b2d..60e1fa4 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/sway/default.nix b/users/guanranwang/home-manager/applications/sway/default.nix index 4aca887..b504c29 100644 --- a/users/guanranwang/home-manager/applications/sway/default.nix +++ b/users/guanranwang/home-manager/applications/sway/default.nix @@ -88,7 +88,7 @@ modifier = "Mod4"; modes = {}; keybindings = let - modifier = config.wayland.windowManager.sway.config.modifier; + inherit (config.wayland.windowManager.sway.config) modifier; setBrightness = "/home/guanranwang/.local/bin/wrapped-brightnessctl"; setVolume = "/home/guanranwang/.local/bin/wrapped-pamixer"; screenshot = "/home/guanranwang/.local/bin/wrapped-grim"; diff --git a/users/guanranwang/home-manager/applications/tealdeer/default.nix b/users/guanranwang/home-manager/applications/tealdeer/default.nix index b2592e4..a7b2fb7 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 81fc5df..08a5850 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 c72cad2..a4ea8b2 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/zoxide/default.nix b/users/guanranwang/home-manager/applications/zoxide/default.nix index 9fd06ef..c6620f4 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/home-manager/profiles/device-type/graphical/nixos/wallpapers/default.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/default.nix index 98ef690..77bc146 100644 --- a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/default.nix +++ b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/wallpapers/default.nix @@ -1,4 +1,4 @@ -{...}: { +_: { xdg.dataFile."backgrounds" = { source = ./wallpapers; recursive = true; diff --git a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/xdg-mime.nix b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/xdg-mime.nix index e2dcb65..726d686 100644 --- a/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/xdg-mime.nix +++ b/users/guanranwang/home-manager/profiles/device-type/graphical/nixos/xdg-mime.nix @@ -1,4 +1,4 @@ -{...}: { +_: { # Default application associstions, ro. xdg.mimeApps = { enable = true; diff --git a/users/guanranwang/nixos/profiles/opt-in/gaming.nix b/users/guanranwang/nixos/profiles/opt-in/gaming.nix index 60d57fe..2818720 100644 --- a/users/guanranwang/nixos/profiles/opt-in/gaming.nix +++ b/users/guanranwang/nixos/profiles/opt-in/gaming.nix @@ -1,4 +1,4 @@ -{...}: { +_: { home-manager.users.guanranwang.imports = [ ../../../home-manager/profiles/opt-in/gaming/nixos ]; diff --git a/users/guanranwang/nixos/profiles/opt-in/torrenting.nix b/users/guanranwang/nixos/profiles/opt-in/torrenting.nix index 69f2c2e..e16749c 100644 --- a/users/guanranwang/nixos/profiles/opt-in/torrenting.nix +++ b/users/guanranwang/nixos/profiles/opt-in/torrenting.nix @@ -1,4 +1,4 @@ -{...}: { +_: { home-manager.users.guanranwang.imports = [ ../../../home-manager/profiles/opt-in/torrenting/nixos ];