diff --git a/home/dot_config/zed/settings.json b/home/dot_config/zed/settings.json index 1d895ff..d07cf3a 100644 --- a/home/dot_config/zed/settings.json +++ b/home/dot_config/zed/settings.json @@ -88,5 +88,17 @@ "telemetry": { "diagnostics": false, "metrics": false + }, + "languages": { + "Nix": { + "formatter": { + "external": { + "command": "alejandra" + } + }, + "completions": { + "lsp_insert_mode": "replace" + } + } } } diff --git a/nixcfgs/hosts/nixvirt/default.nix b/nixcfgs/hosts/nixvirt/default.nix index 5fceb21..df61112 100644 --- a/nixcfgs/hosts/nixvirt/default.nix +++ b/nixcfgs/hosts/nixvirt/default.nix @@ -5,8 +5,7 @@ pkgs, nix-flatpak, ... -}: -{ +}: { imports = [ # impure build /etc/nixos/hardware-configuration.nix diff --git a/nixcfgs/hosts/zen/brew.nix b/nixcfgs/hosts/zen/brew.nix index 1e9dd7b..ff9ea84 100644 --- a/nixcfgs/hosts/zen/brew.nix +++ b/nixcfgs/hosts/zen/brew.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ...}: - { + config, + pkgs, + ... +}: { homebrew = { enable = true; brewPrefix = "/opt/homebrew/bin"; @@ -65,5 +67,4 @@ "font-maple-mono-nf-cn" ]; }; - } diff --git a/nixcfgs/hosts/zen/default.nix b/nixcfgs/hosts/zen/default.nix index b623c9c..f9f5592 100644 --- a/nixcfgs/hosts/zen/default.nix +++ b/nixcfgs/hosts/zen/default.nix @@ -1,10 +1,9 @@ -{pkgs, ...}: -{ +{pkgs, ...}: { imports = [ - ./packages.nix - ./brew.nix - ./dock.nix - ./system.nix + ./packages.nix + ./brew.nix + ./dock.nix + ./system.nix ]; time.timeZone = "Europe/London"; } diff --git a/nixcfgs/hosts/zen/packages.nix b/nixcfgs/hosts/zen/packages.nix index 795bc1c..c90985b 100644 --- a/nixcfgs/hosts/zen/packages.nix +++ b/nixcfgs/hosts/zen/packages.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: - { + config, + pkgs, + ... +}: { # Managed by Determinate nix.enable = false; system.stateVersion = 6; @@ -51,5 +53,4 @@ ]; programs.zsh.enable = true; - } diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index 4999d02..487c0de 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -1,6 +1,5 @@ # ~/.config/nixcfgs/hosts/zephyrus/default.nix -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ # Host-specific configs ./asus.nix @@ -23,6 +22,7 @@ # desktop environment and display manager ../../modules/nixos/desktop/dm/gdm.nix ../../modules/nixos/desktop/de/gnome.nix + ../../modules/nixos/desktop/de/niri.nix # desktop programs ../../modules/nixos/programs/chromium.nix diff --git a/nixcfgs/hosts/zephyrus/hardware-configuration.nix b/nixcfgs/hosts/zephyrus/hardware-configuration.nix index d944f05..6feef78 100644 --- a/nixcfgs/hosts/zephyrus/hardware-configuration.nix +++ b/nixcfgs/hosts/zephyrus/hardware-configuration.nix @@ -1,50 +1,53 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/ed71c463-1cf6-449d-9aa8-ed715fe7ad74"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/ed71c463-1cf6-449d-9aa8-ed715fe7ad74"; + fsType = "btrfs"; + options = ["subvol=@"]; + }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/ed71c463-1cf6-449d-9aa8-ed715fe7ad74"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/ed71c463-1cf6-449d-9aa8-ed715fe7ad74"; + fsType = "btrfs"; + options = ["subvol=@home"]; + }; - fileSystems."/swap" = - { device = "/dev/disk/by-uuid/ed71c463-1cf6-449d-9aa8-ed715fe7ad74"; - fsType = "btrfs"; - options = [ "subvol=@swap" ]; - }; + fileSystems."/swap" = { + device = "/dev/disk/by-uuid/ed71c463-1cf6-449d-9aa8-ed715fe7ad74"; + fsType = "btrfs"; + options = ["subvol=@swap"]; + }; - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/ed71c463-1cf6-449d-9aa8-ed715fe7ad74"; - fsType = "btrfs"; - options = [ "subvol=@nix" ]; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/ed71c463-1cf6-449d-9aa8-ed715fe7ad74"; + fsType = "btrfs"; + options = ["subvol=@nix"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/0BDA-B0A4"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/0BDA-B0A4"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/nixcfgs/hosts/zephyrus/keyd.nix b/nixcfgs/hosts/zephyrus/keyd.nix index 30c321c..28d2ba2 100644 --- a/nixcfgs/hosts/zephyrus/keyd.nix +++ b/nixcfgs/hosts/zephyrus/keyd.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { environment.systemPackages = with pkgs; [ keyd ]; @@ -9,7 +7,7 @@ enable = true; keyboards = { externalKeyboard = { - ids = [ "0b05:19b6:d167885d" ]; # ASUS Keyboard + ids = ["0b05:19b6:d167885d"]; # ASUS Keyboard settings = { main = { capslock = "overload(control, esc)"; diff --git a/nixcfgs/hosts/zp/default.nix b/nixcfgs/hosts/zp/default.nix index cbc54aa..dc90855 100644 --- a/nixcfgs/hosts/zp/default.nix +++ b/nixcfgs/hosts/zp/default.nix @@ -1,29 +1,29 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ config, lib, pkgs, ... }: - { - imports = - [ # Include the results of the hardware scan. - ../common/nixos.nix - ../common/desktop-linux.nix - ../common/packages-fonts.nix - ../common/packages-desktop.nix - ../common/packages-headless.nix - ../common/nvidia.nix - ../common/flatpak.nix - ../common/wine.nix - ../common/firefox.nix - ../common/gnome.nix - ../common/docker.nix - ]; - + config, + lib, + pkgs, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ../common/nixos.nix + ../common/desktop-linux.nix + ../common/packages-fonts.nix + ../common/packages-desktop.nix + ../common/packages-headless.nix + ../common/nvidia.nix + ../common/flatpak.nix + ../common/wine.nix + ../common/firefox.nix + ../common/gnome.nix + ../common/docker.nix + ]; networking.hostName = "zp"; # Define your hostname. - # This option defines the first version of NixOS you have installed on this particular machine, # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. # @@ -42,6 +42,4 @@ # # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "25.05"; # Did you read the comment? - } - diff --git a/nixcfgs/modules/home/dev/java.nix b/nixcfgs/modules/home/dev/java.nix index 052d2a1..9807cbf 100644 --- a/nixcfgs/modules/home/dev/java.nix +++ b/nixcfgs/modules/home/dev/java.nix @@ -8,5 +8,5 @@ vscjava.vscode-spring-initializr vscjava.vscode-java-pack ]; - programs.zed-editor.extensions = [ "java" ]; + programs.zed-editor.extensions = ["java"]; } diff --git a/nixcfgs/modules/home/dev/lua.nix b/nixcfgs/modules/home/dev/lua.nix index 87d587b..96eaf92 100644 --- a/nixcfgs/modules/home/dev/lua.nix +++ b/nixcfgs/modules/home/dev/lua.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ luajit lua-language-server @@ -8,5 +7,5 @@ programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [ sumneko.lua ]; - programs.zed-editor.extensions = [ "lua" ]; + programs.zed-editor.extensions = ["lua"]; } diff --git a/nixcfgs/modules/home/dev/nix.nix b/nixcfgs/modules/home/dev/nix.nix index 579d455..f88c3f7 100644 --- a/nixcfgs/modules/home/dev/nix.nix +++ b/nixcfgs/modules/home/dev/nix.nix @@ -9,5 +9,5 @@ jnoortheen.nix-ide ]; - programs.zed-editor.extensions = [ "nix" ]; + programs.zed-editor.extensions = ["nix"]; } diff --git a/nixcfgs/modules/home/programs/lsd.nix b/nixcfgs/modules/home/programs/lsd.nix index 3837132..921f243 100644 --- a/nixcfgs/modules/home/programs/lsd.nix +++ b/nixcfgs/modules/home/programs/lsd.nix @@ -8,4 +8,3 @@ enableZshIntegration = true; }; } - diff --git a/nixcfgs/modules/home/programs/winboat.nix b/nixcfgs/modules/home/programs/winboat.nix index 8903db6..0e015a0 100644 --- a/nixcfgs/modules/home/programs/winboat.nix +++ b/nixcfgs/modules/home/programs/winboat.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: -{ - +{pkgs, ...}: { home.packages = with pkgs; [ freerdp winboat diff --git a/nixcfgs/modules/nixos/core/configuration.nix b/nixcfgs/modules/nixos/core/configuration.nix index 0a0453d..ae76b25 100644 --- a/nixcfgs/modules/nixos/core/configuration.nix +++ b/nixcfgs/modules/nixos/core/configuration.nix @@ -3,7 +3,6 @@ pkgs, ... }: { - # Select internationalisation properties. i18n = { defaultLocale = "en_GB.UTF-8"; diff --git a/nixcfgs/modules/nixos/desktop/de/kde.nix b/nixcfgs/modules/nixos/desktop/de/kde.nix index 233c652..d78ccc0 100644 --- a/nixcfgs/modules/nixos/desktop/de/kde.nix +++ b/nixcfgs/modules/nixos/desktop/de/kde.nix @@ -5,4 +5,5 @@ korganizer kdepim-addons ]; + services.xserver.desktopManager.cinnamon.enable = true; } diff --git a/nixcfgs/modules/nixos/desktop/de/niri.nix b/nixcfgs/modules/nixos/desktop/de/niri.nix index 7508653..5916b1c 100644 --- a/nixcfgs/modules/nixos/desktop/de/niri.nix +++ b/nixcfgs/modules/nixos/desktop/de/niri.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { programs.niri.enable = true; environment.systemPackages = with pkgs; [ waybar diff --git a/nixcfgs/modules/nixos/desktop/dm/gdm.nix b/nixcfgs/modules/nixos/desktop/dm/gdm.nix index a046d4b..0bb9414 100644 --- a/nixcfgs/modules/nixos/desktop/dm/gdm.nix +++ b/nixcfgs/modules/nixos/desktop/dm/gdm.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { services.displayManager.gdm = { enable = true; wayland = true; diff --git a/nixcfgs/modules/nixos/desktop/dm/sddm.nix b/nixcfgs/modules/nixos/desktop/dm/sddm.nix index b654af2..7c5c6ff 100644 --- a/nixcfgs/modules/nixos/desktop/dm/sddm.nix +++ b/nixcfgs/modules/nixos/desktop/dm/sddm.nix @@ -1,5 +1,4 @@ {pkgs, ...}: - # See https://www.reddit.com/r/NixOS/comments/1kcj34p/how_to_apply_this_sddm_theme_on_nixos/ let custom-sddm-astronaut = pkgs.sddm-astronaut.override { @@ -9,14 +8,13 @@ let # Font = "M+1 Nerd Font"; #}; }; - in { # Enable the KDE Plasma Desktop Environment. services.displayManager.sddm = { enable = true; extraPackages = with pkgs; [ custom-sddm-astronaut - ]; + ]; theme = "sddm-astronaut-theme"; settings = { @@ -30,5 +28,4 @@ in { custom-sddm-astronaut kdePackages.qtmultimedia ]; - } diff --git a/nixcfgs/modules/nixos/desktop/host-machine.nix b/nixcfgs/modules/nixos/desktop/host-machine.nix index efa604b..81a5c5f 100644 --- a/nixcfgs/modules/nixos/desktop/host-machine.nix +++ b/nixcfgs/modules/nixos/desktop/host-machine.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/nixcfgs/modules/nixos/hardware/nvidia-disable.nix b/nixcfgs/modules/nixos/hardware/nvidia-disable.nix index f8e6120..401cd93 100644 --- a/nixcfgs/modules/nixos/hardware/nvidia-disable.nix +++ b/nixcfgs/modules/nixos/hardware/nvidia-disable.nix @@ -1,11 +1,9 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { boot.extraModprobeConfig = '' blacklist nouveau options nouveau modeset=0 ''; - + services.udev.extraRules = '' # Remove NVIDIA USB xHCI Host Controller devices, if present ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1" @@ -16,8 +14,8 @@ # Remove NVIDIA VGA/3D controller devices ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1" ''; - services.xserver.videoDrivers = [ "modesetting" ]; - boot.blacklistedKernelModules = [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" ]; + services.xserver.videoDrivers = ["modesetting"]; + boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidia_drm" "nvidia_modeset"]; hardware.nvidia = { # enable = false; modesetting.enable = false; diff --git a/nixcfgs/modules/nixos/hardware/nvidia.nix b/nixcfgs/modules/nixos/hardware/nvidia.nix index 107192d..b65c5ad 100644 --- a/nixcfgs/modules/nixos/hardware/nvidia.nix +++ b/nixcfgs/modules/nixos/hardware/nvidia.nix @@ -2,10 +2,9 @@ hardware.nvidia = { open = false; }; - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.videoDrivers = ["nvidia"]; hardware.graphics = { enable = true; enable32Bit = true; }; } - diff --git a/nixcfgs/modules/nixos/programs/chromium.nix b/nixcfgs/modules/nixos/programs/chromium.nix index 3a9170c..d5f3b82 100644 --- a/nixcfgs/modules/nixos/programs/chromium.nix +++ b/nixcfgs/modules/nixos/programs/chromium.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { programs.chromium = { enable = true; homepageLocation = "https://duckduckgo.com"; diff --git a/nixcfgs/modules/nixos/programs/waydroid.nix b/nixcfgs/modules/nixos/programs/waydroid.nix index cc42c6b..1f8c74a 100644 --- a/nixcfgs/modules/nixos/programs/waydroid.nix +++ b/nixcfgs/modules/nixos/programs/waydroid.nix @@ -1,5 +1,8 @@ -{ pkgs, inputs, ... }: { + pkgs, + inputs, + ... +}: { virtualisation.waydroid.enable = true; nixpkgs.overlays = [ inputs.nur.overlays.default @@ -11,9 +14,9 @@ waydroid-helper ]; systemd = { - packages = [ pkgs.waydroid-helper ]; + packages = [pkgs.waydroid-helper]; services.waydroid-mount = { - wantedBy = [ "multi-user.target" ]; + wantedBy = ["multi-user.target"]; serviceConfig = { ExecStart = "${pkgs.waydroid-helper}/bin/waydroid-helper --start-mount"; }; diff --git a/nixcfgs/modules/nixos/services/exp.nix b/nixcfgs/modules/nixos/services/exp.nix index 71b0798..ad7a3b7 100644 --- a/nixcfgs/modules/nixos/services/exp.nix +++ b/nixcfgs/modules/nixos/services/exp.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.syncthing.enable = true; services.tailscale.enable = true; } diff --git a/nixcfgs/users/js0ny/default.nix b/nixcfgs/users/js0ny/default.nix index 185e6d2..182ec3b 100644 --- a/nixcfgs/users/js0ny/default.nix +++ b/nixcfgs/users/js0ny/default.nix @@ -1,11 +1,12 @@ # ~/.config/nixcfgs/users/js0ny/default.nix -{ pkgs, ... }: -let +{pkgs, ...}: let username = "js0ny"; -in -{ +in { home.username = username; - home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/${username}" else "/home/${username}"; + home.homeDirectory = + if pkgs.stdenv.isDarwin + then "/Users/${username}" + else "/home/${username}"; home.packages = with pkgs; [ home-manager diff --git a/nixcfgs/users/js0ny/packages/catppuccin.nix b/nixcfgs/users/js0ny/packages/catppuccin.nix index 67bee4e..2240190 100644 --- a/nixcfgs/users/js0ny/packages/catppuccin.nix +++ b/nixcfgs/users/js0ny/packages/catppuccin.nix @@ -1,20 +1,17 @@ -{ pkgs, ... }: -let +{pkgs, ...}: let my-catppuccin-kde = pkgs.catppuccin-kde.override { flavour = [ "mocha" "latte" ]; - accents = [ "pink" ]; - winDecStyles = [ "classic" ]; + accents = ["pink"]; + winDecStyles = ["classic"]; }; my-catppuccin-gtk = pkgs.catppuccin-gtk.override { - accents = [ "pink" ]; + accents = ["pink"]; variant = "mocha"; }; -in -{ - +in { home.packages = with pkgs; [ catppuccin my-catppuccin-gtk diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index df68a1c..2b33543 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -1,6 +1,5 @@ # ~/.config/nix-config/common/packages-headless.nix -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ rclone age diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 141fab8..6539745 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ # Terminal Emulator ghostty # default diff --git a/nixcfgs/users/js0ny/programs/chromium.nix b/nixcfgs/users/js0ny/programs/chromium.nix index 6bd36d3..b406b83 100644 --- a/nixcfgs/users/js0ny/programs/chromium.nix +++ b/nixcfgs/users/js0ny/programs/chromium.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { programs.chromium = { enable = true; commandLineArgs = [ @@ -9,12 +8,12 @@ "--ozone-platform-hint=auto" ]; extensions = [ - { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # ublock origin - { id = "ghmbeldphafepmbegfdlkpapadhbakde"; } # proton pass - { id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; } # dark reader - { id = "gfbliohnnapiefjpjlpjnehglfpaknnc"; } # surfingkeys - { id = "bpoadfkcbjbfhfodiogcnhhhpibjhbnh"; } # immersive translate - { id = "dhdgffkkebhmkfjojejmpbldmpobfkfo"; } # tampermonkey + {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin + {id = "ghmbeldphafepmbegfdlkpapadhbakde";} # proton pass + {id = "eimadpbcbfnmbkopoojfekhnkhdbieeh";} # dark reader + {id = "gfbliohnnapiefjpjlpjnehglfpaknnc";} # surfingkeys + {id = "bpoadfkcbjbfhfodiogcnhhhpibjhbnh";} # immersive translate + {id = "dhdgffkkebhmkfjojejmpbldmpobfkfo";} # tampermonkey ]; }; } diff --git a/nixcfgs/users/js0ny/programs/gnome/default.nix b/nixcfgs/users/js0ny/programs/gnome/default.nix index 9c4b798..ef04582 100644 --- a/nixcfgs/users/js0ny/programs/gnome/default.nix +++ b/nixcfgs/users/js0ny/programs/gnome/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.sessionVariables = { QT_STYLE_OVERRIDE = "adwaita"; }; @@ -27,15 +26,15 @@ programs.gnome-shell.enable = true; programs.gnome-shell.extensions = [ # { package = pkgs.gnomeExtensions.dash-to-dock; } - { package = pkgs.gnomeExtensions.caffeine; } - { package = pkgs.gnomeExtensions.logo-menu; } - { package = pkgs.gnomeExtensions.kimpanel; } - { package = pkgs.gnomeExtensions.appindicator; } - { package = pkgs.gnomeExtensions.gsconnect; } - { package = pkgs.gnomeExtensions.clipboard-indicator; } - { package = pkgs.gnomeExtensions.advanced-alttab-window-switcher; } - { package = pkgs.gnomeExtensions.resource-monitor; } - { package = pkgs.gnomeExtensions.lunar-calendar; } + {package = pkgs.gnomeExtensions.caffeine;} + {package = pkgs.gnomeExtensions.logo-menu;} + {package = pkgs.gnomeExtensions.kimpanel;} + {package = pkgs.gnomeExtensions.appindicator;} + {package = pkgs.gnomeExtensions.gsconnect;} + {package = pkgs.gnomeExtensions.clipboard-indicator;} + {package = pkgs.gnomeExtensions.advanced-alttab-window-switcher;} + {package = pkgs.gnomeExtensions.resource-monitor;} + {package = pkgs.gnomeExtensions.lunar-calendar;} ]; dconf.settings = { @@ -62,8 +61,8 @@ ]; }; "org/gnome/shell/keybindings" = { - toggle-overview = [ "w" ]; - toggle-message-tray = [ "n" ]; + toggle-overview = ["w"]; + toggle-message-tray = ["n"]; # G14 Compatibility show-screenshot-ui = [ "s" @@ -71,17 +70,17 @@ ]; }; "org/gnome/desktop/wm/keybindings" = { - activate-window-menu = [ "F3" ]; - show-desktop = [ "d" ]; + activate-window-menu = ["F3"]; + show-desktop = ["d"]; close = [ "q" "F4" ]; - switch-windows = [ "Tab" ]; - switch-windows-backward = [ "Tab" ]; - switch-applications = [ "Tab" ]; - switch-applications-backward = [ "Tab" ]; - minimize = [ "m" ]; + switch-windows = ["Tab"]; + switch-windows-backward = ["Tab"]; + switch-applications = ["Tab"]; + switch-applications-backward = ["Tab"]; + minimize = ["m"]; maximize = [ "m" "Up" @@ -98,7 +97,7 @@ ]; }; "org/gnome/settings-daemon/plugins/media-keys" = { - www = [ "b" ]; + www = ["b"]; }; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-0" = { name = "Open File Explorer"; @@ -143,7 +142,7 @@ use-custom-icon = false; }; "org/gnome/shell/extensions/clipboard-indicator" = { - toggle-menu = [ "v" ]; + toggle-menu = ["v"]; }; "org/gnome/shell/extensions/lunar-calendar" = { yuyan = 0; diff --git a/nixcfgs/users/js0ny/programs/gnome/paperwm.nix b/nixcfgs/users/js0ny/programs/gnome/paperwm.nix index 27199b8..906284e 100644 --- a/nixcfgs/users/js0ny/programs/gnome/paperwm.nix +++ b/nixcfgs/users/js0ny/programs/gnome/paperwm.nix @@ -1,14 +1,13 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs.gnomeExtensions; [ paperwm ]; programs.gnome-shell.extensions = [ - { package = pkgs.gnomeExtensions.paperwm; } + {package = pkgs.gnomeExtensions.paperwm;} ]; dconf.settings = { "org/gnome/settings-daemon/plugins/media-keys" = { - screensaver = [ "" ]; + screensaver = [""]; }; "org/gnome/shell/extensions/paperwm/keybindings" = { switch-left = [ @@ -47,11 +46,11 @@ "Left" "j" ]; - center-vertically = [ "" ]; - drift-left = [ "" ]; - drift-right = [ "" ]; - move-up-workspace = [ "k" ]; - move-down-workspace = [ "j" ]; + center-vertically = [""]; + drift-left = [""]; + drift-right = [""]; + move-up-workspace = ["k"]; + move-down-workspace = ["j"]; }; }; } diff --git a/nixcfgs/users/js0ny/programs/plasma.nix b/nixcfgs/users/js0ny/programs/plasma.nix index 134e719..e07ef10 100644 --- a/nixcfgs/users/js0ny/programs/plasma.nix +++ b/nixcfgs/users/js0ny/programs/plasma.nix @@ -106,6 +106,7 @@ "org.kde.plasma.pager" "org.kde.plasma.windowlist" "org.kde.plasma.marginsseparator" + "org.kde.plasma.systemmonitor.memory" ]; opacity = "translucent"; hiding = "none"; diff --git a/nixcfgs/users/js0ny/programs/sdcv.nix b/nixcfgs/users/js0ny/programs/sdcv.nix new file mode 100644 index 0000000..023edad --- /dev/null +++ b/nixcfgs/users/js0ny/programs/sdcv.nix @@ -0,0 +1,19 @@ +# TODO +{pkgs}: let + dictBz2 = [ + { + url = "http://download.huzheng.org/zh_CN/stardict-langdao-ec-gb-2.4.2.tar.bz2"; + sha256 = "68adfd6348418725b1810b5aeda2506ce44ddbc1ad99f2f68f6ba135cd3bf03c"; + } + ]; + fetchedArchives = map (spec: + pkgs.fetchurl { + url = spec.url; + sha256 = spec.sha256; + }) + dictBz2; +in { + home.packages = with pkgs; [ + sdcv + ]; +} diff --git a/nixcfgs/users/js0ny/programs/zed-editor.nix b/nixcfgs/users/js0ny/programs/zed-editor.nix index acf8427..6196f5a 100644 --- a/nixcfgs/users/js0ny/programs/zed-editor.nix +++ b/nixcfgs/users/js0ny/programs/zed-editor.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { programs.zed-editor = { enable = true; extensions = [ diff --git a/nixcfgs/users/js0ny/zen.nix b/nixcfgs/users/js0ny/zen.nix index 68db3b5..32c1733 100644 --- a/nixcfgs/users/js0ny/zen.nix +++ b/nixcfgs/users/js0ny/zen.nix @@ -1,5 +1,4 @@ -{...}: -{ +{...}: { imports = [ ./default.nix ./programs/shell.nix @@ -14,5 +13,3 @@ home.stateVersion = "25.05"; } - - diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index ac9b9fd..a137702 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -1,6 +1,5 @@ # ~/.config/nixcfgs/users/js0ny/default.nix -{ ... }: -{ +{...}: { imports = [ # General config ./default.nix