Format code with alejandra

This commit is contained in:
2022-04-23 17:52:45 +01:00
parent 0d56231235
commit d90883e404
27 changed files with 743 additions and 677 deletions

View File

@@ -1,192 +1,205 @@
{ config, lib, pkgs, ...}:
let
mod = "Mod4";
{
config,
lib,
pkgs,
...
}: let
mod = "Mod4";
in {
home.file = {
"bin/scripts/goup" = {
source = ./goup;
executable = true;
};
"bin/scripts/godown" = {
source = ./godown;
executable = true;
};
};
xsession = {
enable = true;
home.file = {
"bin/scripts/goup" = {
source = ./goup;
executable = true;
};
"bin/scripts/godown" = {
source = ./godown;
executable = true;
};
};
xsession = {
enable = true;
windowManager.i3 = {
enable = true;
package = pkgs.i3-gaps;
config = {
bars = [
{
colors = {
background = "#282A36";
statusline = "#F8F8F2";
separator = "#44475A";
windowManager.i3 = {
enable = true;
package = pkgs.i3-gaps;
config = {
bars = [
{
colors = {
background = "#282A36";
statusline = "#F8F8F2";
separator = "#44475A";
activeWorkspace = {
border = "#282A36";
background = "#44475A";
text = "#F8F8F2";
};
focusedWorkspace = {
border = "#44475A";
background = "#44475A";
text = "#F8F8F2";
};
inactiveWorkspace = {
border = "#282A36";
background = "#282A36";
text = "#BFBFBF";
};
urgentWorkspace = {
border = "#FF5555";
background = "#FF5555";
text = "#F8F8F2";
};
bindingMode = {
border = "#FF5555";
background = "#FF5555";
text = "#F8F8F2";
};
};
fonts = {
size = 11.0;
};
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs /home/daniel/.config/i3status-rust/config-main.toml";
position = "top";
}
];
colors = {
focused = {
border = "#6272A4";
background = "#6272A4";
text = "#F8F8F2";
indicator = "#6272A4";
childBorder = "#6272A4";
};
focusedInactive = {
border = "#44475A";
background = "#44475A";
text = "#F8F8F2";
indicator = "#44475A";
childBorder = "#44475A";
};
unfocused = {
border = "#282A36";
background = "#282A36";
text = "#BFBFBF";
indicator = "#282A36";
childBorder = "#282A36";
};
urgent = {
border = "#44475A";
background = "#FF5555";
text = "#F8F8F2";
indicator = "#FF5555";
childBorder = "#FF5555";
};
placeholder = {
border = "#282A36";
background = "#282A36";
text = "#F8F8F2";
indicator = "#282A36";
childBorder = "#282A36";
};
background = "#F8F8F2";
};
activeWorkspace = {
border = "#282A36";
background = "#44475A";
text = "#F8F8F2";
};
focusedWorkspace = {
border = "#44475A";
background = "#44475A";
text = "#F8F8F2";
};
inactiveWorkspace = {
border = "#282A36";
background = "#282A36";
text = "#BFBFBF";
};
urgentWorkspace = {
border = "#FF5555";
background = "#FF5555";
text = "#F8F8F2";
};
bindingMode = {
border = "#FF5555";
background = "#FF5555";
text = "#F8F8F2";
};
};
fonts = {
size = 11.0;
};
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs /home/daniel/.config/i3status-rust/config-main.toml";
position = "top";
}
];
colors = {
focused = {
border = "#6272A4";
background = "#6272A4";
text = "#F8F8F2";
indicator = "#6272A4";
childBorder = "#6272A4";
};
focusedInactive = {
border = "#44475A";
background = "#44475A";
text = "#F8F8F2";
indicator = "#44475A";
childBorder = "#44475A";
};
unfocused = {
border = "#282A36";
background = "#282A36";
text = "#BFBFBF";
indicator = "#282A36";
childBorder = "#282A36";
};
urgent = {
border = "#44475A";
background = "#FF5555";
text = "#F8F8F2";
indicator = "#FF5555";
childBorder = "#FF5555";
};
placeholder = {
border = "#282A36";
background = "#282A36";
text = "#F8F8F2";
indicator = "#282A36";
childBorder = "#282A36";
};
background = "#F8F8F2";
};
defaultWorkspace = "workspace number 1";
defaultWorkspace = "workspace number 1";
floating = {
modifier = mod;
criteria = [
{instance = "pavucontrol";}
];
};
floating = {
modifier = mod;
criteria = [
{ instance = "pavucontrol"; }
];
};
focus = {
followMouse = false;
};
focus = {
followMouse = false;
};
fonts = {
names = ["pango:monospace 8"];
style = "monospace";
size = 8.0;
};
fonts = {
names = [ "pango:monospace 8" ];
style = "monospace";
size = 8.0;
};
gaps = {
outer = lib.mkDefault 10;
inner = lib.mkDefault 5;
smartBorders = "on";
};
gaps = {
outer = lib.mkDefault 10;
inner = lib.mkDefault 5;
smartBorders = "on";
};
keybindings = lib.mkOptionDefault {
"${mod}+q" = "kill";
"${mod}+d" = "exec rofi -show drun";
keybindings = lib.mkOptionDefault {
"${mod}+q" = "kill";
"${mod}+d" = "exec rofi -show drun";
"${mod}+h" = "focus left";
"${mod}+j" = "focus down";
"${mod}+k" = "focus up";
"${mod}+l" = "focus right";
"${mod}+h" = "focus left";
"${mod}+j" = "focus down";
"${mod}+k" = "focus up";
"${mod}+l" = "focus right";
"${mod}+Shift+h" = "move left";
"${mod}+Shift+l" = "move right";
"${mod}+Shift+h" = "move left";
"${mod}+Shift+l" = "move right";
"${mod}+Tab" = "workspace back_and_forth";
"${mod}+Tab" = "workspace back_and_forth";
"${mod}+b" = "split h";
"${mod}+v" = "split v";
"${mod}+Control+Return" = "exec --no-startup-id i3utils workspace new";
"${mod}+Control+Shift+Return" = "exec --no-startup-id i3utils workspace new -b";
"${mod}+Shift+Return" = "exec --no-startup-id i3utils workspace new -n, move next";
"${mod}+b" = "split h";
"${mod}+v" = "split v";
"${mod}+Control+Return" = "exec --no-startup-id i3utils workspace new";
"${mod}+Control+Shift+Return" = "exec --no-startup-id i3utils workspace new -b";
"${mod}+Shift+Return" = "exec --no-startup-id i3utils workspace new -n, move next";
"${mod}+Control+j" = "exec --no-startup-id $HOME/bin/scripts/godown";
"${mod}+Control+k" = "exec --no-startup-id $HOME/bin/scripts/goup";
"${mod}+Control+h" = "exec --no-startup-id i3utils workspace new -b";
"${mod}+Control+j" = "exec --no-startup-id $HOME/bin/scripts/godown";
"${mod}+Control+k" = "exec --no-startup-id $HOME/bin/scripts/goup";
"${mod}+Control+h" = "exec --no-startup-id i3utils workspace new -b";
"${mod}+Shift+k" = "exec --no-startup-id i3utils window move prev";
"${mod}+Shift+j" = "exec --no-startup-id i3utils window move next";
"${mod}+Shift+k" = "exec --no-startup-id i3utils window move prev";
"${mod}+Shift+j" = "exec --no-startup-id i3utils window move next";
"${mod}+p" = "scratchpad show";
"${mod}+p" = "scratchpad show";
"${mod}+Escape" = "exec loginctl lock-session";
"${mod}+Escape" = "exec loginctl lock-session";
"XF86MonBrightnessUp" = "exec xbacklight -inc 10";
"XF86MonBrightnessDown" = "exec xbacklight -dec 10";
"XF86AudioMute" = "exec pamixer -t";
"XF86AudioLowerVolume" = "exec pamixer -d 10";
"XF86AudioRaiseVolume" = "exec pamixer -i 10";
"XF86AudioPrev" = "exec playerctl previous";
"XF86AudioPlay" = "exec playerctl play-pause";
"XF86AudioNext" = "exec playerctl next";
"XF86MonBrightnessUp" = "exec xbacklight -inc 10";
"XF86MonBrightnessDown" = "exec xbacklight -dec 10";
"XF86AudioMute" = "exec pamixer -t";
"XF86AudioLowerVolume" = "exec pamixer -d 10";
"XF86AudioRaiseVolume" = "exec pamixer -i 10";
"XF86AudioPrev" = "exec playerctl previous";
"XF86AudioPlay" = "exec playerctl play-pause";
"XF86AudioNext" = "exec playerctl next";
"Mod1+Shift+4" = "exec flameshot gui -s -p ~/Pictures/screenshots";
};
"Mod1+Shift+4" = "exec flameshot gui -s -p ~/Pictures/screenshots";
};
modifier = mod;
modifier = mod;
startup = [
{
command = "$HOME/bin/scripts/flower";
always = true;
}
{
command = "feh --bg-fill $HOME/wallpapers/wallpaper.jpg";
always = false;
}
];
startup = [
{ command = "$HOME/bin/scripts/flower"; always = true; }
{ command = "feh --bg-fill $HOME/wallpapers/wallpaper.jpg"; always = false; }
];
terminal = "kitty";
terminal = "kitty";
window = {
border = lib.mkDefault 2;
titlebar = false;
commands = [
{ command = "move position center #2116 46"; criteria = { class = "jetbrains-toolbox"; }; }
{ command = "move scratchpad"; criteria = { instance = "spotify"; }; }
];
};
};
};
};
window = {
border = lib.mkDefault 2;
titlebar = false;
commands = [
{
command = "move position center #2116 46";
criteria = {class = "jetbrains-toolbox";};
}
{
command = "move scratchpad";
criteria = {instance = "spotify";};
}
];
};
};
};
};
}

