Skip to content

Commit

Permalink
Ran formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
addisonbeck committed Nov 25, 2024
1 parent c0bbd67 commit 757aa15
Show file tree
Hide file tree
Showing 13 changed files with 167 additions and 176 deletions.
12 changes: 6 additions & 6 deletions config/colors.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
rockBottomNight0 = "#110f15";
bikiniBottomNight0 = "#050a1b";
bikiniBottomNight1 = "#050a1b";
bikiniBottomNight2 = "#2d9db8";
bikiniBottomNight2 = "#2d9db8";
gooLagoon = "#254657";
bikiniBottomSand = "D8E4B9";
krustyKrabFloor = "#3A662F";
Expand All @@ -28,11 +28,11 @@
fg2 = "#d5c4a1"; # ++
fg3 = "#ebdbb2"; # +++
fg4 = "#fbf1c7"; # ++++
red = "#fb4934";
orange = "#fe8019";
yellow = "#fabd2f";
green = "#b8bb26";
aqua = "#8ec07c";
red = "#fb4934";
orange = "#fe8019";
yellow = "#fabd2f";
green = "#b8bb26";
aqua = "#8ec07c";
blue = "#83a598";
purple = "#d3869b";
brown = "#d65d0e";
Expand Down
4 changes: 2 additions & 2 deletions config/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ ... }: let
{...}: let
colors = import ./colors.nix;
in {
colors = colors;
themes = (import ./themes { inherit colors; });
themes = import ./themes {inherit colors;};
activeTheme = {
colorScheme = import ./color-scheme.nix;
systemTheme = import ./system-theme.nix;
Expand Down
6 changes: 3 additions & 3 deletions config/themes/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ colors }: let
{colors}: let
in {
spongebob = (import ./spongebob { inherit colors; });
gruvbox = (import ./gruvbox { inherit colors; });
spongebob = import ./spongebob {inherit colors;};
gruvbox = import ./gruvbox {inherit colors;};
}
2 changes: 1 addition & 1 deletion config/themes/gruvbox/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ colors } : {
{colors}: {
dark = {
base00 = colors.gruvbox.hard.dark.bg1;
base01 = colors.gruvbox.hard.dark.bg2;
Expand Down
34 changes: 17 additions & 17 deletions config/themes/spongebob/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ colors }: {
{colors}: {
dark = {
base00 = colors.spongebob.rockBottomNight0;
base01 = colors.spongebob.bikiniBottomNight0;
base02 = colors.spongebob.bikiniBottomNight1;
base03 = colors.spongebob.bikiniBottomNight2;
base04 = colors.spongebob.gooLagoon;
base05 = colors.spongebob.bikiniBottomSand;
base06 = colors.spongebob.kurstyKrabFloor;
base07 = colors.spongebob.chumBucketGlove;
base08 = colors.spongebob.mrKrabsRed;
base09 = colors.spongebob.mermaidManOrange;
base0A = colors.spongebob.spongebobYellow;
base0B = colors.spongebob.planktonGreen;
base0C = colors.spongebob.garyBlue;
base0D = colors.spongebob.bikiniBottomDay0;
base0E = colors.spongebob.jellyfishPurple;
base0F = colors.spongebob.spongebobsPantsBrown;
base00 = colors.spongebob.rockBottomNight0;
base01 = colors.spongebob.bikiniBottomNight0;
base02 = colors.spongebob.bikiniBottomNight1;
base03 = colors.spongebob.bikiniBottomNight2;
base04 = colors.spongebob.gooLagoon;
base05 = colors.spongebob.bikiniBottomSand;
base06 = colors.spongebob.kurstyKrabFloor;
base07 = colors.spongebob.chumBucketGlove;
base08 = colors.spongebob.mrKrabsRed;
base09 = colors.spongebob.mermaidManOrange;
base0A = colors.spongebob.spongebobYellow;
base0B = colors.spongebob.planktonGreen;
base0C = colors.spongebob.garyBlue;
base0D = colors.spongebob.bikiniBottomDay0;
base0E = colors.spongebob.jellyfishPurple;
base0F = colors.spongebob.spongebobsPantsBrown;
};
}
2 changes: 1 addition & 1 deletion system/with/user/with/program/kitty.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# The regular font is sans serif and is handled by stylix
# Handwritten
italic_font MonaspiceRn Nerd Font Mono Regular
italic_font MonaspiceRn Nerd Font Mono Regular
# Mechanical
bold_font MonaspiceKr Nerd Font Mono Regular
Expand Down
6 changes: 1 addition & 5 deletions system/with/user/with/program/lazysql.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
pkgs ? import <nixpkgs> {},
...
}:
let
{pkgs ? import <nixpkgs> {}, ...}: let
# configContent = ''
# host = "localhost"
# port = 3306
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ conf, ... }: {
{conf, ...}: {
autoCommands = [
# disable semantic highlighting
{
Expand Down Expand Up @@ -58,7 +58,7 @@
local function find_code_blocks(node)
local result = {}
local function traverse(node)
if node:type() == 'fenced_code_block' then
if node:type() == 'fenced_code_block' then
local start_row, start_col, end_row, end_col = node:range()
table.insert(result, {start_row, start_col, end_row, end_col})
end
Expand Down
9 changes: 3 additions & 6 deletions system/with/user/with/program/neovim/colors/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
conf,
...
}: {
{conf, ...}: {
options = {
background = "${conf.activeTheme.systemTheme}";
termguicolors = false;
Expand Down Expand Up @@ -72,9 +69,9 @@
italic = true;
bold = false;
bg =
conf.themes.${conf.activeTheme.colorScheme}.${conf.activeTheme.systemTheme}.base01;
conf.themes.${conf.activeTheme.colorScheme}.${conf.activeTheme.systemTheme}.base01;
fg =
conf.themes.${conf.activeTheme.colorScheme}.${conf.activeTheme.systemTheme}.base0E;
conf.themes.${conf.activeTheme.colorScheme}.${conf.activeTheme.systemTheme}.base0E;
};
"@markup.heading" = {
underdotted = true;
Expand Down
17 changes: 8 additions & 9 deletions system/with/user/with/program/neovim/commands/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
key = "<C-m>";
silent = true;
};
action.__raw = (builtins.readFile ./search_marks.lua);
action.__raw = builtins.readFile ./search_marks.lua;
};
searchNotes = {
description = ''Grep search my notes'';
Expand Down Expand Up @@ -210,7 +210,7 @@
'';
vimCommandName = "SearchTelescopePickers";
vimKeymapBinding = {
modes = ["n" "v" ];
modes = ["n" "v"];
key = "<Space><Space>";
silent = true;
};
Expand Down Expand Up @@ -294,7 +294,7 @@
key = "<C-b>";
silent = true;
};
action.__raw = (builtins.readFile ./search_buffers.lua);
action.__raw = builtins.readFile ./search_buffers.lua;
};
searchOldfiles = {
description = ''
Expand Down Expand Up @@ -485,7 +485,7 @@
key = "<Space>k>";
silent = true;
};
action.__raw = (builtins.readFile ./search_keymaps.lua);
action.__raw = builtins.readFile ./search_keymaps.lua;
};
searchCommands = {
description = ''
Expand All @@ -497,7 +497,7 @@
key = "<C-c>";
silent = true;
};
action.__raw = (builtins.readFile ./search_commands.lua);
action.__raw = builtins.readFile ./search_commands.lua;
};
jumpDownHalfThePage = {
description = "Jump down half of the screen height";
Expand All @@ -508,7 +508,7 @@
silent = true;
};
# This emulates the default behavior or <C-d>
action.__raw = (builtins.readFile ./jump_down_half_a_page.lua);
action.__raw = builtins.readFile ./jump_down_half_a_page.lua;
};
jumpUpHalfThePage = {
description = "Jump up half of the screen height";
Expand All @@ -519,7 +519,7 @@
silent = true;
};
# This emulates the default behavior or <C-u>
action.__raw = (builtins.readFile ./jump_up_half_a_page.lua);
action.__raw = builtins.readFile ./jump_up_half_a_page.lua;
};
toggleNumberLine = {
description = "Toggle line numbers";
Expand Down Expand Up @@ -662,7 +662,7 @@
key = "<C-s>";
silent = true;
};
action.__raw = (builtins.readFile ./super_search.lua);
action.__raw = builtins.readFile ./super_search.lua;
};
mkNote = {
description = ''
Expand Down Expand Up @@ -703,7 +703,6 @@
'';
};
};

in {
keymaps =
[
Expand Down
Loading

0 comments on commit 757aa15

Please sign in to comment.