jolheiser
/
dotnix-archive
Archived
1
0
Fork 0
Code Issues Activity

chore: nixfmt -> alejandra 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
main
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/bat.nix
View File

@ -1,14 +1,15 @@
{ pkgs, ... }: {
{pkgs, ...}: {
programs.bat = {
enable = true;
config = { theme = "ctp-mocha"; };
config = {theme = "ctp-mocha";};
themes = {
ctp-mocha = builtins.readFile (pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "bat";
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9";
} + "/Catppuccin-mocha.tmTheme");
owner = "catppuccin";
repo = "bat";
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9";
}
+ "/Catppuccin-mocha.tmTheme");
};
};
}

6
apps/bottom.nix
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";
};
};

11
apps/default.nix
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
@ -53,5 +56,5 @@
stateVersion = "22.11";
};
programs = { home-manager.enable = true; };
programs = {home-manager.enable = true;};
}

46
apps/firefox.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
programs.firefox = {
enable = true;
profiles.default = {
@ -19,29 +19,31 @@
"browser.newtabpage.activity-stream.feeds.section.topstories" = false;
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
"browser.newtabpage.pinned" = builtins.toJSON [
{ url = "https://mynixos.com/"; }
{ url = "https://github.com/"; }
{ url = "https://git.jojodev.com/"; }
{url = "https://mynixos.com/";}
{url = "https://github.com/";}
{url = "https://git.jojodev.com/";}
];
};
bookmarks = [{
name = "Gitea";
toolbar = true;
bookmarks = [
{
name = "gitea";
tags = [ "gitea" ];
keyword = "gitea";
url = "https://github.com/go-gitea/gitea";
}
{
name = "jojodev";
tags = [ "gitea" ];
keyword = "jojodev";
url = "https://git.jojodev.com";
}
];
}];
bookmarks = [
{
name = "Gitea";
toolbar = true;
bookmarks = [
{
name = "gitea";
tags = ["gitea"];
keyword = "gitea";
url = "https://github.com/go-gitea/gitea";
}
{
name = "jojodev";
tags = ["gitea"];
keyword = "jojodev";
url = "https://git.jojodev.com";
}
];
}
];
};
};
}

5
apps/git.nix
View File

