chore: nixfmt -> alejandra

Signed-off-by: jolheiser <john.olheiser@gmail.com>
teamcity
jolheiser 2023-07-06 14:32:19 -05:00
parent 896eb3f99d
commit b5993b95be
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
20 changed files with 199 additions and 183 deletions

View File

@ -8,7 +8,8 @@
repo = "bat";
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9";
} + "/Catppuccin-mocha.tmTheme");
}
+ "/Catppuccin-mocha.tmTheme");
};
};
}

View File

@ -6,8 +6,7 @@
table_header_color = "#f5e0dc";
all_cpu_color = "#f5e0dc";
avg_cpu_color = "#eba0ac";
cpu_core_colors =
[ "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" "#74c7ec" "#cba6f7" ];
cpu_core_colors = ["#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" "#74c7ec" "#cba6f7"];
ram_color = "#a6e3a1";
swap_color = "#fab387";
rx_color = "#a6e3a1";
@ -23,8 +22,7 @@
high_battery_color = "#a6e3a1";
medium_battery_color = "#f9e2af";
low_battery_color = "#f38ba8";
gpu_core_colors =
[ "#74c7ec" "#cba6f7" "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" ];
gpu_core_colors = ["#74c7ec" "#cba6f7" "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1"];
arc_color = "#89dceb";
};
};

View File

@ -1,4 +1,8 @@
{ pkgs, config, ... }: {
{
pkgs,
config,
...
}: {
imports = [
./bat.nix
./bottom.nix
@ -17,7 +21,6 @@
];
home = {
packages = with pkgs; [
# Tools
age
bitwarden-cli
@ -36,10 +39,10 @@
nodePackages.yaml-language-server
# Formatters
alejandra
black
gofumpt
nodePackages.lua-fmt
nixfmt
# IDEs
jetbrains.goland

View File

@ -24,7 +24,8 @@
{url = "https://git.jojodev.com/";}
];
};
bookmarks = [{
bookmarks = [
{
name = "Gitea";
toolbar = true;
bookmarks = [
@ -41,7 +42,8 @@
url = "https://git.jojodev.com";
}
];
}];
}
];
};
};
}

View File

@ -1,4 +1,5 @@
let key = "0xB853ADA5DA7BBF7A";
let
key = "0xB853ADA5DA7BBF7A";
in {
programs.git = {
enable = true;

View File

@ -1,5 +1,5 @@
{ pkgs, ... }:
let key = "0xB853ADA5DA7BBF7A";
{pkgs, ...}: let
key = "0xB853ADA5DA7BBF7A";
in {
home.packages = with pkgs; [pinentry];
programs.gpg = {

View File

@ -98,7 +98,6 @@
a = ["append_mode" "collapse_selection"];
esc = ["collapse_selection" "keep_primary_selection"];
};
insert = {esc = ["collapse_selection" "normal_mode"];};
select = {
@ -179,8 +178,8 @@
name = "nix";
auto-format = true;
formatter = {
command = "nixfmt";
args = [ ];
command = "alejandra";
args = ["-qq"];
};
}
];

View File

@ -1,7 +1,8 @@
{
programs.oh-my-posh = {
enable = true;
settings = builtins.fromJSON (builtins.unsafeDiscardStringContext
settings =
builtins.fromJSON (builtins.unsafeDiscardStringContext
(builtins.readFile ./ohmyposh/config.json));
};
}

View File

@ -12,8 +12,13 @@
nixConfig = {warn-dirty = false;};
outputs = { self, nixpkgs, home-manager, jolheiser-nur, ... }@inputs:
let
outputs = {
self,
nixpkgs,
home-manager,
jolheiser-nur,
...
} @ inputs: let
overlays = final: prev: {
nur = import inputs.nur {
nurpkgs = prev;
@ -23,8 +28,11 @@
};
};
};
commonConfig = { username }:
({ config, pkgs, ... }: {
commonConfig = {username}: ({
config,
pkgs,
...
}: {
config = {
nixpkgs.overlays = [overlays];
home-manager = {

View File

@ -1,5 +1,5 @@
{ pkgs, ... }:
let username = "jolheiser";
{pkgs, ...}: let
username = "jolheiser";
in {
imports = [./hardware.nix ../common];

View File

@ -1,10 +1,13 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
@ -14,16 +17,14 @@
fsType = "ext4";
};
boot.initrd.luks.devices."luks-bd0a4998-266e-4aae-8f20-89561a2fa169".device =
"/dev/disk/by-uuid/bd0a4998-266e-4aae-8f20-89561a2fa169";
boot.initrd.luks.devices."luks-bd0a4998-266e-4aae-8f20-89561a2fa169".device = "/dev/disk/by-uuid/bd0a4998-266e-4aae-8f20-89561a2fa169";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/5531-69DC";
fsType = "vfat";
};
swapDevices =
[{ device = "/dev/disk/by-uuid/eb7acf5d-e5db-45fa-8691-8ef5641cde68"; }];
swapDevices = [{device = "/dev/disk/by-uuid/eb7acf5d-e5db-45fa-8691-8ef5641cde68";}];
networking.useDHCP = lib.mkDefault true;

View File

@ -63,6 +63,5 @@
systemPackages = with pkgs; [podman podman-compose podman-tui];
};
fonts.fonts = with pkgs;
[ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
fonts.fonts = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono"];})];
}

View File

@ -1,5 +1,5 @@
{ pkgs, ... }:
let username = "jolheiser";
{pkgs, ...}: let
username = "jolheiser";
in {
imports = [./hardware.nix ../common];

View File

@ -1,7 +1,12 @@
# 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.
{ config, lib, modulesPath, ... }: {
{
config,
lib,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = [
@ -27,11 +32,9 @@
fsType = "ext4";
};
boot.initrd.luks.devices."luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".device =
"/dev/disk/by-uuid/1f9bde68-9c4c-423c-a95f-17aa170dd2b4";
boot.initrd.luks.devices."luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".device = "/dev/disk/by-uuid/1f9bde68-9c4c-423c-a95f-17aa170dd2b4";
swapDevices =
[{ device = "/dev/disk/by-uuid/7e84d904-b00a-4c6c-aba4-ec1dde2dff85"; }];
swapDevices = [{device = "/dev/disk/by-uuid/7e84d904-b00a-4c6c-aba4-ec1dde2dff85";}];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's