added formatter and reformated

This commit is contained in:
ISnortPennies 2023-01-19 18:51:32 -05:00
parent 733eda4798
commit e1987d6461
24 changed files with 286 additions and 284 deletions

View file

@ -1,4 +1,4 @@
{config, pkgs, username, ...}:
{ config, pkgs, username, ... }:
{
imports = [
./librewolf.nix

View file

@ -1,4 +1,4 @@
{pkgs, ...}:
{ pkgs, ... }:
{
programs = {
librewolf = {

View file

@ -1,67 +1,70 @@
{pkgs, ... }:
{ pkgs, ... }:
let
vim-moonfly = pkgs.vimUtils.buildVimPlugin {
pname = "vim-moonfly";
version = "1.0.0";
src = pkgs.fetchFromGitHub {
owner = "bluz71";
repo = "vim-moonfly-colors";
rev = "065c99b95355b33dfaa05bde11ad758e519b04a3";
sha256 = "sha256-TEYN8G/VNxitpPJPM7+O9AGLm6V7bPkiTlFG5op55pI=";
vim-moonfly = pkgs.vimUtils.buildVimPlugin {
pname = "vim-moonfly";
version = "1.0.0";
src = pkgs.fetchFromGitHub {
owner = "bluz71";
repo = "vim-moonfly-colors";
rev = "065c99b95355b33dfaa05bde11ad758e519b04a3";
sha256 = "sha256-TEYN8G/VNxitpPJPM7+O9AGLm6V7bPkiTlFG5op55pI=";
};
};
};
in
{
# home.packages = with pkgs; [rustc cargo rust-analyzer clang-tools];
# home.packages = with pkgs; [rustc cargo rust-analyzer clang-tools];
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
extraPackages = with pkgs; [gcc ripgrep fd];
extraPackages = with pkgs; [ gcc ripgrep fd ];
plugins = with pkgs.vimPlugins; [
nvim-treesitter.withAllGrammars
rainbow nvim-ts-rainbow # rainbow for tree-sitter
nvim-colorizer-lua # colors
nvim-tree-lua # file browser
nvim-web-devicons # for tree-lua
vim-smoothie #smooth scrolling
undotree # better undotree
indentLine # indentlines
vim-smoothie #smooth scrolling
#non-trash auto completion
nvim-cmp
cmp-buffer
cmp-nvim-lsp
cmp-path
cmp-spell
cmp-treesitter
cmp-vsnip
vim-vsnip
lspkind-nvim
nvim-lspconfig
nvim-autopairs # auto brackets
telescope-nvim #search feature
telescope-fzy-native-nvim # search plugin
gitsigns-nvim #in buffer git blame
vim-moonfly #color scheme
lightline-vim #bottom bar
];
extraConfig = let
luaRequire = module:
builtins.readFile (builtins.toString
./config
nvim-treesitter.withAllGrammars
rainbow
nvim-ts-rainbow # rainbow for tree-sitter
nvim-colorizer-lua # colors
nvim-tree-lua # file browser
nvim-web-devicons # for tree-lua
vim-smoothie #smooth scrolling
undotree # better undotree
indentLine # indentlines
vim-smoothie #smooth scrolling
#non-trash auto completion
nvim-cmp
cmp-buffer
cmp-nvim-lsp
cmp-path
cmp-spell
cmp-treesitter
cmp-vsnip
vim-vsnip
lspkind-nvim
nvim-lspconfig
nvim-autopairs # auto brackets
telescope-nvim #search feature
telescope-fzy-native-nvim # search plugin
gitsigns-nvim #in buffer git blame
vim-moonfly #color scheme
lightline-vim #bottom bar
];
extraConfig =
let
luaRequire = module:
builtins.readFile (builtins.toString
./config
+ "/${module}.lua");
luaConfig = builtins.concatStringsSep "\n" (map luaRequire [
"init"
"lspconfig"
"nvim-cmp"
]);
in ''
lua << EOF
${luaConfig}
EOF
luaConfig = builtins.concatStringsSep "\n" (map luaRequire [
"init"
"lspconfig"
"nvim-cmp"
]);
in
''
lua << EOF
${luaConfig}
EOF
'';
};

View file

@ -1,14 +1,13 @@
{pkgs , ... }:
{ pkgs, ... }:
{
services.polybar = {
enable = true;
enable = true;
package = pkgs.polybarFull;
script = "polybar left & \n polybar middle & \n polybar right &";
settings = {
"settings" = {
screenchange.reload = true;
pseudo.transparency =false;
pseudo.transparency = false;
};
"colors" = {
background = "#000000";
@ -37,7 +36,7 @@
fixed.center = false;
dpi = 96;
offset.y = 10;
font = [ "Overpass Nerd Font:style=Regular:size=14;4" "Material Design Icons:style=Regular:size=16;4" ];
font = [ "Overpass Nerd Font:style=Regular:size=14;4" "Material Design Icons:style=Regular:size=16;4" ];
background = "\${colors.background}";
foreground = "\${colors.foreground}";
line.size = "3pt";
@ -79,7 +78,7 @@
fixed.center = false;
dpi = 96;
offset.y = 10;
font = [ "Overpass Nerd Font:style=Regular:size=14;4" "Material Design Icons:style=Regular:size=16;4" ];
font = [ "Overpass Nerd Font:style=Regular:size=14;4" "Material Design Icons:style=Regular:size=16;4" ];
background = "\${colors.background}";
foreground = "\${colors.foreground}";
line.size = "3pt";
@ -134,7 +133,7 @@
background = "\${colors.background}";
padding = 2;
};
};
};
};
"module/date" = {
type = "internal/date";
@ -167,14 +166,14 @@
unknown.as.up = true;
format = {
connected = "\"%{A1:networkmanager_dmenu:}<ramp-signal>%{A}\"";
disconnected = "\"%{A1:networkmanager_dmenu:}<label-disconnected>%{A}\"";
disconnected = "\"%{A1:networkmanager_dmenu:}<label-disconnected>%{A}\"";
};
label.disconnected = {
text = "";
padding = 0;
};
ramp.signal = {
text = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"];
text = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
foreground = "\${colors.foreground}";
background = "\${colors.background}";
padding = 1;
@ -189,7 +188,7 @@
unknown.as.up = true;
format = {
connected = "\"%{A1:networkmanager_dmenu:}<label-connected>%{A}\"";
disconnected = "\"%{A1:networkmanager_dmenu:}<label-disconnected>%{A}\"";
disconnected = "\"%{A1:networkmanager_dmenu:}<label-disconnected>%{A}\"";
};
label.connected = {
text = "";
@ -215,8 +214,8 @@
type = "internal/battery";
full.at = 100;
low.at = 20;
# battery = "BAT0";
# adapter = "ACAD";
# battery = "BAT0";
# adapter = "ACAD";
poll.interval = 5;
format = {
charging = "\"%{A1:xfce4-power-menu -c:}<animation-charging>%{A}\"";
@ -249,13 +248,13 @@
low = {
text = [ " " " " ];
framerate = 200;
foreground = "\${colors.alert}";
foreground = "\${colors.alert}";
background = "\${colors.background}";
};
};
ramp.capacity = {
text = [ " " " " " " " " " " ];
background = "\${colors.background}";
background = "\${colors.background}";
};
};
"module/pulseaudio" = {

View file

@ -1,4 +1,4 @@
{config, pkgs, ...}:
{ config, pkgs, ... }:
{
imports = [
./theme.nix

View file

@ -7,7 +7,7 @@
"XF86AudioPause" = "playerctl play-pause";
"XF86AudioStop" = "playerctl stop";
"XF86AudioNext" = "playerctl next";
"XF86AudioPrev" = "playerctl previous";
"XF86AudioPrev" = "playerctl previous";
"XF86AudioRaiseVolume" = "amixer sset Master 40+";
"XF86AudioLowerVolume" = "amixer sset Master 40-";
"XF86AudioMute" = "amixer sset Master toggle ";