finished up most of the conversion work

This commit is contained in:
Thilo Billerbeck 2023-05-02 23:16:23 +02:00
parent 019399b34a
commit 522ff8ac5d
17 changed files with 229 additions and 1015 deletions

View file

@ -10,59 +10,61 @@ let
mkdir $out/bin
for bin in ${pkg}/bin/*; do
wrapped_bin=$out/bin/$(basename $bin)
echo -e "#!/bin/bash\nexec ${lib.getExe nixgl.auto.nixGLDefault} $bin \$@" > $wrapped_bin
echo -e "#!/bin/bash\nexec ${
lib.getExe nixgl.auto.nixGLDefault
} $bin \$@" > $wrapped_bin
chmod +x $wrapped_bin
done
'';
in {
programs.alacritty = {
enable = true;
package = (nixGLWrap pkgs.alacritty);
settings = {
window = {
decorations = "full";
dynamic_title = true;
gtk_theme_variant = "None";
enable = true;
package = (nixGLWrap pkgs.alacritty);
settings = {
window = {
decorations = "full";
dynamic_title = true;
gtk_theme_variant = "None";
};
window.opacity = 1;
font = {
normal = {
family = "JetbrainsMono NFM";
style = "Regular";
};
window.opacity = 1;
font = {
normal = {
family = "JetbrainsMono NFM";
style = "Regular";
};
bold = {
family = "JetbrainsMono NFM";
style = "Bold";
};
size = 14;
bold = {
family = "JetbrainsMono NFM";
style = "Bold";
};
cursor.style.shape = "Beam";
colors = {
primary = {
background = "0x282a36";
foreground = "0xeff0eb";
};
normal = {
black = "0x282a36";
red = "0xff5c57";
green = "0x5af78e";
yellow = "0xf3f99d";
blue = "0x57c7ff";
magenta = "0xff6ac1";
cyan = "0x9aedfe";
white = "0xf1f1f0";
};
bright = {
black = "0x686868";
red = "0xff5c57";
green = "0x5af78e";
yellow = "0xf3f99d";
blue = "0x57c7ff";
magenta = "0xff6ac1";
cyan = "0x9aedfe";
white = "0xf1f1f0";
};
size = 14;
};
cursor.style.shape = "Beam";
colors = {
primary = {
background = "0x282a36";
foreground = "0xeff0eb";
};
normal = {
black = "0x282a36";
red = "0xff5c57";
green = "0x5af78e";
yellow = "0xf3f99d";
blue = "0x57c7ff";
magenta = "0xff6ac1";
cyan = "0x9aedfe";
white = "0xf1f1f0";
};
bright = {
black = "0x686868";
red = "0xff5c57";
green = "0x5af78e";
yellow = "0xf3f99d";
blue = "0x57c7ff";
magenta = "0xff6ac1";
cyan = "0x9aedfe";
white = "0xf1f1f0";
};
};
};
};
}

View file

@ -2,28 +2,26 @@
{
programs.beets = {
enable = true;
settings = {
directory = "~/Music/dj/Library";
library = "~/Music/dj/library.db";
plugins = "spotify acousticbrainz badfiles duplicates fetchart";
import = {
write = "yes";
copy = "yes";
resume = "no";
duplicate_action = "ask";
default_action = "apply";
};
badfiles = {
check_on_import = "yes";
};
match = {
max_rec = {
track_length = "strong";
track_title = "strong";
track_artist = "strong";
};
enable = true;
settings = {
directory = "~/Music/dj/Library";
library = "~/Music/dj/library.db";
plugins = "spotify acousticbrainz badfiles duplicates fetchart";
import = {
write = "yes";
copy = "yes";
resume = "no";
duplicate_action = "ask";
default_action = "apply";
};
badfiles = { check_on_import = "yes"; };
match = {
max_rec = {
track_length = "strong";
track_title = "strong";
track_artist = "strong";
};
};
};
};
}

View file

@ -2,7 +2,7 @@
{
programs.direnv = {
enable = true;
nix-direnv.enable = true;
};
enable = true;
nix-direnv.enable = true;
};
}

View file

@ -2,28 +2,28 @@
{
programs.git = {
enable = true;
lfs.enable = true;
userEmail = "thilo.billerbeck@officerent.de";
userName = "Thilo Billerbeck";
extraConfig = {
color = {
diff = "auto";
status = "auto";
branch = "auto";
interactive = "auto";
ui = true;
pager = true;
};
log = { date = "short"; };
rerere = { enabled = "1"; };
core = {
whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol";
excludesfile = "~/.gitignore-rab";
autocrlf = "input";
};
apply = { whitespace = "nowarn"; };
branch = { autosetuprebase = "always"; };
enable = true;
lfs.enable = true;
userEmail = "thilo.billerbeck@officerent.de";
userName = "Thilo Billerbeck";
extraConfig = {
color = {
diff = "auto";
status = "auto";
branch = "auto";
interactive = "auto";
ui = true;
pager = true;
};
log = { date = "short"; };
rerere = { enabled = "1"; };
core = {
whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol";
excludesfile = "~/.gitignore-rab";
autocrlf = "input";
};
apply = { whitespace = "nowarn"; };
branch = { autosetuprebase = "always"; };
};
};
}

View file

@ -2,45 +2,45 @@
{
programs.htop = {
enable = true;
settings = {
fields="0 48 17 18 38 39 40 2 46 47 49 1";
sort_key="46";
sort_direction="1";
tree_sort_key="0";
tree_sort_direction="1";
hide_kernel_threads="1";
hide_userland_threads="0";
shadow_other_users="0";
show_thread_names="0";
show_program_path="1";
highlight_base_name="0";
highlight_megabytes="1";
highlight_threads="1";
highlight_changes="0";
highlight_changes_delay_secs="5";
find_comm_in_cmdline="1";
strip_exe_from_cmdline="1";
show_merged_command="0";
tree_view="1";
tree_view_always_by_pid="0";
header_margin="1";
detailed_cpu_time="0";
cpu_count_from_one="0";
show_cpu_usage="1";
show_cpu_frequency="0";
show_cpu_temperature="0";
degree_fahrenheit="0";
update_process_names="0";
account_guest_in_cpu_meter="0";
color_scheme="0";
enable_mouse="1";
delay="15";
left_meters="LeftCPUs2 CPU Memory DiskIO NetworkIO";
left_meter_modes="1 1 1 2 2";
right_meters="RightCPUs2 Tasks LoadAverage Uptime Battery";
right_meter_modes="1 2 2 2 2";
hide_function_bar="0";
};
enable = true;
settings = {
fields = "0 48 17 18 38 39 40 2 46 47 49 1";
sort_key = "46";
sort_direction = "1";
tree_sort_key = "0";
tree_sort_direction = "1";
hide_kernel_threads = "1";
hide_userland_threads = "0";
shadow_other_users = "0";
show_thread_names = "0";
show_program_path = "1";
highlight_base_name = "0";
highlight_megabytes = "1";
highlight_threads = "1";
highlight_changes = "0";
highlight_changes_delay_secs = "5";
find_comm_in_cmdline = "1";
strip_exe_from_cmdline = "1";
show_merged_command = "0";
tree_view = "1";
tree_view_always_by_pid = "0";
header_margin = "1";
detailed_cpu_time = "0";
cpu_count_from_one = "0";
show_cpu_usage = "1";
show_cpu_frequency = "0";
show_cpu_temperature = "0";
degree_fahrenheit = "0";
update_process_names = "0";
account_guest_in_cpu_meter = "0";
color_scheme = "0";
enable_mouse = "1";
delay = "15";
left_meters = "LeftCPUs2 CPU Memory DiskIO NetworkIO";
left_meter_modes = "1 1 1 2 2";
right_meters = "RightCPUs2 Tasks LoadAverage Uptime Battery";
right_meter_modes = "1 2 2 2 2";
hide_function_bar = "0";
};
};
}

View file

@ -2,32 +2,32 @@
{
programs.neovim = {
defaultEditor = true;
enable = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
coc = { enable = true; };
extraConfig = ''
set title
set number
set relativenumber
set cursorline
set mouse=a
syntax enable
let g:NERDTreeShowHidden = 1
let g:NERDTreeMinimalUI = 1
let g:NERDTreeIgnore = [ '.git/' ]
let g:NERDTreeStatusline = ""
let g:NERDTreeMouseMode = 2
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
nnoremap <silent> <C-b> :NERDTreeToggle<CR>
'';
plugins = with pkgs.vimPlugins; [
nerdtree
vim-devicons
# fzf
ale
];
};
defaultEditor = true;
enable = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
coc = { enable = true; };
extraConfig = ''
set title
set number
set relativenumber
set cursorline
set mouse=a
syntax enable
let g:NERDTreeShowHidden = 1
let g:NERDTreeMinimalUI = 1
let g:NERDTreeIgnore = [ '.git/' ]
let g:NERDTreeStatusline = ""
let g:NERDTreeMouseMode = 2
autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
nnoremap <silent> <C-b> :NERDTreeToggle<CR>
'';
plugins = with pkgs.vimPlugins; [
nerdtree
vim-devicons
# fzf
ale
];
};
}

View file

@ -2,11 +2,11 @@
{
programs.starship = {
enable = true;
settings = {
add_newline = false;
character = { success_symbol = "[](bold white)"; };
package = { disabled = true; };
};
enable = true;
settings = {
add_newline = false;
character = { success_symbol = "[](bold white)"; };
package = { disabled = true; };
};
};
}

View file

@ -2,15 +2,15 @@
{
programs.topgrade = {
enable = true;
settings = {
assume_yes = true;
ignore_failures = [ "git_repos" ];
no_retry = true;
pre_sudo = false;
cleanup = true;
skip_notify = true;
firmware = { upgrade = true; };
};
enable = true;
settings = {
assume_yes = true;
ignore_failures = [ "git_repos" ];
no_retry = true;
pre_sudo = false;
cleanup = true;
skip_notify = true;
firmware = { upgrade = true; };
};
};
}

View file

@ -9,7 +9,9 @@ let
mkdir $out/bin
for bin in ${pkg}/bin/*; do
wrapped_bin=$out/bin/$(basename $bin)
echo -e "#!/bin/bash\nexec ${lib.getExe nixgl.auto.nixGLDefault} $bin \$@" > $wrapped_bin
echo -e "#!/bin/bash\nexec ${
lib.getExe nixgl.auto.nixGLDefault
} $bin \$@" > $wrapped_bin
chmod +x $wrapped_bin
done
'';

View file

@ -1,9 +1,6 @@
{ config, pkgs, lib, ... }:
{
programs.yt-dlp = {
enable = true;
};
programs.yt-dlp = { enable = true; };
}

View file

@ -1,42 +1,50 @@
{ config, pkgs, lib, ... }:
{
let
omz-plugins = [
"asdf"
"git"
"archlinux"
"brew"
"composer"
"colored-man-pages"
"extract"
"gradle"
"node"
"npm"
"nvm"
"rbenv"
"sudo"
"direnv"
"docker"
"docker-compose"
"golang"
"pip"
"history"
"vagrant"
];
in {
programs.zsh = {
enable = true;
enableAutosuggestions = true;
enableCompletion = true;
enableSyntaxHighlighting = true;
enableVteIntegration = true;
shellAliases = {
pub-ipv4 = "curl ip4.clerie.de";
serve = "python -m SimpleHTTPServer 8080";
week = "date +%V";
path = "echo -e \${PATH//:/\\n}";
distro = "cat /etc/*-release";
reload = "source ~/.zshrc";
undo-git-reset-head = "git reset 'HEAD@{1}'";
update-local = "bash $HOME/.dotfiles/install";
};
zplug = {
enable = true;
plugins = [
{
name = "plugins/git";
tags = [ from:oh-my-zsh ];
}
{
name = "plugins/archlinux";
tags = [ from:oh-my-zsh ];
}
{
name = "plugins/composer";
tags = [ from:oh-my-zsh ];
}
{
name = "plugins/colored-man-pages";
tags = [ from:oh-my-zsh ];
}
];
};
enable = true;
enableAutosuggestions = true;
enableCompletion = true;
enableSyntaxHighlighting = true;
enableVteIntegration = true;
shellAliases = {
pub-ipv4 = "curl ip4.clerie.de";
serve = "python -m SimpleHTTPServer 8080";
week = "date +%V";
path = "echo -e \${PATH//:/\\n}";
distro = "cat /etc/*-release";
reload = "source ~/.zshrc";
undo-git-reset-head = "git reset 'HEAD@{1}'";
update-local = "bash $HOME/.dotfiles/install";
};
zplug = {
enable = true;
plugins = map (x: {
name = "plugins/${x}";
tags = [ "from:oh-my-zsh" ];
}) omz-plugins;
};
};
}