prescientmoon/satellite
prescientmoon/satellite
1
Fork 0
Code Activity

More changes

Browse source
This commit is contained in:
Matei Adriel 2023-01-10 02:58:59 +01:00
parent 71f7586a61
commit bc34ec1349
4 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
home/adrielus/features/cli/fish.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
base16-fish = pkgs.fetchFromGitHub { base16-fish = pkgs.fetchFromGitHub {
owner = "tomyun"; owner = "tomyun";
@ -26,15 +26,15 @@ in
plugins = with pkgs.fishPlugins; [ plugins = with pkgs.fishPlugins; [
# Jump to directories by typing "z <directory-name>" # Jump to directories by typing "z <directory-name>"
{ {
name = "z"; name = "z";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "jethrokuan"; owner = "jethrokuan";
repo = "z"; repo = "z";
rev = "85f863f20f24faf675827fb00f3a4e15c7838d76"; rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
sha256 = "1kaa0k9d535jnvy8vnyxd869jgs0ky6yg55ac1mxcxm8n0rh2mgq"; sha256 = "1kaa0k9d535jnvy8vnyxd869jgs0ky6yg55ac1mxcxm8n0rh2mgq";
}; };
} }
]; ];
interactiveShellInit = interactiveShellInit =
@ -51,7 +51,7 @@ in
set fish_cursor_insert line # Set the insert mode cursor to a line set fish_cursor_insert line # Set the insert mode cursor to a line
set fish_cursor_replace_one underscore # Set the replace mode cursor to an underscore set fish_cursor_replace_one underscore # Set the replace mode cursor to an underscore
# Force fish to skip some checks (I think) # Force fish to skip some checks (I think?)
set fish_vi_force_cursor set fish_vi_force_cursor
'' + '' +
# Use vim-style keybinds # Use vim-style keybinds
@ -64,12 +64,10 @@ in
bind -M insert -m default -k f10 'commandline -f repaint' # Exit insert mode with <f10> bind -M insert -m default -k f10 'commandline -f repaint' # Exit insert mode with <f10>
end end
'' + '' +
# Starship hook
''
starship init fish | source
'' +
# Theming # Theming
(builtins.readFile (config.scheme base16-fish)) ''
source ${config.scheme base16-fish}
''
; ;
}; };
} }

3
home/adrielus/features/cli/tmux/default.nix
View file

@ -27,10 +27,11 @@ in
]; ];
extraConfig = '' extraConfig = ''
# Main config
source ${./tmux.conf} source ${./tmux.conf}
# Theme # Theme
${builtins.readFile (config.scheme base16-tmux)} source ${config.scheme base16-tmux}
''; '';
}; };
} }

17
home/adrielus/features/desktop/common/polybar/default.nix
View file

@ -3,26 +3,29 @@ let
base16-polybar = pkgs.fetchFromGitHub { base16-polybar = pkgs.fetchFromGitHub {
owner = "tinted-theming"; owner = "tinted-theming";
repo = "base16-polybar"; repo = "base16-polybar";
sha256 = "142fmqm324gy3qsv48vijm5k81v6mw85ym9mmhnvyv2q2ndg5rix"; sha256 = "1jcr9mmy6y2g06w1b8211lc1y419hqg55v3ly0a27cjgvg89774c";
rev = "2f6dd973a9075dabccd26f1cded09508180bf5fe"; rev = "47b7cc1cde79df5dc5e3cf8f9be607283eb5eb6e";
}; };
script = ''
polybar main &
'';
in in
{ {
services.polybar = { services.polybar = {
inherit script;
enable = true; enable = true;
extraConfig = '' extraConfig = ''
; Generated theme ; Generated theme
${builtins.readFile (config.scheme base16-polybar)} include-file = ${config.scheme base16-polybar}
; Actual config ; Actual config
include-file = ${paths.dotfiles}/polybar/config.ini include-file = ${./polybar.ini}
''; '';
}; };
xsession = { xsession = {
enable = true; enable = true;
initExtra = '' initExtra = script;
polybar main &
'';
}; };
} }

2
home/adrielus/features/desktop/xmonad.nix
View file

@ -1,3 +1,3 @@
{ {
imports = [ ./common/rofi ]; imports = [ ./common/rofi ./common/polybar];
} }