chore: run formatter

This commit is contained in:
2025-09-27 22:27:55 +05:00
parent 23ddc84bfc
commit 307b866cc6
44 changed files with 230 additions and 228 deletions

View File

@@ -10,14 +10,17 @@
};
};
outputs = { self, nixpkgs, flake-utils, fenix }:
flake-utils.lib.eachDefaultSystem (system:
let
outputs = {
self,
nixpkgs,
flake-utils,
fenix,
}:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
fenixLib = fenix.packages.${system};
rustToolchain = fenixLib.stable.toolchain;
in
{
in {
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
lua-language-server

View File

@@ -40,8 +40,7 @@
};
};
outputs = { nixpkgs, ... }@inputs:
let
outputs = {nixpkgs, ...} @ inputs: let
inherit (nixpkgs) lib;
mkHost = host: {
${host} = nixpkgs.lib.nixosSystem {
@@ -50,15 +49,15 @@
# Extend lib with lib.custom
lib = nixpkgs.lib.extend (self: super: {
custom = import ./lib { inherit (nixpkgs) lib; };
custom = import ./lib {inherit (nixpkgs) lib;};
});
};
modules = [ ./hosts/nixos/${host} ];
modules = [./hosts/nixos/${host}];
};
};
mkHostConfigs = hosts:
lib.foldl (acc: set: acc // set) { }
lib.foldl (acc: set: acc // set) {}
(lib.map (host: mkHost host) hosts);
readHosts = folder: lib.attrNames (builtins.readDir ./hosts/${folder});
in {
@@ -66,8 +65,9 @@
devShell.x86_64-linux = let
pkgs = nixpkgs.legacyPackages.x86_64-linux;
in pkgs.mkShell {
buildInputs = with pkgs; [ nil lua-language-server ];
in
pkgs.mkShell {
buildInputs = with pkgs; [nil lua-language-server];
};
};
}

View File

@@ -1,6 +1,12 @@
{ config, lib, pkgs, hostSpec, ... }: {
{
config,
lib,
pkgs,
hostSpec,
...
}: {
imports = lib.flatten [
(map lib.custom.relativeToRoot [ "modules/common" "modules/home-manager" ])
(map lib.custom.relativeToRoot ["modules/common" "modules/home-manager"])
./kitty.nix
./direnv.nix
@@ -14,7 +20,7 @@
username = lib.mkDefault config.hostSpec.username;
homeDirectory = lib.mkDefault config.hostSpec.home;
stateVersion = lib.mkDefault "25.05";
sessionPath = [ "$HOME/.local/bin" ];
sessionPath = ["$HOME/.local/bin"];
sessionVariables = {
FLAKE = "$HOME/src/nix/nix-config";
SHELL = "zsh";
@@ -52,7 +58,7 @@
nix = {
package = lib.mkDefault pkgs.nix;
settings = {
experimental-features = [ "nix-command" "flakes" ];
experimental-features = ["nix-command" "flakes"];
warn-dirty = false;
};
};

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
fonts.fontconfig.enable = true;
home.packages = with pkgs; [ nerd-fonts.jetbrains-mono ];
home.packages = with pkgs; [nerd-fonts.jetbrains-mono];
}

View File

@@ -1,9 +1,4 @@
{
config,
...
}:
{
{config, ...}: {
programs.ghostty = {
enable = true;

View File

@@ -1,4 +1,9 @@
{ lib, pkgs, config, ... }: {
{
lib,
pkgs,
config,
...
}: {
programs.git = {
package = pkgs.gitAndTools.gitFull;
enable = true;
@@ -7,15 +12,15 @@
lfs.enable = true;
extraConfig = {
gpg = { format = "ssh"; };
gpg = {format = "ssh";};
"gpg \"ssh\"" = {
program = "${lib.getExe' pkgs._1password-gui "op-ssh-sign"}";
};
commit = { gpgsign = true; };
user = { signingKey = "~/.ssh/id_rihla.pub"; };
pull = { rebase = true; };
init = { defaultBranch = "main"; };
lfs = { locksverify = true; };
commit = {gpgsign = true;};
user = {signingKey = "~/.ssh/id_rihla.pub";};
pull = {rebase = true;};
init = {defaultBranch = "main";};
lfs = {locksverify = true;};
};
};
}

View File

@@ -1,9 +1,4 @@
{
config,
...
}:
{
{config, ...}: {
programs.kitty = {
enable = true;

View File

@@ -1,5 +1,3 @@
{ ... }:
{
programs.btop = { enable = true; };
{...}: {
programs.btop = {enable = true;};
}

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
programs.firefox = {
enable = true;
package = pkgs.firefox.override {

View File

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

View File

@@ -1,6 +1,4 @@
{ config, ... }:
{
{config, ...}: {
programs.neovim = {
enable = true;
defaultEditor = true;
@@ -9,6 +7,7 @@
};
# Create a symlink from ~/.config/nvim to the dotfiles directory
home.file.".config/nvim".source = config.lib.file.mkOutOfStoreSymlink
home.file.".config/nvim".source =
config.lib.file.mkOutOfStoreSymlink
"${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
}

View File

@@ -1,5 +1,5 @@
{ ... }:
let onePassPath = "~/.1password/agent.sock";
{...}: let
onePassPath = "~/.1password/agent.sock";
in {
programs.ssh = {
enable = true;

View File

@@ -1 +1 @@
{ ... }: { programs.starship.enable = true; }
{...}: {programs.starship.enable = true;}

View File

@@ -1,12 +1,15 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}: {
home = {
file = {
"${config.xdg.configHome}/tmux".source =
lib.custom.relativeToRoot "dotfiles/tmux";
};
packages = with pkgs; [ tmux ];
packages = with pkgs; [tmux];
};
}

View File

@@ -1,4 +1,4 @@
{ config, ... }: {
{config, ...}: {
programs.zsh = {
enable = true;
enableCompletion = true;

View File

@@ -1,4 +1,4 @@
{ lib, ... }: {
{lib, ...}: {
imports = lib.flatten [
#
# ========== Required Configs ==========

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
discord
protonmail-desktop

View File

@@ -1,6 +1,10 @@
{ pkgs, inputs, config, lib, ... }:
{
pkgs,
inputs,
config,
lib,
...
}: {
imports = lib.flatten [
inputs.home-manager.nixosModules.home-manager
inputs.sops-nix.nixosModules.sops
@@ -14,7 +18,7 @@
hostSpec = {
username = "shahab";
handle = "shahab96";
email = { user = "shahab@dogar.dev"; };
email = {user = "shahab@dogar.dev";};
userFullName = "Shahab Dogar";
domain = "rihla";
networking.ports.tcp.ssh = 22;
@@ -50,13 +54,13 @@
auto-optimise-store = true;
warn-dirty = false;
trusted-users = [ "@wheel" ];
trusted-users = ["@wheel"];
substituters = [ "https://hyprland.cachix.org" ];
substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
experimental-features = [ "nix-command" "flakes" ];
experimental-features = ["nix-command" "flakes"];
};
};
@@ -70,7 +74,7 @@
};
# ========= Sops =========
environment.systemPackages = with pkgs; [ sops ];
environment.systemPackages = with pkgs; [sops];
#
# ========== Localization ==========

View File

@@ -1,6 +1,12 @@
{ lib, config, device, withSwap, swapSize, label, ... }:
{
lib,
config,
device,
withSwap,
swapSize,
label,
...
}: {
disko = {
devices = {
disk = {
@@ -34,8 +40,7 @@
passwordFile = "/tmp/secret.key";
settings = {
allowDiscards = true;
crypttabExtraOpts =
[ "fido2-device=auto" "token-timeout=10" ];
crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10"];
};
content = {
type = "lvm_pv";
@@ -62,20 +67,19 @@
size = "100%";
content = {
type = "btrfs";
extraArgs = [ "-L" label "-f" ];
extraArgs = ["-L" label "-f"];
subvolumes = {
"@root" = {
mountpoint = "/";
mountOptions = [ "subvol=root" "compress=zstd" "noatime" ];
mountOptions = ["subvol=root" "compress=zstd" "noatime"];
};
"@persist" = {
mountpoint = config.hostSpec.persist;
mountOptions =
[ "subvol=persist" "compress=zstd" "noatime" ];
mountOptions = ["subvol=persist" "compress=zstd" "noatime"];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [ "subvol=nix" "compress=zstd" "noatime" ];
mountOptions = ["subvol=nix" "compress=zstd" "noatime"];
};
};
};

View File

@@ -1,11 +1,9 @@
{ config, ... }:
{
{config, ...}: {
programs = {
_1password.enable = true;
_1password-gui = {
enable = true;
polkitPolicyOwners = [ config.hostSpec.username ];
polkitPolicyOwners = [config.hostSpec.username];
};
};
}

View File

@@ -1,5 +1,3 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ claude-code ];
{pkgs, ...}: {
environment.systemPackages = with pkgs; [claude-code];
}

View File

@@ -1,5 +1,3 @@
{ ... }:
{
{...}: {
programs.dconf.enable = true;
}

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
virtualisation = {
podman = {
enable = true;
@@ -11,7 +11,7 @@
};
};
containers = { registries = { search = [ "docker.io" ]; }; };
containers = {registries = {search = ["docker.io"];};};
libvirtd = {
enable = true;
@@ -20,7 +20,7 @@
ovmf = {
enable = true;
packages = with pkgs; [ OVMFFull.fd ];
packages = with pkgs; [OVMFFull.fd];
};
};
};

View File

@@ -1,5 +1,3 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ hoppscotch ];
{pkgs, ...}: {
environment.systemPackages = with pkgs; [hoppscotch];
}

View File

@@ -1,6 +1,8 @@
{ inputs, pkgs, ... }:
{
inputs,
pkgs,
...
}: {
programs.hyprland = {
enable = true;
package =

View File

@@ -1,5 +1,3 @@
{ ... }:
{
{...}: {
programs.nix-ld.enable = true;
}

View File

@@ -1,5 +1,3 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ sbctl ];
{pkgs, ...}: {
environment.systemPackages = with pkgs; [sbctl];
}

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services = {
# Enable sound with pipewire.
pulseaudio.enable = false;
@@ -15,5 +13,5 @@
security.rtkit.enable = true;
environment.systemPackages =
builtins.attrValues { inherit (pkgs) pavucontrol; };
builtins.attrValues {inherit (pkgs) pavucontrol;};
}

View File

@@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
services.blueman.enable = true;
hardware = {
bluetooth.enable = true;

View File

@@ -1,5 +1,3 @@
{ ... }:
{
{...}: {
services.fwupd.enable = true;
}

View File

@@ -1,12 +1,9 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.greetd = {
enable = true;
settings = {
default_session = {
command =
"${pkgs.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${pkgs.hyprland}/bin/Hyprland";
command = "${pkgs.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${pkgs.hyprland}/bin/Hyprland";
user = "greeter";
};
};

View File

@@ -1,9 +1,9 @@
{ config, ... }:
let sshPort = config.hostSpec.networking.ports.tcp.ssh;
{config, ...}: let
sshPort = config.hostSpec.networking.ports.tcp.ssh;
in {
services.openssh = {
enable = true;
ports = [ sshPort ];
ports = [sshPort];
settings = {
PermitRootLogin = "no";
@@ -14,5 +14,5 @@ in {
openFirewall = true;
};
networking.firewall.allowedTCPPorts = [ sshPort ];
networking.firewall.allowedTCPPorts = [sshPort];
}

View File

@@ -1,6 +1,4 @@
# Reminder that CUPS cpanel defaults to localhost:631
{ ... }:
{
{...}: {
services.printing.enable = true;
}

View File

@@ -1,5 +1,3 @@
{ ... }:
{
{...}: {
services.pcscd.enable = true;
}

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
# yubikey login / sudo
security.pam = {
u2f = {
@@ -13,5 +11,5 @@
};
};
environment.systemPackages = with pkgs; [ yubikey-manager ];
environment.systemPackages = with pkgs; [yubikey-manager];
}

View File

@@ -1,5 +1,9 @@
{ pkgs, config, lib, ... }:
let
{
pkgs,
config,
lib,
...
}: let
hostSpec = config.hostSpec;
in {
specialisation.gaming.configuration = {
@@ -15,7 +19,7 @@ in {
};
home-manager.users."${hostSpec.username}".imports = lib.flatten [
({ config, ... }:
({config, ...}:
import (lib.custom.relativeToRoot
"home/${hostSpec.username}/specialisations/gaming.nix") {
inherit pkgs;
@@ -24,6 +28,6 @@ in {
powerManagement.cpuFreqGovernor = "performance";
environment.systemPackages = with pkgs; [ mangohud protonup-qt ];
environment.systemPackages = with pkgs; [mangohud protonup-qt];
};
}

View File

@@ -1,5 +1,10 @@
{ pkgs, config, lib, inputs, ... }:
let
{
pkgs,
config,
lib,
inputs,
...
}: let
hostSpec = config.hostSpec;
pubKeys = lib.filesystem.listFilesRecursive ./keys;
in {
@@ -13,15 +18,14 @@ in {
shell = pkgs.zsh;
home = hostSpec.home;
isNormalUser = true;
hashedPassword =
"$y$j9T$pvjyL7hL5x2VBarGNTnMl1$mLA2UsWTbfp8Hgp/ug5l8224thi..Mo8.p7ME.tDZ.4";
extraGroups = [ "networkmanager" "wheel" "input" "libvirtd" ];
hashedPassword = "$y$j9T$pvjyL7hL5x2VBarGNTnMl1$mLA2UsWTbfp8Hgp/ug5l8224thi..Mo8.p7ME.tDZ.4";
extraGroups = ["networkmanager" "wheel" "input" "libvirtd"];
# Read all keys in ./keys and add them to authorizedKeys.
openssh.authorizedKeys.keys =
lib.lists.forEach pubKeys (key: builtins.readFile key);
packages = with pkgs; [ libnotify ];
packages = with pkgs; [libnotify];
};
};
@@ -31,7 +35,7 @@ in {
hostSpec = config.hostSpec;
};
users.${hostSpec.username}.imports = lib.flatten [
({ config, ... }:
({config, ...}:
import (lib.custom.relativeToRoot
"home/${hostSpec.username}/${hostSpec.hostName}.nix") {
inherit pkgs inputs config lib hostSpec;

View File

@@ -1,6 +1,10 @@
{ inputs, pkgs, lib, config, ... }:
{
inputs,
pkgs,
lib,
config,
...
}: {
imports = lib.flatten [
#
# ========= Hardware =========
@@ -33,7 +37,7 @@
#
# ========= Required Configs =========
#
(map lib.custom.relativeToRoot [ "hosts/common/core" ])
(map lib.custom.relativeToRoot ["hosts/common/core"])
#
# ========= Optional Configs =========
@@ -99,7 +103,8 @@
efi.canTouchEfiVariables = true;
};
initrd.postResumeCommands = lib.mkIf config.hostSpec.impermanance
initrd.postResumeCommands =
lib.mkIf config.hostSpec.impermanance
(lib.mkAfter ''
mkdir /btrfs_tmp
mount /dev/crypt_vg/root /btrfs_tmp
@@ -133,7 +138,7 @@
security.rtkit.enable = true;
environment.systemPackages = with pkgs; [ pciutils bc ];
environment.systemPackages = with pkgs; [pciutils bc];
system.stateVersion = "25.05";
}

View File

@@ -1,8 +1,14 @@
# 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.
{ pkgs, config, lib, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
{
pkgs,
config,
lib,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot = {
initrd = {
@@ -15,11 +21,11 @@
"usb_storage"
"sd_mod"
];
kernelModules = [ ];
kernelModules = [];
};
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
kernelModules = ["kvm-amd"];
extraModulePackages = [];
};
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -36,7 +42,7 @@
lib.mkDefault config.hardware.enableRedistributableFirmware;
graphics = {
enable = true;
extraPackages = with pkgs; [ amdvlk ];
extraPackages = with pkgs; [amdvlk];
};
};
}

View File

@@ -1,5 +1,3 @@
{ lib, ... }:
{
{lib, ...}: {
relativeToRoot = lib.path.append ../.;
}

View File

@@ -1,5 +1,3 @@
{ ... }:
{
imports = [ ./host-spec.nix ];
{...}: {
imports = [./host-spec.nix];
}

View File

@@ -1,5 +1,9 @@
# Specifications For Differentiating Hosts
{ config, lib, ... }: {
{
config,
lib,
...
}: {
options.hostSpec = {
username = lib.mkOption {
type = lib.types.str;
@@ -14,7 +18,7 @@
description = "The email of the user";
};
networking = lib.mkOption {
default = { };
default = {};
type = lib.types.attrsOf lib.types.anything;
description = "An attribute set of networking information";
};
@@ -68,8 +72,7 @@
scaling = lib.mkOption {
type = lib.types.str;
default = "1";
description =
"Used to indicate what scaling to use. Floating point number";
description = "Used to indicate what scaling to use. Floating point number";
};
font = lib.mkOption {
type = lib.types.str;

View File

@@ -1,5 +1,3 @@
{ ... }:
{
imports = [ ./yubikey-touch-detector.nix ];
{...}: {
imports = [./yubikey-touch-detector.nix];
}

View File

@@ -1,11 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
let cfg = config.services.yubikey-touch-detector;
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.services.yubikey-touch-detector;
in {
options.services.yubikey-touch-detector = {
enable = mkEnableOption
enable =
mkEnableOption
"a tool to detect when your YubiKey is waiting for a touch";
package = mkOption {
@@ -22,7 +26,7 @@ in {
extraArgs = mkOption {
type = types.listOf types.str;
default = [ "--libnotify" ];
default = ["--libnotify"];
defaultText = literalExpression ''[ "--libnotify" ]'';
description = ''
Extra arguments to pass to the tool. The arguments are not escaped.
@@ -31,20 +35,19 @@ in {
};
config = mkIf cfg.enable {
home.packages = [ cfg.package ];
home.packages = [cfg.package];
# Service description licensed under ISC
# See https://github.com/maximbaz/yubikey-touch-detector/blob/c9fdff7163361d6323e2de0449026710cacbc08a/LICENSE
# Author: Maxim Baz
systemd.user.sockets.yubikey-touch-detector = mkIf cfg.socket.enable {
Unit.Description =
"Unix socket activation for YubiKey touch detector service";
Unit.Description = "Unix socket activation for YubiKey touch detector service";
Socket = {
ListenFIFO = "%t/yubikey-touch-detector.sock";
RemoveOnStop = true;
SocketMode = "0660";
};
Install.WantedBy = [ "sockets.target" ];
Install.WantedBy = ["sockets.target"];
};
# Same license thing for the description here
@@ -52,19 +55,19 @@ in {
Unit = {
Description = "Detects when your YubiKey is waiting for a touch";
Requires =
optionals cfg.socket.enable [ "yubikey-touch-detector.socket" ];
optionals cfg.socket.enable ["yubikey-touch-detector.socket"];
};
Service = {
ExecStart = "${cfg.package}/bin/yubikey-touch-detector ${
concatStringsSep " " cfg.extraArgs
}";
Environment = [ "PATH=${lib.makeBinPath [ pkgs.gnupg ]}" ];
Environment = ["PATH=${lib.makeBinPath [pkgs.gnupg]}"];
Restart = "on-failure";
RestartSec = "1sec";
};
Install.Also =
optionals cfg.socket.enable [ "yubikey-touch-detector.socket" ];
Install.WantedBy = [ "default.target" ];
optionals cfg.socket.enable ["yubikey-touch-detector.socket"];
Install.WantedBy = ["default.target"];
};
};
}