Improve config
This commit is contained in:
parent
b5e53330c9
commit
f8eea0490d
7 changed files with 37 additions and 32 deletions
|
@ -147,7 +147,6 @@ in {
|
||||||
home = {
|
home = {
|
||||||
packages = builtins.attrValues my-pkgs.home-pkgs;
|
packages = builtins.attrValues my-pkgs.home-pkgs;
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
GITSTATUS_DAEMON = "${my-pkgs.gitstatus}/bin/gitstatusd";
|
|
||||||
PATH =
|
PATH =
|
||||||
"$HOME/.cargo/bin:/etc/profiles/per-user/${config.home.username}/bin:$HOME/.nix-profile/bin:$PATH";
|
"$HOME/.cargo/bin:/etc/profiles/per-user/${config.home.username}/bin:$HOME/.nix-profile/bin:$PATH";
|
||||||
BROWSER = "${pkgs.firefox}/bin/firefox";
|
BROWSER = "${pkgs.firefox}/bin/firefox";
|
||||||
|
@ -189,6 +188,7 @@ in {
|
||||||
"RUST_BACKTRACE=1 PATH=${pkgs.nix}/bin:${pkgs.coreutils}/bin";
|
"RUST_BACKTRACE=1 PATH=${pkgs.nix}/bin:${pkgs.coreutils}/bin";
|
||||||
ExecStart = "${lorri}/bin/lorri daemon";
|
ExecStart = "${lorri}/bin/lorri daemon";
|
||||||
};
|
};
|
||||||
|
Install = { WantedBy = [ "graphical-session.target" ]; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ let
|
||||||
draw_shades = false,
|
draw_shades = false,
|
||||||
double_buffer = true,
|
double_buffer = true,
|
||||||
use_xft = true,
|
use_xft = true,
|
||||||
font = 'Roboto Mono Nerd Font:size=8',
|
font = 'Source Code Pro For Powerline:size=8',
|
||||||
gap_x = 0,
|
gap_x = 0,
|
||||||
gap_y = 0,
|
gap_y = 0,
|
||||||
minimum_width = 316,
|
minimum_width = 316,
|
||||||
|
@ -38,8 +38,8 @@ let
|
||||||
}
|
}
|
||||||
|
|
||||||
conky.text = [[
|
conky.text = [[
|
||||||
''${font Roboto Mono Nerd Font:bold:size=14}''${color #8888ff}$alignc''${exec date '+%a %_d. %B, %H:%M:%S'}
|
''${font Source Code Pro For Powerline:bold:size=14}''${color #8888ff}$alignc''${exec date '+%a %_d. %B, %H:%M:%S'}
|
||||||
''${font Roboto Mono Nerd Font:size=12}
|
''${font Source Code Pro For Powerline:size=12}
|
||||||
''${color #d0d0d0}''${execpi 60 ${pkgs.gcal}/bin/gcal -K -s1 --iso-week-number=yes | sed -e 's|5\d/1|01|' | sed -ne '3,10p' | sed -e 's/</ ''${color 8888ff}/'| sed -e 's/>/ ''${color}/' | sed 's/^/$alignc/'}
|
''${color #d0d0d0}''${execpi 60 ${pkgs.gcal}/bin/gcal -K -s1 --iso-week-number=yes | sed -e 's|5\d/1|01|' | sed -ne '3,10p' | sed -e 's/</ ''${color 8888ff}/'| sed -e 's/>/ ''${color}/' | sed 's/^/$alignc/'}
|
||||||
$font
|
$font
|
||||||
$hr
|
$hr
|
||||||
|
@ -79,7 +79,7 @@ in {
|
||||||
gaps right 320
|
gaps right 320
|
||||||
'';
|
'';
|
||||||
package = (import <unstable> { }).i3-gaps;
|
package = (import <unstable> { }).i3-gaps;
|
||||||
config = let fonts = [ "Inconsolata Nerd Font 13" ];
|
config = let fonts = [ "Source Code Pro For Powerline 9" ];
|
||||||
in {
|
in {
|
||||||
startup = [
|
startup = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
|
|
||||||
programs = {
|
programs = let my-pkgs = import ../../pkgs;
|
||||||
|
in {
|
||||||
zsh = {
|
zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableAutosuggestions = true;
|
enableAutosuggestions = true;
|
||||||
|
@ -9,9 +10,12 @@
|
||||||
save = 100000;
|
save = 100000;
|
||||||
size = 100000;
|
size = 100000;
|
||||||
};
|
};
|
||||||
initExtra = builtins.readFile ./zshrc;
|
initExtra = builtins.readFile ./zshrc + ''
|
||||||
oh-my-zsh = let my-pkgs = import ../../pkgs;
|
GITSTATUS_DAEMON=${my-pkgs.gitstatus}/bin/gitstatusd source ${
|
||||||
in {
|
./p10k.zsh
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ "colored-man-pages" ];
|
plugins = [ "colored-man-pages" ];
|
||||||
theme = "powerlevel10k";
|
theme = "powerlevel10k";
|
||||||
|
|
|
@ -7,24 +7,10 @@ if [[ -z "$TMUX" ]] {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prompt
|
|
||||||
function default_host () {
|
|
||||||
H="${HOST}%{%}:"
|
|
||||||
REPLY=${H/apollo%{%}:/}
|
|
||||||
REPLY=${REPLY/fb04217/hephaistos}
|
|
||||||
echo $REPLY
|
|
||||||
}
|
|
||||||
function default_user () {
|
|
||||||
U=${USER}@
|
|
||||||
REPLY=${U/maralorn@/}
|
|
||||||
echo $REPLY
|
|
||||||
}
|
|
||||||
|
|
||||||
mkdir -p /var/run/user/$UID/tmp/downloads
|
mkdir -p /var/run/user/$UID/tmp/downloads
|
||||||
|
|
||||||
setopt prompt_subst
|
setopt prompt_subst
|
||||||
autoload -U colors && colors # Enable colors in prompt
|
autoload -U colors && colors # Enable colors in prompt
|
||||||
PROMPT='%{%F{red}%}$(default_user)$(default_host)%{%F{blue}%}%~%{%}> %{%f%}'
|
|
||||||
|
|
||||||
precmd() {
|
precmd() {
|
||||||
if hash eventc 2> /dev/null;
|
if hash eventc 2> /dev/null;
|
||||||
|
|
|
@ -1,4 +1,16 @@
|
||||||
{
|
{
|
||||||
|
"ate": {
|
||||||
|
"branch": "master",
|
||||||
|
"description": "awesome terminal emulator",
|
||||||
|
"homepage": null,
|
||||||
|
"owner": "andir",
|
||||||
|
"repo": "ate",
|
||||||
|
"rev": "4536fc5972d90e9719418d9752e1f7a720be123f",
|
||||||
|
"sha256": "0iapbb8fxkks55lqn2s3nab0j4q3hn8pb7sx29sy3pkq068yx5a4",
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://github.com/andir/ate/archive/744efd87524497a335f4b041a9c646f3cb166dee.tar.gz",
|
||||||
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
|
},
|
||||||
"cachix": {
|
"cachix": {
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"description": "Command line client for Nix binary cache hosting:",
|
"description": "Command line client for Nix binary cache hosting:",
|
||||||
|
|
|
@ -3,6 +3,8 @@ let
|
||||||
inherit (my-lib)
|
inherit (my-lib)
|
||||||
pkgs unstable sources writeHaskellScript gcRetentionDays unBreak;
|
pkgs unstable sources writeHaskellScript gcRetentionDays unBreak;
|
||||||
in rec {
|
in rec {
|
||||||
|
ate = pkgs.callPackage (import sources.ate) { };
|
||||||
|
|
||||||
gitstatus = pkgs.callPackage ./powerlevel10k/gitstatus.nix {
|
gitstatus = pkgs.callPackage ./powerlevel10k/gitstatus.nix {
|
||||||
libgit2 = pkgs.libgit2.overrideAttrs (attrs: {
|
libgit2 = pkgs.libgit2.overrideAttrs (attrs: {
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
|
@ -71,7 +73,7 @@ in rec {
|
||||||
inherit (pkgs.pythonPackages) qrcode;
|
inherit (pkgs.pythonPackages) qrcode;
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap
|
git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap
|
||||||
tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle;
|
tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat;
|
||||||
};
|
};
|
||||||
gw2wrapper = writeHaskellScript {
|
gw2wrapper = writeHaskellScript {
|
||||||
name = "gw2wrapper";
|
name = "gw2wrapper";
|
||||||
|
@ -181,14 +183,15 @@ in rec {
|
||||||
};
|
};
|
||||||
urxvt = pkgs.rxvt_unicode-with-plugins;
|
urxvt = pkgs.rxvt_unicode-with-plugins;
|
||||||
terminal = pkgs.writeShellScriptBin "terminal" ''
|
terminal = pkgs.writeShellScriptBin "terminal" ''
|
||||||
${urxvt}/bin/urxvtc "$@"
|
if [ -z "$@" ]; then
|
||||||
if [ $? -eq 2 ]; then
|
${ate}/bin/ate
|
||||||
${urxvt}/bin/urxvtd -q -o -f
|
else
|
||||||
${urxvt}/bin/urxvtc "$@"
|
shift
|
||||||
fi
|
${ate}/bin/ate /usr/bin/env $@
|
||||||
|
fi
|
||||||
'';
|
'';
|
||||||
desktop-pkgs = {
|
desktop-pkgs = {
|
||||||
inherit urxvt tasktree terminal;
|
inherit urxvt tasktree terminal ate;
|
||||||
inherit (pkgs) xautolock;
|
inherit (pkgs) xautolock;
|
||||||
inherit (pkgs.gnome3) dconf;
|
inherit (pkgs.gnome3) dconf;
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,8 +5,8 @@ stdenv.mkDerivation {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "romkatv";
|
owner = "romkatv";
|
||||||
repo = "powerlevel10k";
|
repo = "powerlevel10k";
|
||||||
rev = "b451b7a75821afedba6e9fa3c422e8eca9f8dedc";
|
rev = "2218060b2d8b4ca7edf1299c65871cdf700898e3";
|
||||||
sha256 = "0gb27ml1ypi3j5xilvv38b73agqcf2y6ll532zkcv4lwha3ldhmy";
|
sha256 = "0m08x0fbj7x800i79nib0km3yx80rrg9f1rh7i24x5kla8k98sgj";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
Loading…
Reference in a new issue