From be381d1ebd9ad1b3dd7c0ab133dffa5351a332a4 Mon Sep 17 00:00:00 2001 From: Thiago Sposito Date: Sat, 10 Jan 2026 21:54:04 -0300 Subject: [PATCH] chore: autoformat --- dev-templates/rust-minimal/flake.nix | 4 +- flake.nix | 2 +- home-manager/backup.nix | 9 ++- home-manager/custom.nix | 5 +- home-manager/emacs/default.nix | 9 ++- home-manager/gnome/default.nix | 2 +- home-manager/home.nix | 71 ++++++++++++--------- home-manager/nvim/default.nix | 14 ++-- home-manager/zsh.nix | 2 +- hosts/Nixbook/hardware-configuration.nix | 58 ++++++++--------- hosts/Nixcloud/hardware-configuration.nix | 16 +++-- hosts/Nixstation/hardware-configuration.nix | 23 ++++--- hosts/common/default.nix | 6 +- hosts/common/network.nix | 32 +++++----- hosts/common/nvidia/default.nix | 7 +- hosts/common/nvidia/passthrough.nix | 5 +- hosts/common/users/thiago/default.nix | 2 +- hosts/husky.nix | 7 +- 18 files changed, 158 insertions(+), 116 deletions(-) diff --git a/dev-templates/rust-minimal/flake.nix b/dev-templates/rust-minimal/flake.nix index bf7243c..c91674b 100644 --- a/dev-templates/rust-minimal/flake.nix +++ b/dev-templates/rust-minimal/flake.nix @@ -5,7 +5,8 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; - outputs = { self, nixpkgs }: + outputs = + { self, nixpkgs }: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; @@ -20,4 +21,3 @@ }; }; } - diff --git a/flake.nix b/flake.nix index 1ec703c..ecf9615 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ ./hosts/Nixbook ]; }; - + Nixstation = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; diff --git a/home-manager/backup.nix b/home-manager/backup.nix index 26d6954..d2d6102 100644 --- a/home-manager/backup.nix +++ b/home-manager/backup.nix @@ -1,4 +1,11 @@ -{ config, lib, pkgs, sops, secrets, ... }: +{ + config, + lib, + pkgs, + sops, + secrets, + ... +}: { # --- sops secret integration --- diff --git a/home-manager/custom.nix b/home-manager/custom.nix index e5a2c96..f36e61a 100644 --- a/home-manager/custom.nix +++ b/home-manager/custom.nix @@ -6,9 +6,10 @@ let rev = "393b8fbe74b0382a9cf7cbfd33e2a3e2b430ba71"; }; - mojo = pkgs.callPackage (noverbySrc + "/packages/mojo.nix") { }; + mojo = pkgs.callPackage (noverbySrc + "/packages/mojo.nix") { }; magic = pkgs.callPackage (noverbySrc + "/packages/magic.nix") { }; -in { +in +{ home.packages = [ mojo magic diff --git a/home-manager/emacs/default.nix b/home-manager/emacs/default.nix index 60a3309..b269ea1 100644 --- a/home-manager/emacs/default.nix +++ b/home-manager/emacs/default.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { programs.emacs = { @@ -19,7 +24,7 @@ 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 $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" diff --git a/home-manager/gnome/default.nix b/home-manager/gnome/default.nix index a2811f9..cfc6359 100644 --- a/home-manager/gnome/default.nix +++ b/home-manager/gnome/default.nix @@ -3,7 +3,7 @@ { dconf.settings = { - "org/gnome/desktop/interface" = { + "org/gnome/desktop/interface" = { gtk-theme = "Adwaita-dark"; }; "org/gnome/shell" = { diff --git a/home-manager/home.nix b/home-manager/home.nix index 9b86234..544cfe4 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -5,7 +5,18 @@ ... }: 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 { imports = [ @@ -80,45 +91,45 @@ in xorg.xhost ]; 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"; }; programs = { - git = { enable = true; settings = { - aliases = { - br = "branch"; - ca = "commit --amend"; - can = "commit --amend --no-edit"; - ci = "commit"; - co = "checkout"; - lg = "log --oneline --graph --decorate --all"; - st = "status"; - }; - extraConfig = { - color.ui = "auto"; - core = { - editor = "nvim"; - autocrlf = "input"; + aliases = { + br = "branch"; + ca = "commit --amend"; + can = "commit --amend --no-edit"; + ci = "commit"; + co = "checkout"; + lg = "log --oneline --graph --decorate --all"; + st = "status"; + }; + extraConfig = { + color.ui = "auto"; + core = { + editor = "nvim"; + 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 = { @@ -172,4 +183,4 @@ in # age.keyFile = "/home/thiago/.config/sops/age/keys.txt"; # gnupg.home = "/home/thiago/.gnupg"; # }; -} \ No newline at end of file +} diff --git a/home-manager/nvim/default.nix b/home-manager/nvim/default.nix index 112fc78..006b207 100644 --- a/home-manager/nvim/default.nix +++ b/home-manager/nvim/default.nix @@ -17,11 +17,13 @@ # Compile Fennel to Lua at build time home.file.".config/nvim/extraconfig.lua" = { text = builtins.readFile ( - pkgs.runCommand "extraconfig-compiled.lua" { - buildInputs = [ pkgs.luajitPackages.fennel ]; - } '' - ${pkgs.luajitPackages.fennel}/bin/fennel --compile ${./extraconfig.fnl} > $out - '' + pkgs.runCommand "extraconfig-compiled.lua" + { + buildInputs = [ pkgs.luajitPackages.fennel ]; + } + '' + ${pkgs.luajitPackages.fennel}/bin/fennel --compile ${./extraconfig.fnl} > $out + '' ); }; programs.nixvim = { @@ -103,7 +105,7 @@ src = pkgs.fetchFromGitHub { owner = "m15a"; repo = "vim-fennel-syntax"; - rev = "e7299d5"; #v1.3.0 + rev = "e7299d5"; # v1.3.0 hash = "sha256-CL3ooywWpGicmzine9qteHTGajAZ2qnIcK9CByaONvc="; }; }) diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index 5a2ab49..d883ebc 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -7,7 +7,7 @@ source = ./scripts/lsgpu.sh; executable = true; }; - + programs.zsh = { enable = true; autosuggestion.enable = true; diff --git a/hosts/Nixbook/hardware-configuration.nix b/hosts/Nixbook/hardware-configuration.nix index a76fc96..a36f8d7 100644 --- a/hosts/Nixbook/hardware-configuration.nix +++ b/hosts/Nixbook/hardware-configuration.nix @@ -1,7 +1,8 @@ -{ config -, lib -, modulesPath -, ... +{ + config, + lib, + modulesPath, + ... }: { @@ -23,38 +24,37 @@ extraModulePackages = [ ]; }; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; - fsType = "btrfs"; - options = [ "subvol=@root" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; + fsType = "btrfs"; + options = [ "subvol=@root" ]; + }; - fileSystems."/nix" = - { - device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; - fsType = "btrfs"; - options = [ "subvol=@nix" ]; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; + }; - fileSystems."/var/log" = - { - device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; - fsType = "btrfs"; - options = [ "subvol=@log" ]; - }; + fileSystems."/var/log" = { + device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; + fsType = "btrfs"; + options = [ "subvol=@log" ]; + }; - fileSystems."/home" = - { - device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; fileSystems."/boot" = { device = "/dev/disk/by-uuid/50A0-7758"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ + "fmask=0022" + "dmask=0022" + ]; }; swapDevices = [ diff --git a/hosts/Nixcloud/hardware-configuration.nix b/hosts/Nixcloud/hardware-configuration.nix index c0db864..56c06ac 100644 --- a/hosts/Nixcloud/hardware-configuration.nix +++ b/hosts/Nixcloud/hardware-configuration.nix @@ -1,11 +1,19 @@ { modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - + nixpkgs.hostPlatform = "x86_64-linux"; - + 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" ]; - fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; + fileSystems."/" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; } diff --git a/hosts/Nixstation/hardware-configuration.nix b/hosts/Nixstation/hardware-configuration.nix index 4c38ab4..e96aaa4 100644 --- a/hosts/Nixstation/hardware-configuration.nix +++ b/hosts/Nixstation/hardware-configuration.nix @@ -1,8 +1,9 @@ -{ config -, lib -, modulesPath -, pkgs -, ... +{ + config, + lib, + modulesPath, + pkgs, + ... }: { @@ -21,15 +22,19 @@ "sd_mod" "xhci_pci" ]; - kernelParams = [ # used to improve VM perfomance (guix experiments) + kernelParams = [ + # used to improve VM perfomance (guix experiments) "amd_pstate=active" "usbcore.autosuspend=-1" - "hugepagesz=1G" - "hugepages=16" + "hugepagesz=1G" + "hugepages=16" "default_hugepagesz=1G" ]; initrd.kernelModules = [ ]; - kernelModules = [ "kvm-amd" "iwlwifi" ]; + kernelModules = [ + "kvm-amd" + "iwlwifi" + ]; extraModulePackages = [ ]; }; fileSystems = { diff --git a/hosts/common/default.nix b/hosts/common/default.nix index ff8ab56..9aae68a 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -15,12 +15,12 @@ (final: prev: { libnitrokey = prev.libnitrokey.overrideAttrs (old: { cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; }); epsonscan2 = prev.epsonscan2.overrideAttrs (old: { cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; }); }) @@ -102,7 +102,7 @@ enable = true; drivers = [ pkgs.epson-escpr ]; }; - + pcscd.enable = true; # xserver.displayManager.sessionCommands = # "${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keycode 64 = Alt_L'"; diff --git a/hosts/common/network.nix b/hosts/common/network.nix index afed8af..9746e01 100644 --- a/hosts/common/network.nix +++ b/hosts/common/network.nix @@ -38,7 +38,7 @@ # openssh.settings.X11Forwarding = true; }; - virtualisation ={ + virtualisation = { docker = { enable = true; logDriver = "journald"; @@ -71,21 +71,21 @@ "guest account" = "nobody"; "map to guest" = "bad user"; security = "user"; - # used for xp priter vm - # # Windows XP compatibility settings - # "server min protocol" = "NT1"; # Enable SMB1 for Windows XP - # "client min protocol" = "NT1"; - # "ntlm auth" = "yes"; # Required for Windows XP - # "lanman auth" = "yes"; # Required for Windows XP - # }; - # # Share for Windows XP access - # "shared" = { - # "path" = "/home/thiago/shared"; - # "browseable" = "yes"; - # "read only" = "no"; - # "guest ok" = "yes"; - # "create mask" = "0644"; - # "directory mask" = "0755"; + # used for xp priter vm + # # Windows XP compatibility settings + # "server min protocol" = "NT1"; # Enable SMB1 for Windows XP + # "client min protocol" = "NT1"; + # "ntlm auth" = "yes"; # Required for Windows XP + # "lanman auth" = "yes"; # Required for Windows XP + # }; + # # Share for Windows XP access + # "shared" = { + # "path" = "/home/thiago/shared"; + # "browseable" = "yes"; + # "read only" = "no"; + # "guest ok" = "yes"; + # "create mask" = "0644"; + # "directory mask" = "0755"; }; }; }; diff --git a/hosts/common/nvidia/default.nix b/hosts/common/nvidia/default.nix index 5f2ef99..323dafd 100644 --- a/hosts/common/nvidia/default.nix +++ b/hosts/common/nvidia/default.nix @@ -1,6 +1,7 @@ -{ pkgs -, config -, ... +{ + pkgs, + config, + ... }: { boot = { diff --git a/hosts/common/nvidia/passthrough.nix b/hosts/common/nvidia/passthrough.nix index 9b5adf4..b58199e 100644 --- a/hosts/common/nvidia/passthrough.nix +++ b/hosts/common/nvidia/passthrough.nix @@ -1,6 +1,7 @@ # Under maintanence -{ pkgs -, ... +{ + pkgs, + ... }: let # Optional helper for manual (re)binding at runtime diff --git a/hosts/common/users/thiago/default.nix b/hosts/common/users/thiago/default.nix index 0d0f0de..18a01d5 100644 --- a/hosts/common/users/thiago/default.nix +++ b/hosts/common/users/thiago/default.nix @@ -13,7 +13,7 @@ in "scard" "wheel" "lp" - "scanner" + "scanner" ] ++ ifTheyExist [ "docker" diff --git a/hosts/husky.nix b/hosts/husky.nix index 78eb612..555a4a8 100644 --- a/hosts/husky.nix +++ b/hosts/husky.nix @@ -5,11 +5,13 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; - outputs = { self, nixpkgs, ... }: + outputs = + { self, nixpkgs, ... }: let system = "aarch64-linux"; pkgs = import nixpkgs { inherit system; }; - in { + in + { devShells.${system}.default = pkgs.mkShell { buildInputs = with pkgs; [ git @@ -26,4 +28,3 @@ }; }; } -