chore: autoformat

This commit is contained in:
Thiago Sposito 2026-01-10 21:54:04 -03:00
parent 337ee6db4a
commit be381d1ebd
Signed by: thiago
GPG key ID: 3065EA73A976D430
18 changed files with 158 additions and 116 deletions

View file

@ -5,7 +5,8 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
outputs = { self, nixpkgs }: outputs =
{ self, nixpkgs }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
@ -20,4 +21,3 @@
}; };
}; };
} }

View file

@ -49,7 +49,7 @@
./hosts/Nixbook ./hosts/Nixbook
]; ];
}; };
Nixstation = nixpkgs.lib.nixosSystem { Nixstation = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;

View file

@ -1,4 +1,11 @@
{ config, lib, pkgs, sops, secrets, ... }: {
config,
lib,
pkgs,
sops,
secrets,
...
}:
{ {
# --- sops secret integration --- # --- sops secret integration ---

View file

@ -6,9 +6,10 @@ let
rev = "393b8fbe74b0382a9cf7cbfd33e2a3e2b430ba71"; rev = "393b8fbe74b0382a9cf7cbfd33e2a3e2b430ba71";
}; };
mojo = pkgs.callPackage (noverbySrc + "/packages/mojo.nix") { }; mojo = pkgs.callPackage (noverbySrc + "/packages/mojo.nix") { };
magic = pkgs.callPackage (noverbySrc + "/packages/magic.nix") { }; magic = pkgs.callPackage (noverbySrc + "/packages/magic.nix") { };
in { in
{
home.packages = [ home.packages = [
mojo mojo
magic magic

View file

@ -1,4 +1,9 @@
{ pkgs, lib, config, ... }: {
pkgs,
lib,
config,
...
}:
{ {
programs.emacs = { programs.emacs = {
@ -19,7 +24,7 @@
sbcl sbcl
]; ];
home.activation.linkDoomConfig = lib.hm.dag.entryAfter ["writeBoundary"] '' home.activation.linkDoomConfig = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
if [ ! -e "${config.home.homeDirectory}/.config/doom" ]; then if [ ! -e "${config.home.homeDirectory}/.config/doom" ]; then
$DRY_RUN_CMD mkdir -p "${config.home.homeDirectory}/.config" $DRY_RUN_CMD mkdir -p "${config.home.homeDirectory}/.config"
$DRY_RUN_CMD ln -sfn "/home/thiago/.config/nix-conf/home-manager/emacs/doom" "${config.home.homeDirectory}/.config/doom" $DRY_RUN_CMD ln -sfn "/home/thiago/.config/nix-conf/home-manager/emacs/doom" "${config.home.homeDirectory}/.config/doom"

View file

@ -3,7 +3,7 @@
{ {
dconf.settings = { dconf.settings = {
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
gtk-theme = "Adwaita-dark"; gtk-theme = "Adwaita-dark";
}; };
"org/gnome/shell" = { "org/gnome/shell" = {

View file

@ -5,7 +5,18 @@
... ...
}: }:
let let
pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; pkgsUnstable = import inputs.nixpkgs-unstable {
system = "x86_64-linux";
config.allowUnfree = true;
config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
"code-cursor"
"cursor"
"cursor-cli"
"vscode"
];
};
in in
{ {
imports = [ imports = [
@ -80,45 +91,45 @@ in
xorg.xhost xorg.xhost
]; ];
sessionVariables = { sessionVariables = {
# DBUS_SESSION_BUS_ADDRESS = "unix:path=${config.home.homeDirectory}/.dbus-session-bus"; # DBUS_SESSION_BUS_ADDRESS = "unix:path=${config.home.homeDirectory}/.dbus-session-bus";
}; };
username = "thiago"; username = "thiago";
}; };
programs = { programs = {
git = { git = {
enable = true; enable = true;
settings = { settings = {
aliases = { aliases = {
br = "branch"; br = "branch";
ca = "commit --amend"; ca = "commit --amend";
can = "commit --amend --no-edit"; can = "commit --amend --no-edit";
ci = "commit"; ci = "commit";
co = "checkout"; co = "checkout";
lg = "log --oneline --graph --decorate --all"; lg = "log --oneline --graph --decorate --all";
st = "status"; st = "status";
}; };
extraConfig = { extraConfig = {
color.ui = "auto"; color.ui = "auto";
core = { core = {
editor = "nvim"; editor = "nvim";
autocrlf = "input"; autocrlf = "input";
};
init.defaultBranch = "main";
pull.rebase = true;
};
lfs.enable = true;
signing = {
key = "EC7C84664FF515B63AD510B63065EA73A976D430";
signByDefault = false;
};
user = {
email = "th.spo@pm.me";
name = "Thiago Sposito";
}; };
init.defaultBranch = "main";
pull.rebase = true;
}; };
lfs.enable = true;
signing = {
key = "EC7C84664FF515B63AD510B63065EA73A976D430";
signByDefault = false;
};
user = {
email = "th.spo@pm.me";
name = "Thiago Sposito";
};};
}; };
gpg = { gpg = {
@ -172,4 +183,4 @@ in
# age.keyFile = "/home/thiago/.config/sops/age/keys.txt"; # age.keyFile = "/home/thiago/.config/sops/age/keys.txt";
# gnupg.home = "/home/thiago/.gnupg"; # gnupg.home = "/home/thiago/.gnupg";
# }; # };
} }

View file

@ -17,11 +17,13 @@
# Compile Fennel to Lua at build time # Compile Fennel to Lua at build time
home.file.".config/nvim/extraconfig.lua" = { home.file.".config/nvim/extraconfig.lua" = {
text = builtins.readFile ( text = builtins.readFile (
pkgs.runCommand "extraconfig-compiled.lua" { pkgs.runCommand "extraconfig-compiled.lua"
buildInputs = [ pkgs.luajitPackages.fennel ]; {
} '' buildInputs = [ pkgs.luajitPackages.fennel ];
${pkgs.luajitPackages.fennel}/bin/fennel --compile ${./extraconfig.fnl} > $out }
'' ''
${pkgs.luajitPackages.fennel}/bin/fennel --compile ${./extraconfig.fnl} > $out
''
); );
}; };
programs.nixvim = { programs.nixvim = {
@ -103,7 +105,7 @@
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "m15a"; owner = "m15a";
repo = "vim-fennel-syntax"; repo = "vim-fennel-syntax";
rev = "e7299d5"; #v1.3.0 rev = "e7299d5"; # v1.3.0
hash = "sha256-CL3ooywWpGicmzine9qteHTGajAZ2qnIcK9CByaONvc="; hash = "sha256-CL3ooywWpGicmzine9qteHTGajAZ2qnIcK9CByaONvc=";
}; };
}) })

View file

@ -7,7 +7,7 @@
source = ./scripts/lsgpu.sh; source = ./scripts/lsgpu.sh;
executable = true; executable = true;
}; };
programs.zsh = { programs.zsh = {
enable = true; enable = true;
autosuggestion.enable = true; autosuggestion.enable = true;

View file

@ -1,7 +1,8 @@
{ config {
, lib config,
, modulesPath lib,
, ... modulesPath,
...
}: }:
{ {
@ -23,38 +24,37 @@
extraModulePackages = [ ]; extraModulePackages = [ ];
}; };
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; fsType = "btrfs";
fsType = "btrfs"; options = [ "subvol=@root" ];
options = [ "subvol=@root" ]; };
};
fileSystems."/nix" = fileSystems."/nix" = {
{ device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; fsType = "btrfs";
fsType = "btrfs"; options = [ "subvol=@nix" ];
options = [ "subvol=@nix" ]; };
};
fileSystems."/var/log" = fileSystems."/var/log" = {
{ device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; fsType = "btrfs";
fsType = "btrfs"; options = [ "subvol=@log" ];
options = [ "subvol=@log" ]; };
};
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; fsType = "btrfs";
fsType = "btrfs"; options = [ "subvol=@home" ];
options = [ "subvol=@home" ]; };
};
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/50A0-7758"; device = "/dev/disk/by-uuid/50A0-7758";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
"fmask=0022"
"dmask=0022"
];
}; };
swapDevices = [ swapDevices = [

View file

@ -1,11 +1,19 @@
{ modulesPath, ... }: { modulesPath, ... }:
{ {
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
boot.loader.grub.device = "/dev/sda"; boot.loader.grub.device = "/dev/sda";
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; boot.initrd.availableKernelModules = [
"ata_piix"
"uhci_hcd"
"xen_blkfront"
"vmw_pvscsi"
];
boot.initrd.kernelModules = [ "nvme" ]; boot.initrd.kernelModules = [ "nvme" ];
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; fileSystems."/" = {
device = "/dev/sda1";
fsType = "ext4";
};
} }

View file

@ -1,8 +1,9 @@
{ config {
, lib config,
, modulesPath lib,
, pkgs modulesPath,
, ... pkgs,
...
}: }:
{ {
@ -21,15 +22,19 @@
"sd_mod" "sd_mod"
"xhci_pci" "xhci_pci"
]; ];
kernelParams = [ # used to improve VM perfomance (guix experiments) kernelParams = [
# used to improve VM perfomance (guix experiments)
"amd_pstate=active" "amd_pstate=active"
"usbcore.autosuspend=-1" "usbcore.autosuspend=-1"
"hugepagesz=1G" "hugepagesz=1G"
"hugepages=16" "hugepages=16"
"default_hugepagesz=1G" "default_hugepagesz=1G"
]; ];
initrd.kernelModules = [ ]; initrd.kernelModules = [ ];
kernelModules = [ "kvm-amd" "iwlwifi" ]; kernelModules = [
"kvm-amd"
"iwlwifi"
];
extraModulePackages = [ ]; extraModulePackages = [ ];
}; };
fileSystems = { fileSystems = {

View file

@ -15,12 +15,12 @@
(final: prev: { (final: prev: {
libnitrokey = prev.libnitrokey.overrideAttrs (old: { libnitrokey = prev.libnitrokey.overrideAttrs (old: {
cmakeFlags = (old.cmakeFlags or [ ]) ++ [ cmakeFlags = (old.cmakeFlags or [ ]) ++ [
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5" "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
]; ];
}); });
epsonscan2 = prev.epsonscan2.overrideAttrs (old: { epsonscan2 = prev.epsonscan2.overrideAttrs (old: {
cmakeFlags = (old.cmakeFlags or [ ]) ++ [ cmakeFlags = (old.cmakeFlags or [ ]) ++ [
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5" "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
]; ];
}); });
}) })
@ -102,7 +102,7 @@
enable = true; enable = true;
drivers = [ pkgs.epson-escpr ]; drivers = [ pkgs.epson-escpr ];
}; };
pcscd.enable = true; pcscd.enable = true;
# xserver.displayManager.sessionCommands = # xserver.displayManager.sessionCommands =
# "${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keycode 64 = Alt_L'"; # "${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keycode 64 = Alt_L'";