View File

@@ -1,9 +1,11 @@
{ config, pkgs, ... }:
{
programs.i3status-rust = {
enable = true;
bars = {
config,
pkgs,
...
}: {
programs.i3status-rust = {
enable = true;
bars = {
main = {
theme = "dracula";
icons = "awesome";
@@ -37,13 +39,13 @@
{
block = "music";
player = "spotify";
buttons = [ "prev" "play" "next" ];
buttons = ["prev" "play" "next"];
}
{
block = "sound";
}
];
};
};
};
};
};
}

View File

@@ -1,20 +1,16 @@
{pkgs, ...}:
{pkgs, ...}: {
services.polybar = {
enable = true;
{
services.polybar = {
enable = true;
package = pkgs.polybar.override {
i3Support = true;
pulseSupport = true;
};
package = pkgs.polybar.override {
i3Support = true;
pulseSupport = true;
};
script = ''
polybar main & disown
'';
script = ''
polybar main & disown
'';
config = ./config;
};
config = ./config;
};
}

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.rofi = {
enable = true;
theme = ./colour.rasi;

View File

@@ -1,88 +1,86 @@
{ pkgs, ... }:
{pkgs, ...}: {
programs.alacritty = {
enable = false;
settings = {
font = {
normal = {
family = "Iosevka";
style = "Regular";
};
};
{
programs.alacritty = {
enable = false;
settings = {
font = {
normal = {
family = "Iosevka";
style = "Regular";
};
};
cursor = {
style = {
shape = "Underline";
};
};
cursor = {
style= {
shape = "Underline";
};
};
colors = {
primary = {
background = "0x282a36";
foreground = "0xf8f8f2";
};
cursor = {
text = "CellBackground";
cursor = "CellForeground";
};
vi_mode_cursor = {
text = "CellBackground";
cursor = "CellForeground";
};
search = {
matches = {
foreground = "0x44475a";
background = "0x50fa7b";
};
focused_match = {
foreground = "0x44475a";
background = "0xffb86c";
};
bar = {
background = "0x282a36";
foreground = "0xf8f8f2";
};
};
line_indicator = {
foreground = "None";
background = "None";
};
selection = {
text = "CellForeground";
background = "0x44475a";
};
normal = {
black = "0x000000";
red = "0xff5555";
green = "0x50fa7b";
yellow = "0xf1fa8c";
blue = "0xbd93f9";
magenta = "0xff79c6";
cyan = "0x8be9fd";
white = "0xbfbfbf";
};
bright = {
black = "0x4d4d4d";
red = "0xff6e67";
green = "0x5af78e";
yellow = "0xf4f99d";
blue = "0xcaa9fa";
magenta = "0xff92d0";
cyan = "0x9aedfe";
white = "0xe6e6e6";
};
dim = {
black = "0x14151b";
red = "0xff2222";
green = "0x1ef956";
yellow = "0xebf85b";
blue = "0x4d5b86";
magenta = "0xff46b0";
cyan = "0x59dffc";
white = "0xe6e6d1";
};
};
};
};
colors = {
primary = {
background = "0x282a36";
foreground = "0xf8f8f2";
};
cursor = {
text = "CellBackground";
cursor = "CellForeground";
};
vi_mode_cursor = {
text = "CellBackground";
cursor = "CellForeground";
};
search = {
matches = {
foreground = "0x44475a";
background = "0x50fa7b";
};
focused_match = {
foreground = "0x44475a";
background = "0xffb86c";
};
bar = {
background = "0x282a36";
foreground = "0xf8f8f2";
};
};
line_indicator = {
foreground = "None";
background = "None";
};
selection = {
text = "CellForeground";
background = "0x44475a";
};
normal = {
black = "0x000000";
red = "0xff5555";
green = "0x50fa7b";
yellow = "0xf1fa8c";
blue = "0xbd93f9";
magenta = "0xff79c6";
cyan = "0x8be9fd";
white = "0xbfbfbf";
};
bright = {
black = "0x4d4d4d";
red = "0xff6e67";
green = "0x5af78e";
yellow = "0xf4f99d";
blue = "0xcaa9fa";
magenta = "0xff92d0";
cyan = "0x9aedfe";
white = "0xe6e6e6";
};
dim = {
black = "0x14151b";
red = "0xff2222";
green = "0x1ef956";
yellow = "0xebf85b";
blue = "0x4d5b86";
magenta = "0xff46b0";
cyan = "0x59dffc";
white = "0xe6e6d1";
};
};
};
};
}

View File

@@ -1,7 +1,6 @@
{...}:
{
{...}: {
home.file.".config/helix" = {
source = ./config;
recursive = true;
};
source = ./config;
recursive = true;
};
}

View File

@@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.kitty = {
enable = true;
font = {

View File

@@ -1,31 +1,30 @@
{ pkgs, ... }:
{pkgs, ...}: {
programs.neovim = {
enable = true;
{
programs.neovim = {
enable = true;
plugins = with pkgs.vimPlugins; [
(nvim-treesitter.withPlugins (
plugins:
with plugins; [
#tree-sitter-nix
tree-sitter-go
tree-sitter-c
tree-sitter-rust
tree-sitter-vim
tree-sitter-lua
tree-sitter-python
tree-sitter-html
tree-sitter-json
tree-sitter-markdown
tree-sitter-javascript
tree-sitter-typescript
]
))
vim-nix
plugins = with pkgs.vimPlugins; [
(nvim-treesitter.withPlugins (
plugins: with plugins; [
#tree-sitter-nix
tree-sitter-go
tree-sitter-c
tree-sitter-rust
tree-sitter-vim
tree-sitter-lua
tree-sitter-python
tree-sitter-html
tree-sitter-json
tree-sitter-markdown
tree-sitter-javascript
tree-sitter-typescript
]
))
vim-nix
nvim-lspconfig
];
viAlias = true;
vimAlias = true;
};
nvim-lspconfig
];
viAlias = true;
vimAlias = true;
};
}

View File

@@ -1,156 +1,157 @@
{ pkgs, lib, fetchurl, hostname, headless, ... }:
let
cliPackages = with pkgs; [
aerc
entr
go_1_18
gomuks
gopls
oh-my-zsh
(
let
my-python-packages = python-packages: with python-packages; [
tkinter
requests
];
python-with-my-packages = python3.withPackages my-python-packages;
in
python-with-my-packages
)
ranger
restic
rust-analyzer
starship
];
guiPackages = with pkgs; [
_1password
_1password-gui
discord
feh
iosevka
jetbrains.goland
mpv
nerdfonts
pamixer
pavucontrol
playerctl
spotify
xclip
];
in
{
imports = [
pkgs,
lib,
fetchurl,
hostname,
headless,
...
}: let
cliPackages = with pkgs; [
aerc
entr
go_1_18
gomuks
gopls
oh-my-zsh
(
let
my-python-packages = python-packages:
with python-packages; [
tkinter
requests
];
python-with-my-packages = python3.withPackages my-python-packages;
in
python-with-my-packages
)
ranger
restic
rust-analyzer
starship
];
./configs/system
guiPackages = with pkgs; [
_1password
_1password-gui
discord
feh
iosevka
jetbrains.goland
mpv
nerdfonts
pamixer
pavucontrol
playerctl
spotify
xclip
];
in {
imports =
[
./configs/system
]
++ lib.optionals (!headless) [
./configs/desktop
]
++ lib.optionals (builtins.pathExists ./host-specific/${hostname}) [
./host-specific/${hostname}
];
] ++ lib.optionals (!headless) [
home = {
username = "daniel";
homeDirectory = "/home/daniel";
sessionPath = [
"$HOME/go/bin"
];
./configs/desktop
file = {
".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/capitaine-cursors";
] ++ lib.optionals (builtins.pathExists ./host-specific/${hostname}) [
"bin/update" = {
source = ../../scripts/update;
executable = true;
};
./host-specific/${hostname}
"bin/supdate" = {
source = ../../scripts/supdate;
executable = true;
};
};
];
packages = cliPackages ++ lib.optionals (!headless) guiPackages;
home = {
username = "daniel";
homeDirectory = "/home/daniel";
sessionPath = [
"$HOME/go/bin"
];
keyboard = {
layout = "gb";
options = [
"caps:escape"
];
};
file = {
".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/capitaine-cursors";
stateVersion = "21.05";
};
"bin/update" = {
source = ../../scripts/update;
executable = true;
};
programs = {
# Let Home Manager install and manage itself.
home-manager.enable = true;
"bin/supdate" = {
source = ../../scripts/supdate;
executable = true;
};
};
fzf = {
enable = true;
enableZshIntegration = true;
};
packages = cliPackages ++ lib.optionals (!headless) guiPackages;
git = {
enable = true;
package = pkgs.gitFull;
userName = "Daniel Patterson";
userEmail = "me@danielpatterson.dev";
extraConfig = {
pull.rebase = true;
init.defaultBranch = "main";
format.signOff = "yes";
sendemail = {
smtpUser = "me@danielpatterson.dev";
smtpServer = "smtp.fastmail.com";
smtpEncryption = "tls";
smtpServerPort = 587;
};
};
};
keyboard = {
layout = "gb";
options = [
"caps:escape"
];
};
lazygit = {
enable = true;
settings = {
gui = {
showFileTree = false;
};
};
};
stateVersion = "21.05";
};
starship.enable = true;
programs = {
vscode.enable = true;
# Let Home Manager install and manage itself.
home-manager.enable = true;
zsh = {
enable = true;
enableAutosuggestions = true;
oh-my-zsh = {
enable = true;
plugins = ["git" "fzf"];
theme = "agnoster";
};
};
};
fzf = {
enable = true;
enableZshIntegration = true;
};
services = {
dunst.enable = true;
git = {
enable = true;
package = pkgs.gitFull;
userName = "Daniel Patterson";
userEmail = "me@danielpatterson.dev";
extraConfig = {
pull.rebase = true;
init.defaultBranch = "main";
format.signOff = "yes";
sendemail = {
smtpUser = "me@danielpatterson.dev";
smtpServer = "smtp.fastmail.com";
smtpEncryption = "tls";
smtpServerPort = 587;
};
};
};
lazygit = {
enable = true;
settings = {
gui = {
showFileTree = false;
};
};
};
starship.enable = true;
vscode.enable = true;
zsh = {
enable = true;
enableAutosuggestions = true;
oh-my-zsh = {
enable = true;
plugins = [ "git" "fzf" ];
theme = "agnoster";
};
};
};
services ={
dunst.enable = true;
syncthing = {
enable = true;
};
screen-locker = {
enable = true;
lockCmd = "${pkgs.i3lock}/bin/i3lock -i /home/daniel/wallpapers/lock.png";
inactiveInterval = 60;
};
};
syncthing = {
enable = true;
};
screen-locker = {
enable = true;
lockCmd = "${pkgs.i3lock}/bin/i3lock -i /home/daniel/wallpapers/lock.png";
inactiveInterval = 60;
};
};
}

View File

@@ -1,12 +1,15 @@
{ config, lib, pkgs, ...}:
{
home.file = {
"wallpapers" = {
source = ./wallpapers;
};
};
config,
lib,
pkgs,
...
}: {
home.file = {
"wallpapers" = {
source = ./wallpapers;
};
};
programs.alacritty.settings.font.size = 13;
programs.kitty.font.size = 22;
programs.alacritty.settings.font.size = 13;
programs.kitty.font.size = 22;
}

View File

@@ -1,20 +1,23 @@
{ config, lib, pkgs, ...}:
{
services.picom = {
enable = true;
vSync = true;
};
config,
lib,
pkgs,
...
}: {
services.picom = {
enable = true;
vSync = true;
};
xsession.windowManager.i3.config.gaps.outer = 6;
xsession.windowManager.i3.config.gaps.inner = 5;
xsession.windowManager.i3.config.gaps.outer = 6;
xsession.windowManager.i3.config.gaps.inner = 5;
home.file = {
wallpapers = {
source = ./wallpapers;
};
};
home.file = {
wallpapers = {
source = ./wallpapers;
};
};
programs.alacritty.settings.font.size = 10;
programs.kitty.font.size = 19;
programs.alacritty.settings.font.size = 10;
programs.kitty.font.size = 19;
}

View File

@@ -1,18 +1,21 @@
{ config, lib, pkgs, ...}:
{
home = {
file = {
"wallpapers" = {
source = ./wallpapers;
};
};
};
config,
lib,
pkgs,
...
}: {
home = {
file = {
"wallpapers" = {
source = ./wallpapers;
};
};
};
programs.kitty.font.size = 19;
services.picom = {
enable = true;
vSync = true;
};
services.picom = {
enable = true;
vSync = true;
};
}