shahab/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Flake | use nixfmt=classic to format nix files

Browse Source
This commit is contained in:
Shahab Dogar
2025-02-17 19:24:25 +05:00
parent 234e52f051
commit 7eab398f6d
41 changed files with 189 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/nvim/lua/custom/configs/lspconfig.lua
View File

@@ -72,7 +72,7 @@ lspconfig.nil_ls.setup {
['nil'] = {
testSetting = 42,
formatting = {
command = { "alejandra" },
command = { "nixfmt" },
},
},
},

20
flake.nix
View File

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

13
home/shahab/common/core/alacritty.nix
View File

@@ -1,7 +1,4 @@
{
config,
...
}:
{ config, ... }:
{
programs.alacritty = {
@@ -21,9 +18,7 @@
decorations_theme_variant = "None";
};
env = {
TERM = "xterm-256color";
};
env = { TERM = "xterm-256color"; };
terminal.shell.program = "zsh";
@@ -34,9 +29,7 @@
italic.family = config.hostSpec.font;
};
cursor = {
style = "Block";
};
cursor = { style = "Block"; };
general.live_config_reload = true;
};

26
home/shahab/common/core/default.nix
View File

@@ -1,16 +1,6 @@
{
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" ])
./alacritty.nix
./direnv.nix
@@ -24,9 +14,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";
@@ -37,7 +25,8 @@
};
file = {
"${config.xdg.configHome}/nvim".source = lib.custom.relativeToRoot "dotfiles/nvim";
"${config.xdg.configHome}/nvim".source =
lib.custom.relativeToRoot "dotfiles/nvim";
};
};
@@ -81,10 +70,7 @@
nix = {
package = lib.mkDefault pkgs.nix;
settings = {
experimental-features = [
"nix-command"
"flakes"
];
experimental-features = [ "nix-command" "flakes" ];
warn-dirty = false;
};
};

7
home/shahab/common/core/fonts.nix
View File

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

27
home/shahab/common/core/git.nix
View File

@@ -1,9 +1,4 @@
{
lib,
pkgs,
config,
...
}: {
{ lib, pkgs, config, ... }: {
programs.git = {
package = pkgs.gitAndTools.gitFull;
enable = true;
@@ -11,24 +6,14 @@
userEmail = config.hostSpec.email.user;
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";
};
commit = { gpgsign = true; };
user = { signingKey = "~/.ssh/id_rihla.pub"; };
pull = { rebase = true; };
init = { defaultBranch = "main"; };
};
};
}

4
home/shahab/common/optional/btop.nix
View File

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

19
home/shahab/common/optional/hyprland.nix
View File

