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

This commit is contained in:
2025-02-17 19:24:25 +05:00
parent 234e52f051
commit 7eab398f6d
41 changed files with 189 additions and 370 deletions

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;
};

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;
};
};

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 ];
}

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"; };
};
};
}

View File

@@ -1,7 +1,5 @@
{ ... }:
{
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,19 +1,18 @@
{
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; [
hyprshot
hyprlock

View File

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

View File

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

View File

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

View File

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

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 ];
};
}

View File

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

View File

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