fmt: reformat
This commit is contained in:
parent
9dbe1605e0
commit
a057d9bcc7
@ -1 +0,0 @@
|
||||
indentation = "Tabs"
|
14
flake.nix
14
flake.nix
@ -54,7 +54,8 @@
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
systems,
|
||||
nixpkgs,
|
||||
@ -62,7 +63,8 @@
|
||||
spaceport-nvim,
|
||||
nomodoro,
|
||||
...
|
||||
} @ inputs: let
|
||||
}@inputs:
|
||||
let
|
||||
customPackageOverlay =
|
||||
(import ./overlays/default.nix {
|
||||
inherit cmp-vimtex;
|
||||
@ -70,14 +72,14 @@
|
||||
inherit inputs;
|
||||
inherit nomodoro;
|
||||
parrot-nvim = inputs.parrot-nvim;
|
||||
})
|
||||
.overlay;
|
||||
}).overlay;
|
||||
# Small tool to iterate over each systems
|
||||
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
|
||||
|
||||
# Eval the treefmt modules from ./treefmt.nix
|
||||
treefmtEval = eachSystem (pkgs: inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
|
||||
in {
|
||||
in
|
||||
{
|
||||
nixosConfigurations = (
|
||||
import ./hosts/hosts.nix {
|
||||
inherit inputs;
|
||||
@ -98,6 +100,8 @@
|
||||
kubectl
|
||||
jq
|
||||
stern
|
||||
nixfmt-rfc-style
|
||||
alejandra
|
||||
];
|
||||
};
|
||||
});
|
||||
|
@ -1,4 +1,7 @@
|
||||
{pkgs ? import <nixpkgs> {}}: let
|
||||
{
|
||||
pkgs ? import <nixpkgs> { },
|
||||
}:
|
||||
let
|
||||
custom-fonts = pkgs.stdenvNoCC.mkDerivation {
|
||||
pname = "input";
|
||||
version = "1.0.2";
|
||||
@ -16,6 +19,7 @@
|
||||
description = "Input DJR font";
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
inherit custom-fonts;
|
||||
}
|
||||
|
@ -4,11 +4,12 @@
|
||||
specialArgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
pkgs-unstable = specialArgs.nixpkgs-unstable;
|
||||
in
|
||||
# default_python = pkgs-unstable.python313;
|
||||
{
|
||||
# default_python = pkgs-unstable.python313;
|
||||
{
|
||||
programs.home-manager.enable = true;
|
||||
home.packages =
|
||||
[
|
||||
@ -68,9 +69,11 @@ in
|
||||
"$HOME/.local/bin"
|
||||
];
|
||||
|
||||
home.sessionVariables = let
|
||||
home.sessionVariables =
|
||||
let
|
||||
win_home_dir = specialArgs.win_home_dir or "/mnt/c/Users/Deepak";
|
||||
in {
|
||||
in
|
||||
{
|
||||
# Namespace our own nixconf variables with DPK
|
||||
|
||||
# Set a common directory for Windows for WSL installs
|
||||
@ -110,7 +113,7 @@ in
|
||||
};
|
||||
includes = [
|
||||
# this allows us to have a local gitconfig maybe?
|
||||
{path = "~/.gitconfig.local";}
|
||||
{ path = "~/.gitconfig.local"; }
|
||||
];
|
||||
};
|
||||
|
||||
@ -182,7 +185,7 @@ in
|
||||
# syntax highlighting
|
||||
vim-just
|
||||
];
|
||||
extraConfig = import ./neovim/init-vim.nix {inherit config;};
|
||||
extraConfig = import ./neovim/init-vim.nix { inherit config; };
|
||||
};
|
||||
|
||||
programs.thefuck.enable = true;
|
||||
@ -264,8 +267,8 @@ in
|
||||
anthropic_api_key = {
|
||||
path = "${config.sops.defaultSymlinkPath}/anthropic_api_key";
|
||||
};
|
||||
hello = {};
|
||||
newkey = {};
|
||||
hello = { };
|
||||
newkey = { };
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,5 @@
|
||||
{config}: ''
|
||||
{ config }:
|
||||
''
|
||||
inoremap jj <Esc>
|
||||
inoremap kk <Esc>
|
||||
|
||||
|
@ -6,9 +6,11 @@
|
||||
modulesPath,
|
||||
hostname,
|
||||
...
|
||||
}: let
|
||||
custom-fonts = import ../fonts {inherit pkgs;};
|
||||
in {
|
||||
}:
|
||||
let
|
||||
custom-fonts = import ../fonts { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
"${modulesPath}/profiles/minimal.nix"
|
||||
];
|
||||
@ -38,8 +40,8 @@ in {
|
||||
'';
|
||||
|
||||
nix.settings = {
|
||||
trusted-substituters = ["http://attic.baklava"];
|
||||
trusted-public-keys = ["systems:tvbHIThn7MAwvgMSiYR3ULVlL6cBrA40afqGuextnNQ="];
|
||||
trusted-substituters = [ "http://attic.baklava" ];
|
||||
trusted-public-keys = [ "systems:tvbHIThn7MAwvgMSiYR3ULVlL6cBrA40afqGuextnNQ=" ];
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
|
@ -1,18 +1,21 @@
|
||||
{
|
||||
inputs,
|
||||
customPackageOverlay,
|
||||
# ...
|
||||
}: let
|
||||
# ...
|
||||
}:
|
||||
let
|
||||
linuxSystem = "x86_64-linux";
|
||||
lib = inputs.nixpkgs.lib;
|
||||
nixpkgs-unstable = import inputs.nixpkgs {
|
||||
system = linuxSystem;
|
||||
config.allowUnfreePredicate = pkg:
|
||||
config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"claude-code"
|
||||
];
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
"maxos" = inputs.nixpkgs-24-11.lib.nixosSystem {
|
||||
system = linuxSystem;
|
||||
specialArgs = {
|
||||
@ -33,7 +36,7 @@ in {
|
||||
};
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.deepak = {
|
||||
imports = [../home/deepak/home.nix];
|
||||
imports = [ ../home/deepak/home.nix ];
|
||||
};
|
||||
home-manager.sharedModules = [
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
@ -95,7 +98,7 @@ in {
|
||||
};
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.deepak = {
|
||||
imports = [../home/deepak/home.nix];
|
||||
imports = [ ../home/deepak/home.nix ];
|
||||
};
|
||||
home-manager.sharedModules = [
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
|
@ -5,9 +5,11 @@
|
||||
pkgs,
|
||||
customPackageOverlay,
|
||||
...
|
||||
}: let
|
||||
custom-fonts = import ../../fonts {inherit pkgs;};
|
||||
in {
|
||||
}:
|
||||
let
|
||||
custom-fonts = import ../../fonts { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
@ -150,7 +152,7 @@ in {
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
networking.firewall.allowedUDPPorts = [62532];
|
||||
networking.firewall.allowedUDPPorts = [ 62532 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
|
@ -6,7 +6,8 @@
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
@ -18,19 +19,20 @@
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [
|
||||
"kvm-intel"
|
||||
"wl"
|
||||
];
|
||||
boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/6d9433c6-2dab-4936-a924-d0a205381189";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."nixosroot".device = "/dev/disk/by-uuid/3b0d4c02-d9e5-44ab-8461-30797547ed70";
|
||||
boot.initrd.luks.devices."nixosroot".device =
|
||||
"/dev/disk/by-uuid/3b0d4c02-d9e5-44ab-8461-30797547ed70";
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/67E3-17ED";
|
||||
@ -38,7 +40,7 @@
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/1e0f60e9-cf43-451d-8466-81887f27c7cf";}
|
||||
{ device = "/dev/disk/by-uuid/1e0f60e9-cf43-451d-8466-81887f27c7cf"; }
|
||||
];
|
||||
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
|
@ -3,9 +3,11 @@
|
||||
customPackageOverlay,
|
||||
modulesPath,
|
||||
...
|
||||
}: let
|
||||
custom-fonts = import ../../fonts {inherit pkgs;};
|
||||
in {
|
||||
}:
|
||||
let
|
||||
custom-fonts = import ../../fonts { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
"${modulesPath}/profiles/minimal.nix"
|
||||
];
|
||||
|
@ -3,9 +3,11 @@
|
||||
customPackageOverlay,
|
||||
modulesPath,
|
||||
...
|
||||
}: let
|
||||
custom-fonts = import ../../fonts {inherit pkgs;};
|
||||
in {
|
||||
}:
|
||||
let
|
||||
custom-fonts = import ../../fonts { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
"${modulesPath}/profiles/minimal.nix"
|
||||
];
|
||||
|
@ -4,8 +4,11 @@
|
||||
nomodoro,
|
||||
parrot-nvim,
|
||||
inputs,
|
||||
}: let
|
||||
pluginoverlay = _final: prev: let
|
||||
}:
|
||||
let
|
||||
pluginoverlay =
|
||||
_final: prev:
|
||||
let
|
||||
cmpVimtexPlugin = prev.vimUtils.buildVimPlugin {
|
||||
src = cmp-vimtex;
|
||||
name = "cmp-vimtex";
|
||||
@ -33,7 +36,8 @@
|
||||
name = "zsh-completions";
|
||||
src = inputs.zsh-completions;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
customVimPlugins = {
|
||||
cmp-vimtex = cmpVimtexPlugin;
|
||||
spaceport-nvim = spaceportNvimPlugin;
|
||||
@ -46,7 +50,8 @@
|
||||
zsh-completions = zshCompletionPlugin;
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
overlay = inputs.nixpkgs.lib.composeManyExtensions [
|
||||
pluginoverlay
|
||||
inputs.claude-mcp-bundle.overlays.default
|
||||
|
17
treefmt.nix
17
treefmt.nix
@ -1,5 +1,6 @@
|
||||
# treefmt.nix
|
||||
{...}: {
|
||||
{ ... }:
|
||||
{
|
||||
projectRootFile = "treefmt.nix";
|
||||
settings.global.excludes = [
|
||||
"*.toml"
|
||||
@ -14,23 +15,17 @@
|
||||
|
||||
programs.mdsh.enable = true;
|
||||
|
||||
# programs.nixfmt.enable = true;
|
||||
# settings.formatter.nixfmt.indent = " ";
|
||||
programs.alejandra.enable = true;
|
||||
settings.formatter.alejandra.indentation = "Tabs";
|
||||
programs.nixfmt.enable = true;
|
||||
|
||||
programs.shellcheck.enable = true;
|
||||
|
||||
programs.shfmt.enable = true;
|
||||
settings.formatter.shfmt.indent = "\t";
|
||||
settings.formatter.shfmt.indent_size = 0;
|
||||
|
||||
programs.yamlfmt.enable = true;
|
||||
settings.formatter.yamlfmt.indent = 1; # yamlfmt uses number of tab characters for indent
|
||||
settings.formatter.yamlfmt.use_tabs = true;
|
||||
|
||||
programs.just.enable = true; # just format uses tabs by default if first line has tabs
|
||||
programs.just.enable = true;
|
||||
|
||||
programs.stylua.enable = true; # Already configured for tabs in stylua.toml
|
||||
programs.stylua.enable = true;
|
||||
|
||||
# Formatter specific settings
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user