@@ -1,17 +1,16 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
{
home = {
file = {
"${config.xdg.configHome}/hypr".source = lib.custom.relativeToRoot "dotfiles/hypr";
"${config.xdg.configHome}/waybar".source = lib.custom.relativeToRoot "dotfiles/waybar";
"${config.xdg.configHome}/wofi".source = lib.custom.relativeToRoot "dotfiles/wofi";
"${config.xdg.configHome}/mako".source = lib.custom.relativeToRoot "dotfiles/mako";
"${config.xdg.configHome}/hypr".source =
lib.custom.relativeToRoot "dotfiles/hypr";
"${config.xdg.configHome}/waybar".source =
lib.custom.relativeToRoot "dotfiles/waybar";
"${config.xdg.configHome}/wofi".source =
lib.custom.relativeToRoot "dotfiles/wofi";
"${config.xdg.configHome}/mako".source =
lib.custom.relativeToRoot "dotfiles/mako";
};
packages = with pkgs; [

5
home/shahab/common/optional/misc-packages.nix
View File

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

4
home/shahab/common/optional/nvim.nix
View File

@@ -1,6 +1,4 @@
{
...
}:
{ ... }:
{
programs.neovim = {

4
home/shahab/common/optional/ssh.nix
View File

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

4
home/shahab/common/optional/starship.nix
View File

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

14
home/shahab/common/optional/tmux.nix
View File

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

6
home/shahab/rihla.nix
View File

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

23
hosts/common/core/default.nix
View File

@@ -1,10 +1,4 @@
{
pkgs,
inputs,
config,
lib,
...
}:
{ pkgs, inputs, config, lib, ... }:
{
imports = lib.flatten [
@@ -20,9 +14,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;
@@ -61,11 +53,10 @@
trusted-users = [ "@wheel" ];
substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
experimental-features = [
"nix-command"
"flakes"
trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
experimental-features = [ "nix-command" "flakes" ];
};
};
@@ -79,9 +70,7 @@
};
# ========= Sops =========
environment.systemPackages = with pkgs; [
sops
];
environment.systemPackages = with pkgs; [ sops ];
#
# ========== Localization ==========

41
hosts/common/disks/rihla.nix
View File

@@ -1,12 +1,4 @@
{
lib,
config,
device,
withSwap,
swapSize,
label,
...
}:
{ lib, config, device, withSwap, swapSize, label, ... }:
{
disko = {
@@ -42,10 +34,8 @@
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";
@@ -72,35 +62,20 @@
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" ];
};
};
};

5
hosts/common/optional/1password.nix
View File

@@ -1,7 +1,4 @@
{
config,
...
}:
{ config, ... }:
{
programs = {

4
hosts/common/optional/dconf.nix
View File

@@ -1,6 +1,4 @@
{
...
}:
{ ... }:
{
programs.dconf.enable = true;

11
hosts/common/optional/docker.nix
View File

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

10
hosts/common/optional/gaming.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
programs = {
@@ -15,8 +12,5 @@
gamemode.enable = true;
};
environment.systemPackages = with pkgs; [
mangohud
protonup-qt
];
environment.systemPackages = with pkgs; [ mangohud protonup-qt ];
}

9
hosts/common/optional/hyprland.nix
View File

@@ -1,13 +1,10 @@
{
inputs,
pkgs,
...
}:
{ inputs, pkgs, ... }:
{
programs.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
package =
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
portalPackage =
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
};

4
hosts/common/optional/nix-ld.nix
View File

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

9
hosts/common/optional/secure-boot.nix
View File

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

10
hosts/common/optional/services/audio.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
services = {
@@ -17,7 +14,6 @@
};
security.rtkit.enable = true;
environment.systemPackages = builtins.attrValues {
inherit (pkgs) pavucontrol;
};
environment.systemPackages =
builtins.attrValues { inherit (pkgs) pavucontrol; };
}

4
hosts/common/optional/services/bluetooth.nix
View File

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

4
hosts/common/optional/services/firmware.nix
View File

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

8
hosts/common/optional/services/greetd.nix
View File

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

11
hosts/common/optional/services/openssh.nix
View File

@@ -1,11 +1,6 @@
{
config,
...
}:
let
sshPort = config.hostSpec.networking.ports.tcp.ssh;
in
{
{ config, ... }:
let sshPort = config.hostSpec.networking.ports.tcp.ssh;
in {
services.openssh = {
enable = true;
ports = [ sshPort ];

4
hosts/common/optional/services/printing.nix
View File

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

4
hosts/common/optional/services/smart-card.nix
View File

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

9
hosts/common/optional/yubikey.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
# yubikey login / sudo
@@ -16,7 +13,5 @@
};
};
environment.systemPackages = with pkgs; [
yubikey-manager
];
environment.systemPackages = with pkgs; [ yubikey-manager ];
}

34
hosts/common/users/primary/default.nix
View File

@@ -1,10 +1,4 @@
{
pkgs,
config,
lib,
inputs,
...
}:
{ pkgs, config, lib, inputs, ... }:
let
hostSpec = config.hostSpec;
pubKeys = lib.filesystem.listFilesRecursive ./keys;
@@ -19,20 +13,15 @@ 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);
openssh.authorizedKeys.keys =
lib.lists.forEach pubKeys (key: builtins.readFile key);
packages = with pkgs; [
libnotify
];
packages = with pkgs; [ libnotify ];
};
};
@@ -42,12 +31,11 @@ in {
hostSpec = config.hostSpec;
};
users.${hostSpec.username}.imports = lib.flatten [
(
{ config, ... }:
import (lib.custom.relativeToRoot "home/${hostSpec.username}/${hostSpec.hostName}.nix") {
({ config, ... }:
import (lib.custom.relativeToRoot
"home/${hostSpec.username}/${hostSpec.hostName}.nix") {
inherit pkgs inputs config lib hostSpec;
}
)
})
];
};
}

25
hosts/nixos/rihla/default.nix
View File