@ -1,4 +1,5 @@
let key = "0xB853ADA5DA7BBF7A";
let
key = "0xB853ADA5DA7BBF7A";
in {
programs.git = {
enable = true;
@ -20,7 +21,7 @@ in {
fo = "fetch origin";
};
lfs.enable = true;
ignores = [ ".idea/" ];
ignores = [".idea/"];
extraConfig = {
init.defaultBranch = "main";
merge.conflictstyle = "diff3";

2
apps/go.nix
View File

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

6
apps/gpg.nix
View File

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

87
apps/helix.nix
View File

@ -14,12 +14,12 @@
normal = "block";
select = "underline";
};
file-picker = { hidden = false; };
file-picker = {hidden = false;};
indent-guides = {
render = true;
skip-levels = 1;
};
soft-wrap = { enable = true; };
soft-wrap = {enable = true;};
statusline = {
right = [
"version-control"
@ -29,7 +29,7 @@
"file-encoding"
];
};
lsp = { display-messages = true; };
lsp = {display-messages = true;};
};
keys = {
normal = {
@ -45,33 +45,33 @@
S-right = "goto_next_buffer";
S-left = "goto_previous_buffer";
C-b = ":buffer-close";
C-s = [ "select_all" "select_regex" ];
C-s = ["select_all" "select_regex"];
C-j = "shrink_selection";
C-k = "expand_selection";
C-l = "select_next_sibling";
C-a = "select_all";
C-u = [ "half_page_up" "align_view_center" ];
C-d = [ "half_page_down" "align_view_center" ];
C-u = ["half_page_up" "align_view_center"];
C-d = ["half_page_down" "align_view_center"];
"{" = [ "goto_prev_paragraph" "collapse_selection" ];
"}" = [ "goto_next_paragraph" "collapse_selection" ];
"{" = ["goto_prev_paragraph" "collapse_selection"];
"}" = ["goto_next_paragraph" "collapse_selection"];
"0" = "goto_line_start";
"$" = "goto_line_end";
"^" = "goto_first_nonwhitespace";
G = "goto_file_end";
"%" = "match_brackets";
V = [ "select_mode" "extend_to_line_bounds" ];
C = [ "collapse_selection" "extend_to_line_end" "change_selection" ];
D = [ "extend_to_line_end" "delete_selection" ];
V = ["select_mode" "extend_to_line_bounds"];
C = ["collapse_selection" "extend_to_line_end" "change_selection"];
D = ["extend_to_line_end" "delete_selection"];
S = "surround_add";
d = {
d = [ "extend_to_line_bounds" "delete_selection" ];
t = [ "extend_till_char" ];
s = [ "surround_delete" ];
i = [ "select_textobject_inner" ];
a = [ "select_textobject_around" ];
d = ["extend_to_line_bounds" "delete_selection"];
t = ["extend_till_char"];
s = ["surround_delete"];
i = ["select_textobject_inner"];
a = ["select_textobject_around"];
};
x = "delete_selection";
@ -90,17 +90,16 @@
"collapse_selection"
];
w = [ "move_next_word_start" "move_char_right" "collapse_selection" ];
e = [ "move_next_word_end" "collapse_selection" ];
b = [ "move_prev_word_start" "collapse_selection" ];
w = ["move_next_word_start" "move_char_right" "collapse_selection"];
e = ["move_next_word_end" "collapse_selection"];
b = ["move_prev_word_start" "collapse_selection"];
i = [ "insert_mode" "collapse_selection" ];
a = [ "append_mode" "collapse_selection" ];
esc = [ "collapse_selection" "keep_primary_selection" ];
i = ["insert_mode" "collapse_selection"];
a = ["append_mode" "collapse_selection"];
esc = ["collapse_selection" "keep_primary_selection"];
};
insert = { esc = [ "collapse_selection" "normal_mode" ]; };
insert = {esc = ["collapse_selection" "normal_mode"];};
select = {
space = {
j = {
@ -108,28 +107,28 @@
c = ":pipe jq -c";
};
};
"{" = [ "extend_to_line_bounds" "goto_prev_paragraph" ];
"}" = [ "extend_to_line_bounds" "goto_next_paragraph" ];
"{" = ["extend_to_line_bounds" "goto_prev_paragraph"];
"}" = ["extend_to_line_bounds" "goto_next_paragraph"];
"0" = "goto_line_start";
"$" = "goto_line_end";
"^" = "goto_first_nonwhitespace";
G = "goto_file_end";
D = [ "extend_to_line_bounds" "delete_selection" "normal_mode" ];
C = [ "goto_line_start" "extend_to_line_bounds" "change_selection" ];
D = ["extend_to_line_bounds" "delete_selection" "normal_mode"];
C = ["goto_line_start" "extend_to_line_bounds" "change_selection"];
"%" = "match_brackets";
S = "surround_add";
i = "select_textobject_inner";
a = "select_textobject_around";
tab = [ "insert_mode" "collapse_selection" ];
C-a = [ "append_mode" "collapse_selection" ];
tab = ["insert_mode" "collapse_selection"];
C-a = ["append_mode" "collapse_selection"];
k = [ "extend_line_up" "extend_to_line_bounds" ];
j = [ "extend_line_down" "extend_to_line_bounds" ];
k = ["extend_line_up" "extend_to_line_bounds"];
j = ["extend_line_down" "extend_to_line_bounds"];
d = [ "yank_main_selection_to_clipboard" "delete_selection" ];
x = [ "yank_main_selection_to_clipboard" "delete_selection" ];
d = ["yank_main_selection_to_clipboard" "delete_selection"];
x = ["yank_main_selection_to_clipboard" "delete_selection"];
y = [
"yank_main_selection_to_clipboard"
"normal_mode"
@ -146,7 +145,7 @@
p = "replace_selections_with_clipboard";
P = "paste_clipboard_before";
esc = [ "collapse_selection" "keep_primary_selection" "normal_mode" ];
esc = ["collapse_selection" "keep_primary_selection" "normal_mode"];
};
};
};
@ -157,14 +156,14 @@
auto-format = true;
formatter = {
command = "jsonnetfmt";
args = [ "-" ];
args = ["-"];
};
}
{
name = "go";
formatter = {
command = "gofumpt";
args = [ ];
args = [];
};
}
{
@ -172,15 +171,15 @@
auto-format = true;
formatter = {
command = "black";
args = [ "--quiet" "-" ];
args = ["--quiet" "-"];
};
}
{
name = "nix";
auto-format = true;
formatter = {
command = "nixfmt";
args = [ ];
command = "alejandra";
args = ["-qq"];
};
}
];
@ -188,19 +187,19 @@
themes = {
catppuccin_frappe_transparent = {
inherits = "catppuccin_frappe";
"ui.background" = { };
"ui.background" = {};
};
catppuccin_latte_transparent = {
inherits = "catppuccin_latte";
"ui.background" = { };
"ui.background" = {};
};
catppuccin_macchiato_transparent = {
inherits = "catppuccin_macchiato";
"ui.background" = { };
"ui.background" = {};
};
catppuccin_mocha_transparent = {
inherits = "catppuccin_mocha";
"ui.background" = { };
"ui.background" = {};
};
};
};

