From 121e1e9c372a064453499f1c30986ba4afecebca Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 22 Jan 2022 11:01:52 -0500 Subject: [PATCH] nixfmt --- nixos/configuration.nix | 37 ++++------- nixos/home.nix | 138 +++++++++++++++++++-------------------- nvim.configlink/init.lua | 4 +- 3 files changed, 81 insertions(+), 98 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 368267d..74beb5c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -5,10 +5,9 @@ { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - /etc/nixos/hardware-configuration.nix - ]; + imports = [ # Include the results of the hardware scan. + /etc/nixos/hardware-configuration.nix + ]; nixpkgs.config.allowUnfree = true; @@ -47,16 +46,12 @@ autoRepeatDelay = 250; autoRepeatInterval = 40; - /* desktopManager = { */ - /* xterm.enable = false; */ - /* xfce.enable = true; */ - /* }; */ - /* displayManager.defaultSession = "xfce"; */ - windowManager = { - awesome = { - enable = true; - }; - }; + # desktopManager = { + # xterm.enable = false; + # xfce.enable = true; + # }; + # displayManager.defaultSession = "xfce"; + windowManager = { awesome = { enable = true; }; }; # Enable touchpad support (enabled default in most desktopManager). libinput.enable = true; @@ -104,15 +99,11 @@ --rotate normal \ --output DVI-0 --off \ --output DVI-1 --off \ - ''; - + ''; # Install fonts - fonts.fonts = with pkgs; [ - victor-mono - nerdfonts - ]; - fonts.fontconfig.defaultFonts.monospace = ["Victor Mono"]; + fonts.fonts = with pkgs; [ victor-mono nerdfonts ]; + fonts.fontconfig.defaultFonts.monospace = [ "Victor Mono" ]; # Gaming hardware.opengl = { @@ -184,9 +175,7 @@ longitude = 74.0; }; - services.redshift = { - enable = true; - }; + services.redshift = { enable = true; }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/nixos/home.nix b/nixos/home.nix index e9e6858..2e5fdad 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -2,19 +2,26 @@ let - # Nothing + font = "Victor Mono"; -in - -{ +in { nixpkgs.config.allowUnfree = true; home.packages = with pkgs; [ + # Applications firefox - unzip neovim - gcc # for tree-sitter alacritty + _1password-gui + discord + # neomutt + himalaya # Email + mpv # Video viewer + sxiv # Image viewer + + # Utilities + unzip + gcc # for tree-sitter tmux rsync ripgrep @@ -24,13 +31,9 @@ in sd jq tealdeer - _1password-gui - discord gh - /* neomutt */ - himalaya # Email - mpv # Video viewer - sxiv # Image viewer + pass + nixfmt ]; programs.alacritty = { @@ -49,22 +52,13 @@ in scrolling.history = 10000; font = { size = 14.0; - normal = { - family = "Victor Mono"; - }; + normal = { family = "${font}"; }; }; - key_bindings = [ - /* { */ - /* key = "F"; */ - /* mods = "Super"; */ - /* action = "ToggleFullscreen"; */ - /* } */ - { - key = "L"; - mods = "Control|Shift"; - chars = "\\x1F"; - } - ]; + key_bindings = [{ + key = "L"; + mods = "Control|Shift"; + chars = "\\x1F"; + }]; colors = { primary = { background = "0x1d2021"; @@ -75,24 +69,24 @@ in cursor = "0xd5c4a1"; }; normal = { - black = "0x1d2021"; - red = "0xfb4934"; - green = "0xb8bb26"; - yellow = "0xfabd2f"; - blue = "0x83a598"; + black = "0x1d2021"; + red = "0xfb4934"; + green = "0xb8bb26"; + yellow = "0xfabd2f"; + blue = "0x83a598"; magenta = "0xd3869b"; - cyan = "0x8ec07c"; - white = "0xd5c4a1"; + cyan = "0x8ec07c"; + white = "0xd5c4a1"; }; bright = { - black = "0x665c54"; - red = "0xfe8019"; - green = "0x3c3836"; - yellow = "0x504945"; - blue = "0xbdae93"; + black = "0x665c54"; + red = "0xfe8019"; + green = "0x3c3836"; + yellow = "0x504945"; + blue = "0xbdae93"; magenta = "0xebdbb2"; - cyan = "0xd65d0e"; - white = "0xfbf1c7"; + cyan = "0xd65d0e"; + white = "0xfbf1c7"; }; }; draw_bold_text_with_bright_colors = false; @@ -101,7 +95,7 @@ in programs.fish = { enable = true; - functions = {}; + functions = { }; interactiveShellInit = ""; loginShellInit = ""; shellAbbrs = { @@ -150,7 +144,8 @@ in # GitHub ghr = "gh repo view -w"; - gha = "gh run list | head -1 | awk \'{ print $(NF-2) }\' | xargs gh run view"; + gha = + "gh run list | head -1 | awk '{ print $(NF-2) }' | xargs gh run view"; grw = "gh run watch"; grf = "gh run view --log-failed"; grl = "gh run view --log"; @@ -168,7 +163,7 @@ in work = "vim $NOTES_PATH/work.md"; # Improved CLI Tools - cat = "bat"; # Swap cat with bat + cat = "bat"; # Swap cat with bat h = "http -Fh --all"; # Curl site for headers j = "just"; @@ -177,7 +172,8 @@ in moon = "curl wttr.in/Moon"; # Cheat Sheets - ssl = "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr"; + ssl = + "openssl req -new -newkey rsa:2048 -nodes -keyout server.key -out server.csr"; fingerprint = "ssh-keyscan myhost.com | ssh-keygen -lf -"; publickey = "ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub"; forloop = "for i in (seq 1 100)"; @@ -207,13 +203,15 @@ in ca = "cargo"; }; - shellAliases = {}; + shellAliases = { }; shellInit = ""; }; home.sessionVariables = { - EDITOR = "nvim"; fish_greeting = ""; + EDITOR = "nvim"; + NIXOS_CONFIG = builtins.getEnv "PWD"; + DOTS = "${builtins.getEnv "PWD"}/.."; }; programs.starship = { @@ -244,12 +242,8 @@ in userName = "Noah Masur"; userEmail = "7386960+nmasur@users.noreply.github.com"; extraConfig = { - core = { - editor = "nvim"; - }; - pager = { - branch = "false"; - }; + core = { editor = "nvim"; }; + pager = { branch = "false"; }; }; }; @@ -260,23 +254,23 @@ in }; # Email - /* programs.himalaya = { */ - /* enable = true; */ - /* settings = { */ - /* name = "Noah Masur"; */ - /* downloads-dir = "~/Downloads"; */ - /* home = { */ - /* default = true; */ - /* email = "censored"; */ - /* imap-host = "censored"; */ - /* imap-port = 993; */ - /* imap-login = "censored"; */ - /* imap-passwd-cmd = "cat ~/.config/himalaya/passwd"; */ - /* smtp-host = "censored"; */ - /* smtp-port = 587; */ - /* smtp-login = "censored"; */ - /* smtp-passwd-cmd = "cat ~/.config/himalaya/passwd"; */ - /* }; */ - /* }; */ - /* }; */ + # programs.himalaya = { + # enable = true; + # settings = { + # name = "Noah Masur"; + # downloads-dir = "~/Downloads"; + # home = { + # default = true; + # email = "censored"; + # imap-host = "censored"; + # imap-port = 993; + # imap-login = "censored"; + # imap-passwd-cmd = "cat ~/.config/himalaya/passwd"; + # smtp-host = "censored"; + # smtp-port = 587; + # smtp-login = "censored"; + # smtp-passwd-cmd = "cat ~/.config/himalaya/passwd"; + # }; + # }; + # }; } diff --git a/nvim.configlink/init.lua b/nvim.configlink/init.lua index dcd09b2..2414398 100644 --- a/nvim.configlink/init.lua +++ b/nvim.configlink/init.lua @@ -165,7 +165,7 @@ require("packer").startup(function(use) args = { "run", "black", "--quiet", "--fast", "-" }, }), require("null-ls").builtins.formatting.fish_indent, - -- require("null-ls").builtins.formatting.nixfmt, + require("null-ls").builtins.formatting.nixfmt, require("null-ls").builtins.formatting.rustfmt, require("null-ls").builtins.diagnostics.shellcheck, require("null-ls").builtins.formatting.shfmt.with({ @@ -683,7 +683,7 @@ key("", "t#", ":Tabularize /#") key("", "tl", ":Tabularize /---") -- Vimrc editing -key("n", "fv", ":edit $MYVIMRC") +key("n", "fv", ":edit $DOTS/nvim.configlink/init.lua") key("n", "rr", ":luafile $MYVIMRC") key("n", "rp", ":luafile $MYVIMRC:PackerInstall:") key("n", "rc", ":luafile $MYVIMRC:PackerCompile")