@@ -1,10 +1,4 @@
{
inputs,
pkgs,
lib,
config,
...
}:
{ inputs, pkgs, lib, config, ... }:
{
imports = lib.flatten [
@@ -26,7 +20,8 @@
# ========= Disk Layout =========
#
inputs.disko.nixosModules.disko
(lib.custom.relativeToRoot "hosts/common/disks/rihla.nix") {
(lib.custom.relativeToRoot "hosts/common/disks/rihla.nix")
{
_module.args = {
device = "/dev/nvme0n1";
withSwap = true;
@@ -38,9 +33,7 @@
#
# ========= Required Configs =========
#
(map lib.custom.relativeToRoot [
"hosts/common/core"
])
(map lib.custom.relativeToRoot [ "hosts/common/core" ])
#
# ========= Optional Configs =========
@@ -59,7 +52,8 @@
#
# ========= Optional Services =========
#
(map (s: lib.custom.relativeToRoot "hosts/common/optional/services/${s}.nix") [
(map
(s: lib.custom.relativeToRoot "hosts/common/optional/services/${s}.nix") [
"audio"
"bluetooth"
"firmware"
@@ -91,7 +85,8 @@
efi.canTouchEfiVariables = true;
};
initrd.postResumeCommands = lib.mkIf config.hostSpec.impermanance (lib.mkAfter ''
initrd.postResumeCommands = lib.mkIf config.hostSpec.impermanance
(lib.mkAfter ''
mkdir /btrfs_tmp
mount /dev/crypt_vg/root /btrfs_tmp
if [[ -e /btrfs_tmp/root ]]; then
@@ -124,9 +119,7 @@
security.rtkit.enable = true;
environment.systemPackages = with pkgs; [
pciutils
];
environment.systemPackages = with pkgs; [ pciutils ];
system.stateVersion = "25.05";
}

11
hosts/nixos/rihla/hardware-configuration.nix
View File

@@ -1,13 +1,7 @@
# 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,
...
}: {
{ pkgs, config, lib, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
@@ -38,7 +32,8 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware = {
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
graphics = {
enable = true;
extraPackages = with pkgs; [ amdvlk ];

5
lib/default.nix
View File

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

8
modules/common/default.nix
View File

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

10
modules/common/host-spec.nix
View File

@@ -1,10 +1,5 @@
# Specifications For Differentiating Hosts
{
config,
lib,
...
}:
{
{ config, lib, ... }: {
options.hostSpec = {
username = lib.mkOption {
type = lib.types.str;
@@ -68,7 +63,8 @@
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;

8
modules/home-manager/default.nix
View File

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

25
modules/home-manager/yubikey-touch-detector.nix
View File

@@ -2,12 +2,11 @@
with lib;
let
cfg = config.services.yubikey-touch-detector;
in
{
let cfg = config.services.yubikey-touch-detector;
in {
options.services.yubikey-touch-detector = {
enable = mkEnableOption "a tool to detect when your YubiKey is waiting for a touch";
enable = mkEnableOption
"a tool to detect when your YubiKey is waiting for a touch";
package = mkOption {
type = types.package;
@@ -18,7 +17,8 @@ in
'';
};
socket.enable = mkEnableOption "starting the process only when the socket is used";
socket.enable =
mkEnableOption "starting the process only when the socket is used";
extraArgs = mkOption {
type = types.listOf types.str;
@@ -37,7 +37,8 @@ in
# 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;
@@ -50,15 +51,19 @@ in
systemd.user.services.yubikey-touch-detector = {
Unit = {
Description = "Detects when your YubiKey is waiting for a touch";
Requires = optionals cfg.socket.enable [ "yubikey-touch-detector.socket" ];
Requires =
optionals cfg.socket.enable [ "yubikey-touch-detector.socket" ];
};
Service = {
ExecStart = "${cfg.package}/bin/yubikey-touch-detector ${concatStringsSep " " cfg.extraArgs}";
ExecStart = "${cfg.package}/bin/yubikey-touch-detector ${
concatStringsSep " " cfg.extraArgs
}";
Environment = [ "PATH=${lib.makeBinPath [ pkgs.gnupg ]}" ];
Restart = "on-failure";
RestartSec = "1sec";
};
Install.Also = optionals cfg.socket.enable [ "yubikey-touch-detector.socket" ];
Install.Also =
optionals cfg.socket.enable [ "yubikey-touch-detector.socket" ];
Install.WantedBy = [ "default.target" ];
};
};