2
apps/jq.nix
View File

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

2
apps/nushell.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
programs.nushell = {
enable = true;
configFile.source = ./nushell/config.nu;

5
apps/oh-my-posh.nix
View File

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

2
apps/zoxide.nix
View File

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

104
flake.nix
View File

@ -10,56 +10,64 @@
jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
};
nixConfig = { warn-dirty = false; };
nixConfig = {warn-dirty = false;};
outputs = { self, nixpkgs, home-manager, jolheiser-nur, ... }@inputs:
let
overlays = final: prev: {
nur = import inputs.nur {
nurpkgs = prev;
pkgs = prev;
repoOverrides = {
jolheiser = import jolheiser-nur { pkgs = prev; };
};
};
};
commonConfig = { username }:
({ config, pkgs, ... }: {
config = {
nixpkgs.overlays = [ overlays ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
sharedModules = [
# inputs.jolheiser-nur.homeManagerModules.default
];
users.${username}.imports = [ ./apps ];
extraSpecialArgs = {
flakePath = "/home/${username}/.config/nixpkgs";
};
};
};
});
in {
nixosConfigurations = {
"chai" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
./machines/common
./machines/chai
(commonConfig { username = "jolheiser"; })
];
};
"matcha" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
./machines/common
./machines/matcha
(commonConfig { username = "jolheiser"; })
];
outputs = {
self,
nixpkgs,
home-manager,
jolheiser-nur,
...
} @ inputs: let
overlays = final: prev: {
nur = import inputs.nur {
nurpkgs = prev;
pkgs = prev;
repoOverrides = {
jolheiser = import jolheiser-nur {pkgs = prev;};
};
};
};
commonConfig = {username}: ({
config,
pkgs,
...
}: {
config = {
nixpkgs.overlays = [overlays];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
sharedModules = [
# inputs.jolheiser-nur.homeManagerModules.default
];
users.${username}.imports = [./apps];
extraSpecialArgs = {
flakePath = "/home/${username}/.config/nixpkgs";
};
};
};
});
in {
nixosConfigurations = {
"chai" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
./machines/common
./machines/chai
(commonConfig {username = "jolheiser";})
];
};
"matcha" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
./machines/common
./machines/matcha
(commonConfig {username = "jolheiser";})
];
};
};
};
}

