noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-10-31 13:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixfmt

Browse Source
This commit is contained in:
Noah Masur
2022-01-22 11:01:52 -05:00
parent ecc00acc05
commit 121e1e9c37
3 changed files with 81 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/configuration.nix
View File

@@ -5,8 +5,7 @@
{ config, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
imports = [ # Include the results of the hardware scan.
/etc/nixos/hardware-configuration.nix
];
@@ -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;
@@ -106,13 +101,9 @@
--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.

102
nixos/home.nix
View File

@@ -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_bindings = [{
key = "L";
mods = "Control|Shift";
chars = "\\x1F";
}
];
}];
colors = {
primary = {
background = "0x1d2021";
@@ -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";
@@ -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";
# };
# };
# };
}

4
nvim.configlink/init.lua
View File

@@ -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("", "<Leader>t#", ":Tabularize /#<CR>")
key("", "<Leader>tl", ":Tabularize /---<CR>")
-- Vimrc editing
key("n", "<Leader>fv", ":edit $MYVIMRC<CR>")
key("n", "<Leader>fv", ":edit $DOTS/nvim.configlink/init.lua<CR>")
key("n", "<Leader>rr", ":luafile $MYVIMRC<CR>")
key("n", "<Leader>rp", ":luafile $MYVIMRC<CR>:PackerInstall<CR>:")
key("n", "<Leader>rc", ":luafile $MYVIMRC<CR>:PackerCompile<CR>")