style: format all nix files with nixfmt
This commit is contained in:
@@ -17,29 +17,38 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, nixvim, ... }@inputs:
|
outputs =
|
||||||
let
|
{
|
||||||
mkHost = hostName: nixpkgs.lib.nixosSystem {
|
nixpkgs,
|
||||||
system = "x86_64-linux";
|
home-manager,
|
||||||
specialArgs = { inherit inputs; };
|
nixvim,
|
||||||
modules = [
|
...
|
||||||
./hosts/${hostName}/hardware-configuration.nix
|
}@inputs:
|
||||||
./hosts/${hostName}/configuration.nix
|
let
|
||||||
home-manager.nixosModules.home-manager
|
mkHost =
|
||||||
{
|
hostName:
|
||||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
nixpkgs.lib.nixosSystem {
|
||||||
home-manager.users.aaron.imports = [
|
system = "x86_64-linux";
|
||||||
nixvim.homeModules.nixvim
|
specialArgs = { inherit inputs; };
|
||||||
./users/aaron/home.nix
|
modules = [
|
||||||
|
./hosts/${hostName}/hardware-configuration.nix
|
||||||
|
./hosts/${hostName}/configuration.nix
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
|
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||||
|
home-manager.users.aaron.imports = [
|
||||||
|
nixvim.homeModules.nixvim
|
||||||
|
./users/aaron/home.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
}
|
};
|
||||||
];
|
in
|
||||||
|
{
|
||||||
|
nixosConfigurations = {
|
||||||
|
default = mkHost "default";
|
||||||
|
neon = mkHost "neon";
|
||||||
|
argon = mkHost "argon";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
in {
|
|
||||||
nixosConfigurations = {
|
|
||||||
default = mkHost "default";
|
|
||||||
neon = mkHost "neon";
|
|
||||||
argon = mkHost "argon";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,4 +32,3 @@
|
|||||||
# install state version
|
# install state version
|
||||||
system.stateVersion = "25.11"; # Don't change
|
system.stateVersion = "25.11"; # Don't change
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,38 +1,54 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"nvme"
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usbhid"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ "dm-crypt dm-mod" ];
|
boot.initrd.kernelModules = [ "dm-crypt dm-mod" ];
|
||||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
|
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
|
||||||
boot.kernelModules = [ ];
|
boot.kernelModules = [ ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/mapper/lvmroot-root";
|
device = "/dev/mapper/lvmroot-root";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/AC1C-20EB";
|
device = "/dev/disk/by-uuid/AC1C-20EB";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
options = [
|
||||||
};
|
"fmask=0022"
|
||||||
|
"dmask=0022"
|
||||||
fileSystems."/home" =
|
|
||||||
{ device = "/dev/mapper/lvmroot-home";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/mapper/lvmroot-swap"; }
|
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/home" = {
|
||||||
|
device = "/dev/mapper/lvmroot-home";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/mapper/lvmroot-swap"; }
|
||||||
|
];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|||||||
@@ -4,7 +4,10 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
# use flakes
|
# use flakes
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
|
|
||||||
# configure bootloader
|
# configure bootloader
|
||||||
boot.loader.systemd-boot.enable = false;
|
boot.loader.systemd-boot.enable = false;
|
||||||
@@ -60,9 +63,10 @@
|
|||||||
|
|
||||||
windowManager.qtile = {
|
windowManager.qtile = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = python3Packages: with python3Packages; [
|
extraPackages =
|
||||||
qtile-extras
|
python3Packages: with python3Packages; [
|
||||||
];
|
qtile-extras
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -71,8 +75,8 @@
|
|||||||
|
|
||||||
# enable sound
|
# enable sound
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# define a user account
|
# define a user account
|
||||||
@@ -97,7 +101,10 @@
|
|||||||
autosuggestions.enable = true;
|
autosuggestions.enable = true;
|
||||||
ohMyZsh = {
|
ohMyZsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ "git" "sudo" ];
|
plugins = [
|
||||||
|
"git"
|
||||||
|
"sudo"
|
||||||
|
];
|
||||||
theme = "agnoster";
|
theme = "agnoster";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -116,8 +123,8 @@
|
|||||||
# Some programs need SUID wrappers
|
# Some programs need SUID wrappers
|
||||||
programs.mtr.enable = true;
|
programs.mtr.enable = true;
|
||||||
programs.gnupg.agent = {
|
programs.gnupg.agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableSSHSupport = true;
|
enableSSHSupport = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# enable the OpenSSH daemon
|
# enable the OpenSSH daemon
|
||||||
@@ -130,4 +137,3 @@
|
|||||||
# install state version
|
# install state version
|
||||||
system.stateVersion = "25.05"; # Don't change
|
system.stateVersion = "25.05"; # Don't change
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,36 +1,56 @@
|
|||||||
# 0x29a nixos hardware configuration
|
# 0x29a nixos hardware configuration
|
||||||
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
(modulesPath + "/profiles/qemu-guest.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
# boot and initrd configs
|
# boot and initrd configs
|
||||||
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
boot.initrd.availableKernelModules = [
|
||||||
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
|
"uhci_hcd"
|
||||||
|
"ehci_pci"
|
||||||
|
"ahci"
|
||||||
|
"virtio_pci"
|
||||||
|
"virtio_scsi"
|
||||||
|
"sd_mod"
|
||||||
|
"sr_mod"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [
|
||||||
|
"dm-snapshot"
|
||||||
|
"cryptd"
|
||||||
|
];
|
||||||
boot.kernelModules = [ ];
|
boot.kernelModules = [ ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
|
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
|
||||||
|
|
||||||
# file systems
|
# file systems
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-label/nixroot";
|
device = "/dev/disk/by-label/nixroot";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-label/nixboot";
|
device = "/dev/disk/by-label/nixboot";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
options = [
|
||||||
};
|
"fmask=0022"
|
||||||
fileSystems."/home" =
|
"dmask=0022"
|
||||||
{ device = "/dev/disk/by-label/nixhome";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-label/nixswap"; }
|
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
fileSystems."/home" = {
|
||||||
|
device = "/dev/disk/by-label/nixhome";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/disk/by-label/nixswap"; }
|
||||||
|
];
|
||||||
|
|
||||||
# enable dhcp on all interfaces
|
# enable dhcp on all interfaces
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
|||||||
@@ -50,12 +50,16 @@
|
|||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ "git" "sudo" "python" "ansible" ];
|
plugins = [
|
||||||
|
"git"
|
||||||
|
"sudo"
|
||||||
|
"python"
|
||||||
|
"ansible"
|
||||||
|
];
|
||||||
theme = "agnoster";
|
theme = "agnoster";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
## deploy qtile config
|
## deploy qtile config
|
||||||
#home.file."qtile-config" = {
|
#home.file."qtile-config" = {
|
||||||
# target = ".config/qtile/config.py";
|
# target = ".config/qtile/config.py";
|
||||||
|
|||||||
@@ -29,4 +29,3 @@
|
|||||||
# install state version
|
# install state version
|
||||||
system.stateVersion = "25.11"; # Don't change
|
system.stateVersion = "25.11"; # Don't change
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,39 +1,57 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
boot.initrd.availableKernelModules = [
|
||||||
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
|
"xhci_pci"
|
||||||
|
"nvme"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
"rtsx_pci_sdmmc"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [
|
||||||
|
"dm-snapshot"
|
||||||
|
"cryptd"
|
||||||
|
];
|
||||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
|
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
|
||||||
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-label/nixroot";
|
device = "/dev/disk/by-label/nixroot";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-label/nixboot";
|
device = "/dev/disk/by-label/nixboot";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
options = [
|
||||||
};
|
"fmask=0022"
|
||||||
|
"dmask=0022"
|
||||||
fileSystems."/home" =
|
|
||||||
{ device = "/dev/disk/by-label/nixhome";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-label/nixswap"; }
|
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/home" = {
|
||||||
|
device = "/dev/disk/by-label/nixhome";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/disk/by-label/nixswap"; }
|
||||||
|
];
|
||||||
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
email = "aaron@0x29a.ch";
|
email = "aaron@0x29a.ch";
|
||||||
@@ -14,15 +19,18 @@ in
|
|||||||
{
|
{
|
||||||
# gitea verifies signatures against the account keys, this teaches the local
|
# gitea verifies signatures against the account keys, this teaches the local
|
||||||
# git the same trust so `git log --show-signature` resolves as well
|
# git the same trust so `git log --show-signature` resolves as well
|
||||||
xdg.configFile."git/allowed_signers".text =
|
xdg.configFile."git/allowed_signers".text = lib.concatMapStrings (
|
||||||
lib.concatMapStrings (key: "${email} ${key}\n") signingKeys;
|
key: "${email} ${key}\n"
|
||||||
|
) signingKeys;
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
push = { autoSetupRemote = true; };
|
push = {
|
||||||
|
autoSetupRemote = true;
|
||||||
|
};
|
||||||
user = {
|
user = {
|
||||||
name = "aaron";
|
name = "aaron";
|
||||||
inherit email;
|
inherit email;
|
||||||
};
|
};
|
||||||
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
|
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
servers.pyright.enable = true;
|
servers.pyright.enable = true;
|
||||||
servers.ruff.enable = true;
|
servers.ruff.enable = true;
|
||||||
keymaps.lspBuf = {
|
keymaps.lspBuf = {
|
||||||
"<leader>K" = "hover";
|
"<leader>K" = "hover";
|
||||||
"<leader>gd" = "definition";
|
"<leader>gd" = "definition";
|
||||||
"<leader>gr" = "references";
|
"<leader>gr" = "references";
|
||||||
"<leader>f" = "format";
|
"<leader>f" = "format";
|
||||||
@@ -67,7 +67,11 @@
|
|||||||
};
|
};
|
||||||
plugins.treesitter = {
|
plugins.treesitter = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.ensure_installed = [ "markdown" "markdown_inline" "typst" ];
|
settings.ensure_installed = [
|
||||||
|
"markdown"
|
||||||
|
"markdown_inline"
|
||||||
|
"typst"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
plugins.typst-preview = {
|
plugins.typst-preview = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -87,7 +91,11 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
# render in normal mode, raw source in insert
|
# render in normal mode, raw source in insert
|
||||||
render_modes = [ "n" "c" "t"];
|
render_modes = [
|
||||||
|
"n"
|
||||||
|
"c"
|
||||||
|
"t"
|
||||||
|
];
|
||||||
pipe_table.preset = "round";
|
pipe_table.preset = "round";
|
||||||
heading.width = "block";
|
heading.width = "block";
|
||||||
file_types = [ "markdown" ];
|
file_types = [ "markdown" ];
|
||||||
|
|||||||
@@ -73,9 +73,22 @@
|
|||||||
radius = 0;
|
radius = 0;
|
||||||
scale = 1.2;
|
scale = 1.2;
|
||||||
widget_spacing = 20;
|
widget_spacing = 20;
|
||||||
start = [ "control-center" "cpu" "ram" "temp" "active_window" ];
|
start = [
|
||||||
|
"control-center"
|
||||||
|
"cpu"
|
||||||
|
"ram"
|
||||||
|
"temp"
|
||||||
|
"active_window"
|
||||||
|
];
|
||||||
center = [ "workspaces" ];
|
center = [ "workspaces" ];
|
||||||
end = [ "tray" "bluetooth" "notifications" "volume" "network" "clock" ];
|
end = [
|
||||||
|
"tray"
|
||||||
|
"bluetooth"
|
||||||
|
"notifications"
|
||||||
|
"volume"
|
||||||
|
"network"
|
||||||
|
"clock"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -103,7 +116,11 @@
|
|||||||
|
|
||||||
# idle behavior
|
# idle behavior
|
||||||
idle = {
|
idle = {
|
||||||
behavior_order = [ "screen-off" "lock" "lock-and-suspend" ];
|
behavior_order = [
|
||||||
|
"screen-off"
|
||||||
|
"lock"
|
||||||
|
"lock-and-suspend"
|
||||||
|
];
|
||||||
behavior = {
|
behavior = {
|
||||||
"screen-off" = {
|
"screen-off" = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
|
|||||||
@@ -9,7 +9,11 @@
|
|||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# add git and agents as plugins
|
# add git and agents as plugins
|
||||||
plugins = [ "git" "ssh-agent" "gpg-agent" ];
|
plugins = [
|
||||||
|
"git"
|
||||||
|
"ssh-agent"
|
||||||
|
"gpg-agent"
|
||||||
|
];
|
||||||
# everything here lands before `source $ZSH/oh-my-zsh.sh`
|
# everything here lands before `source $ZSH/oh-my-zsh.sh`
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
# make omz faster on large repositories
|
# make omz faster on large repositories
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
theme = {
|
theme = {
|
||||||
name = "Adwaita-dark";
|
name = "Adwaita-dark";
|
||||||
package = pkgs.gnome-themes-extra;
|
package = pkgs.gnome-themes-extra;
|
||||||
};
|
};
|
||||||
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
|
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
|
||||||
gtk4.theme = null;
|
gtk4.theme = null;
|
||||||
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
|
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
|
||||||
|
|||||||
+30
-25
@@ -36,30 +36,35 @@ let
|
|||||||
wrapProgram $out/bin/siril \
|
wrapProgram $out/bin/siril \
|
||||||
--prefix PATH : /etc/siril/bin \
|
--prefix PATH : /etc/siril/bin \
|
||||||
--prefix QT_PLUGIN_PATH : ${pkgs.adwaita-qt6}/lib/qt-6/plugins \
|
--prefix QT_PLUGIN_PATH : ${pkgs.adwaita-qt6}/lib/qt-6/plugins \
|
||||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [
|
--prefix LD_LIBRARY_PATH : ${
|
||||||
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
|
lib.makeLibraryPath (
|
||||||
zlib
|
with pkgs;
|
||||||
zstd # libzstd.so.1 (PyQt6)
|
[
|
||||||
libGL # libGL.so.1 (PyQt6)
|
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
|
||||||
# PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
|
zlib
|
||||||
# on Wayland; libxkbcommon is the keymap lib used by Wayland too.
|
zstd # libzstd.so.1 (PyQt6)
|
||||||
glib
|
libGL # libGL.so.1 (PyQt6)
|
||||||
fontconfig
|
# PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
|
||||||
freetype
|
# on Wayland; libxkbcommon is the keymap lib used by Wayland too.
|
||||||
dbus
|
glib
|
||||||
libxkbcommon
|
fontconfig
|
||||||
# Qt platform plugins: the wayland plugin (libqwayland.so) needs the
|
freetype
|
||||||
# wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
|
dbus
|
||||||
wayland # libwayland-client/cursor/egl (wayland plugin)
|
libxkbcommon
|
||||||
libxcb-cursor # libxcb-cursor.so.0 (xcb plugin)
|
# Qt platform plugins: the wayland plugin (libqwayland.so) needs the
|
||||||
libx11
|
# wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
|
||||||
libxcb
|
wayland # libwayland-client/cursor/egl (wayland plugin)
|
||||||
libxcb-util
|
libxcb-cursor # libxcb-cursor.so.0 (xcb plugin)
|
||||||
libxcb-wm
|
libx11
|
||||||
libxcb-image
|
libxcb
|
||||||
libxcb-keysyms
|
libxcb-util
|
||||||
libxcb-render-util
|
libxcb-wm
|
||||||
])}
|
libxcb-image
|
||||||
|
libxcb-keysyms
|
||||||
|
libxcb-render-util
|
||||||
|
]
|
||||||
|
)
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
@@ -84,7 +89,7 @@ in
|
|||||||
# run it. Its own opencv/onnxruntime libs are found via the bundled ./lib.
|
# run it. Its own opencv/onnxruntime libs are found via the bundled ./lib.
|
||||||
programs.nix-ld.enable = true;
|
programs.nix-ld.enable = true;
|
||||||
programs.nix-ld.libraries = with pkgs; [
|
programs.nix-ld.libraries = with pkgs; [
|
||||||
stdenv.cc.cc.lib # libstdc++ / libgcc_s
|
stdenv.cc.cc.lib # libstdc++ / libgcc_s
|
||||||
zlib
|
zlib
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
# enable sound through pipewire
|
# enable sound through pipewire
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,10 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# kernel options
|
# kernel options
|
||||||
boot.kernelParams = [ "quiet" "acpi.debug_level=0" ];
|
boot.kernelParams = [
|
||||||
|
"quiet"
|
||||||
|
"acpi.debug_level=0"
|
||||||
|
];
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
boot.consoleLogLevel = 2;
|
boot.consoleLogLevel = 2;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ...}:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# add docker group to user
|
# add docker group to user
|
||||||
@@ -8,7 +8,10 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
# Customize Docker daemon settings
|
# Customize Docker daemon settings
|
||||||
daemon.settings = {
|
daemon.settings = {
|
||||||
dns = [ "1.1.1.1" "8.8.8.8" ];
|
dns = [
|
||||||
|
"1.1.1.1"
|
||||||
|
"8.8.8.8"
|
||||||
|
];
|
||||||
log-driver = "journald";
|
log-driver = "journald";
|
||||||
registry-mirrors = [ "https://mirror.gcr.io" ];
|
registry-mirrors = [ "https://mirror.gcr.io" ];
|
||||||
storage-driver = "overlay2";
|
storage-driver = "overlay2";
|
||||||
|
|||||||
@@ -3,7 +3,10 @@
|
|||||||
# nix settings
|
# nix settings
|
||||||
settings = {
|
settings = {
|
||||||
# enable flakes and nix-command
|
# enable flakes and nix-command
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
# auto-optimize my nix-store
|
# auto-optimize my nix-store
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
# use all cores
|
# use all cores
|
||||||
@@ -31,7 +34,10 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# add trusted users (able to modify the nix store)
|
# add trusted users (able to modify the nix store)
|
||||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
nix.settings.trusted-users = [
|
||||||
|
"root"
|
||||||
|
"@wheel"
|
||||||
|
];
|
||||||
|
|
||||||
# allow unfree packages (steam, protonvpn, discord, etc.)
|
# allow unfree packages (steam, protonvpn, discord, etc.)
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|||||||
@@ -5,7 +5,11 @@
|
|||||||
users.users.aaron = {
|
users.users.aaron = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
group = "users";
|
group = "users";
|
||||||
extraGroups = [ "wheel" "networkmanager" "dialout" ];
|
extraGroups = [
|
||||||
|
"wheel"
|
||||||
|
"networkmanager"
|
||||||
|
"dialout"
|
||||||
|
];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user