14
machines/chai/default.nix
View File

@ -1,17 +1,17 @@
{ pkgs, ... }:
let username = "jolheiser";
{pkgs, ...}: let
username = "jolheiser";
in {
imports = [ ./hardware.nix ../common ];
imports = [./hardware.nix ../common];
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "quiet" "splash" ];
kernelParams = ["quiet" "splash"];
loader.efi.canTouchEfiVariables = true;
loader.systemd-boot.enable = true;
initrd.systemd.enable = true;
};
hardware = { bluetooth.enable = true; };
hardware = {bluetooth.enable = true;};
networking = {
hostName = "chai";
@ -31,14 +31,14 @@ in {
pcscd.enable = true;
openssh = {
enable = true;
settings = { X11Forwarding = true; };
settings = {X11Forwarding = true;};
};
};
virtualisation.docker.enable = true;
users.users."${username}" = {
extraGroups = [ "wheel" "docker" ];
extraGroups = ["wheel" "docker"];
isNormalUser = true;
shell = pkgs.nushell;
};

25
machines/chai/hardware.nix
View File

@ -1,29 +1,30 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
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.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/b8a0cc98-5882-4b69-a8cb-375726767606";
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;

11
machines/common/default.nix
View File

@ -1,5 +1,5 @@
{ pkgs, ... }: {
imports = [ ./sound.nix ./xserver.nix ];
{pkgs, ...}: {
imports = [./sound.nix ./xserver.nix];
console.colors = [
"1e1e2e"
@ -47,7 +47,7 @@
gc.automatic = true;
package = pkgs.nixVersions.nix_2_15;
settings = {
experimental-features = [ "flakes" "nix-command" "repl-flake" ];
experimental-features = ["flakes" "nix-command" "repl-flake"];
auto-optimise-store = true;
};
};
@ -60,9 +60,8 @@
};
environment = {
systemPackages = with pkgs; [ podman podman-compose podman-tui ];
systemPackages = with pkgs; [podman podman-compose podman-tui];
};
fonts.fonts = with pkgs;
[ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
fonts.fonts = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono"];})];
}

2
machines/common/sound.nix
View File

@ -1,7 +1,7 @@
{
sound.enable = true;
hardware.pulseaudio.enable = false;
security = { rtkit.enable = true; };
security = {rtkit.enable = true;};
services = {
pipewire = {
enable = true;

2
machines/common/xserver.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
services.xserver = {
enable = true;
displayManager.lightdm.enable = true;

14
machines/matcha/default.nix
View File

@ -1,11 +1,11 @@
{ pkgs, ... }:
let username = "jolheiser";
{pkgs, ...}: let
username = "jolheiser";
in {
imports = [ ./hardware.nix ../common ];
imports = [./hardware.nix ../common];
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "quiet" "splash" ];
kernelParams = ["quiet" "splash"];
loader.grub = {
enable = true;
device = "/dev/sda";
@ -14,7 +14,7 @@ in {
};
};
boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
boot.initrd.secrets = {"/crypto_keyfile.bin" = null;};
boot.initrd.luks.devices = {
"luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".keyFile = "/crypto_keyfile.bin";
@ -24,7 +24,7 @@ in {
};
};
hardware = { bluetooth.enable = true; };
hardware = {bluetooth.enable = true;};
networking = {
hostName = "matcha";
@ -41,7 +41,7 @@ in {
virtualisation.docker.enable = true;
users.users."${username}" = {
extraGroups = [ "wheel" "docker" "storage" ];
extraGroups = ["wheel" "docker" "storage"];
isNormalUser = true;
shell = pkgs.nushell;
};

21
machines/matcha/hardware.nix
View File

@ -1,8 +1,13 @@
# 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, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
{
config,
lib,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = [
"xhci_pci"
@ -13,9 +18,9 @@
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/a3e3e496-9497-4340-9750-2104e2ab22ab";
@ -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