View file

@ -38,7 +38,7 @@
# openssh.settings.X11Forwarding = true; # openssh.settings.X11Forwarding = true;
}; };
virtualisation ={ virtualisation = {
docker = { docker = {
enable = true; enable = true;
logDriver = "journald"; logDriver = "journald";
@ -71,21 +71,21 @@
"guest account" = "nobody"; "guest account" = "nobody";
"map to guest" = "bad user"; "map to guest" = "bad user";
security = "user"; security = "user";
# used for xp priter vm # used for xp priter vm
# # Windows XP compatibility settings # # Windows XP compatibility settings
# "server min protocol" = "NT1"; # Enable SMB1 for Windows XP # "server min protocol" = "NT1"; # Enable SMB1 for Windows XP
# "client min protocol" = "NT1"; # "client min protocol" = "NT1";
# "ntlm auth" = "yes"; # Required for Windows XP # "ntlm auth" = "yes"; # Required for Windows XP
# "lanman auth" = "yes"; # Required for Windows XP # "lanman auth" = "yes"; # Required for Windows XP
# }; # };
# # Share for Windows XP access # # Share for Windows XP access
# "shared" = { # "shared" = {
# "path" = "/home/thiago/shared"; # "path" = "/home/thiago/shared";
# "browseable" = "yes"; # "browseable" = "yes";
# "read only" = "no"; # "read only" = "no";
# "guest ok" = "yes"; # "guest ok" = "yes";
# "create mask" = "0644"; # "create mask" = "0644";
# "directory mask" = "0755"; # "directory mask" = "0755";
}; };
}; };
}; };

View file

@ -1,6 +1,7 @@
{ pkgs {
, config pkgs,
, ... config,
...
}: }:
{ {
boot = { boot = {

View file

@ -1,6 +1,7 @@
# Under maintanence # Under maintanence
{ pkgs {
, ... pkgs,
...
}: }:
let let
# Optional helper for manual (re)binding at runtime # Optional helper for manual (re)binding at runtime

View file

@ -13,7 +13,7 @@ in
"scard" "scard"
"wheel" "wheel"
"lp" "lp"
"scanner" "scanner"
] ]
++ ifTheyExist [ ++ ifTheyExist [
"docker" "docker"

View file

@ -5,11 +5,13 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
outputs = { self, nixpkgs, ... }: outputs =
{ self, nixpkgs, ... }:
let let
system = "aarch64-linux"; system = "aarch64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
in { in
{
devShells.${system}.default = pkgs.mkShell { devShells.${system}.default = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
git git
@ -26,4 +28,3 @@
}; };
}; };
} }