js0ny/dotfiles
1
0
Fork 0
mirror of https://github.com/js0ny/dotfiles.git synced 2025-12-21 00:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

format nix with alejandra

Browse source
This commit is contained in:
js0ny 2025-10-24 22:41:27 +01:00
parent e1cc141ce7
commit 2b498c9fd3
37 changed files with 183 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixcfgs/hosts/nixvirt/default.nix
View file

@ -5,8 +5,7 @@
pkgs,
nix-flatpak,
...
}:
{
}: {
imports = [
# impure build
/etc/nixos/hardware-configuration.nix

7
nixcfgs/hosts/zen/brew.nix
View file

@ -1,6 +1,8 @@
{ config, pkgs, ...}:
{
config,
pkgs,
...
}: {
homebrew = {
enable = true;
brewPrefix = "/opt/homebrew/bin";
@ -65,5 +67,4 @@
"font-maple-mono-nf-cn"
];
};
}

11
nixcfgs/hosts/zen/default.nix
View file

@ -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";
}

7
nixcfgs/hosts/zen/packages.nix
View file

@ -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;
}

4
nixcfgs/hosts/zephyrus/default.nix
View file

@ -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

75
nixcfgs/hosts/zephyrus/hardware-configuration.nix
View file

@ -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

6
nixcfgs/hosts/zephyrus/keyd.nix
View file

@ -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)";

40
nixcfgs/hosts/zp/default.nix
View file

@ -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?
}

2
nixcfgs/modules/home/dev/java.nix
View file

@ -8,5 +8,5 @@
vscjava.vscode-spring-initializr
vscjava.vscode-java-pack
];
programs.zed-editor.extensions = [ "java" ];
programs.zed-editor.extensions = ["java"];
}

5
nixcfgs/modules/home/dev/lua.nix
View file

@ -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"];
}

2
nixcfgs/modules/home/dev/nix.nix
View file

@ -9,5 +9,5 @@
jnoortheen.nix-ide
];
programs.zed-editor.extensions = [ "nix" ];
programs.zed-editor.extensions = ["nix"];
}

1
nixcfgs/modules/home/programs/lsd.nix
View file

@ -8,4 +8,3 @@
enableZshIntegration = true;
};
}

4
nixcfgs/modules/home/programs/winboat.nix
View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
freerdp
winboat

1
nixcfgs/modules/nixos/core/configuration.nix
View file

@ -3,7 +3,6 @@
pkgs,
...
}: {
# Select internationalisation properties.
i18n = {
defaultLocale = "en_GB.UTF-8";

1
nixcfgs/modules/nixos/desktop/de/kde.nix
View file

@ -5,4 +5,5 @@
korganizer
kdepim-addons
];
services.xserver.desktopManager.cinnamon.enable = true;
}

3
nixcfgs/modules/nixos/desktop/de/niri.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.niri.enable = true;
environment.systemPackages = with pkgs; [
waybar

4
nixcfgs/modules/nixos/desktop/dm/gdm.nix
View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.displayManager.gdm = {
enable = true;
wayland = true;

5
nixcfgs/modules/nixos/desktop/dm/sddm.nix
View file

@ -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
];
}

3
nixcfgs/modules/nixos/desktop/host-machine.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

10
nixcfgs/modules/nixos/hardware/nvidia-disable.nix
View file

@ -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;

3
nixcfgs/modules/nixos/hardware/nvidia.nix
View file

@ -2,10 +2,9 @@
hardware.nvidia = {
open = false;
};
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.videoDrivers = ["nvidia"];
hardware.graphics = {
enable = true;
enable32Bit = true;
};
}

3
nixcfgs/modules/nixos/programs/chromium.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
programs.chromium = {
enable = true;
homepageLocation = "https://duckduckgo.com";

9
nixcfgs/modules/nixos/programs/waydroid.nix
View file

@ -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";
};

3
nixcfgs/modules/nixos/services/exp.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
services.syncthing.enable = true;
services.tailscale.enable = true;
}

11
nixcfgs/users/js0ny/default.nix
View file

@ -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

13
nixcfgs/users/js0ny/packages/catppuccin.nix
View file

@ -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

3
nixcfgs/users/js0ny/packages/cli.nix
View file

@ -1,6 +1,5 @@
# ~/.config/nix-config/common/packages-headless.nix
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
rclone
age

3
nixcfgs/users/js0ny/packages/gui.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
# Terminal Emulator
ghostty # default

15
nixcfgs/users/js0ny/programs/chromium.nix
View file

@ -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
];
};
}

43
nixcfgs/users/js0ny/programs/gnome/default.nix
View file

@ -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 = [ "<Super>w" ];
toggle-message-tray = [ "<Super>n" ];
toggle-overview = ["<Super>w"];
toggle-message-tray = ["<Super>n"];
# G14 Compatibility
show-screenshot-ui = [
"<Shift><Super>s"
@ -71,17 +70,17 @@
];
};
"org/gnome/desktop/wm/keybindings" = {
activate-window-menu = [ "<Alt>F3" ];
show-desktop = [ "<Super>d" ];
activate-window-menu = ["<Alt>F3"];
show-desktop = ["<Super>d"];
close = [
"<Super>q"
"<Alt>F4"
];
switch-windows = [ "<Alt>Tab" ];
switch-windows-backward = [ "<Shift><Alt>Tab" ];
switch-applications = [ "<Super>Tab" ];
switch-applications-backward = [ "<Shift><Super>Tab" ];
minimize = [ "<Super>m" ];
switch-windows = ["<Alt>Tab"];
switch-windows-backward = ["<Shift><Alt>Tab"];
switch-applications = ["<Super>Tab"];
switch-applications-backward = ["<Shift><Super>Tab"];
minimize = ["<Super>m"];
maximize = [
"<Shift><Super>m"
"<Super>Up"
@ -98,7 +97,7 @@
];
};
"org/gnome/settings-daemon/plugins/media-keys" = {
www = [ "<Super>b" ];
www = ["<Super>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 = [ "<Super>v" ];
toggle-menu = ["<Super>v"];
};
"org/gnome/shell/extensions/lunar-calendar" = {
yuyan = 0;

17
nixcfgs/users/js0ny/programs/gnome/paperwm.nix
View file

@ -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 @@
"<Control><Super>Left"
"<Shift><Super>j"
];
center-vertically = [ "" ];
drift-left = [ "" ];
drift-right = [ "" ];
move-up-workspace = [ "<Alt><Super>k" ];
move-down-workspace = [ "<Alt><Super>j" ];
center-vertically = [""];
drift-left = [""];
drift-right = [""];
move-up-workspace = ["<Control><Super>k"];
move-down-workspace = ["<Control><Super>j"];
};
};
}

1
nixcfgs/users/js0ny/programs/plasma.nix
View file

@ -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";

19
nixcfgs/users/js0ny/programs/sdcv.nix Normal file
View file

@ -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
];
}

3
nixcfgs/users/js0ny/programs/zed-editor.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.zed-editor = {
enable = true;
extensions = [

5
nixcfgs/users/js0ny/zen.nix
View file

@ -1,5 +1,4 @@
{...}:
{
{...}: {
imports = [
./default.nix
./programs/shell.nix
@ -14,5 +13,3 @@
home.stateVersion = "25.05";
}

3
nixcfgs/users/js0ny/zephyrus.nix
View file

@ -1,6 +1,5 @@
# ~/.config/nixcfgs/users/js0ny/default.nix
{ ... }:
{
{...}: {
imports = [
# General config
./default.nix