alpine: many changes
- updates - snapserver - graphana dashboards - loki - ddclient - arr suite, jellyseer - mautrix fixes
This commit is contained in:
parent
d1772cb4be
commit
123e7088f5
58 changed files with 2136 additions and 735 deletions
|
|
@ -10,6 +10,7 @@
|
|||
./programs/git.nix
|
||||
./programs/lf/.
|
||||
./programs/zsh.nix
|
||||
./programs/tmux.nix
|
||||
];
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
|
|
@ -34,12 +35,15 @@
|
|||
htop
|
||||
libsixel
|
||||
yt-dlp
|
||||
ytfzf
|
||||
neofetch
|
||||
fastfetch
|
||||
tree
|
||||
ansible
|
||||
ytfzf
|
||||
lazygit
|
||||
];
|
||||
|
||||
programs.zoxide.enable = true;
|
||||
|
||||
programs.rbw = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
82
home/desktop/cosmic/default.nix
Normal file
82
home/desktop/cosmic/default.nix
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
inherit (config.lib.cosmic) Actions;
|
||||
in {
|
||||
programs.cosmic = {
|
||||
enable = true;
|
||||
input.asDefaults = true;
|
||||
input.binds = {
|
||||
# Navigation
|
||||
Super. "h" = Actions.Focus "Left";
|
||||
Super. "l" = Actions.Focus "Right";
|
||||
Super. "j" = Actions.Focus "Down";
|
||||
Super. "k" = Actions.Focus "Up";
|
||||
Super.Shift. "h" = Actions.Move "Left";
|
||||
Super.Shift. "l" = Actions.Move "Right";
|
||||
Super.Shift. "j" = Actions.Move "Down";
|
||||
Super.Shift. "k" = Actions.Move "Up";
|
||||
Super. "1" = Actions.Workspace 1;
|
||||
Super. "2" = Actions.Workspace 2;
|
||||
Super. "3" = Actions.Workspace 3;
|
||||
Super. "4" = Actions.Workspace 4;
|
||||
Super. "5" = Actions.Workspace 5;
|
||||
Super.Shift. "1" = Actions.MoveToWorkspace 1;
|
||||
Super.Shift. "2" = Actions.MoveToWorkspace 2;
|
||||
Super.Shift. "3" = Actions.MoveToWorkspace 3;
|
||||
Super.Shift. "4" = Actions.MoveToWorkspace 4;
|
||||
Super.Shift. "5" = Actions.MoveToWorkspace 5;
|
||||
Super. "Space" = Actions.ToggleWindowFloating;
|
||||
Super. "f" = Actions.Maximize;
|
||||
Super. "m" = Actions.Minimize;
|
||||
Super.Shift. "x" = Actions.Close;
|
||||
Super.Shift. "v" = Actions.ToggleStacking;
|
||||
Super.Shift. "y" = Actions.ToggleSticky;
|
||||
# System
|
||||
Super. "d" = Actions.Spawn config.programs.menu.drunCommand;
|
||||
Super. "Return" = Actions.Spawn pkgs.alacritty;
|
||||
Super. "o" = Actions.System "HomeFolder";
|
||||
Super.Shift. "s" = Actions.System "Screenshot";
|
||||
};
|
||||
background = {
|
||||
displays = {
|
||||
all = {
|
||||
source = ../../../images/nier2.jpg;
|
||||
};
|
||||
};
|
||||
};
|
||||
panels = {
|
||||
"Bar" = {
|
||||
applets = {
|
||||
start = [
|
||||
"com.system76.CosmicAppletWorkspaces"
|
||||
];
|
||||
center = [];
|
||||
end = [
|
||||
"com.system76.CosmicAppletTime"
|
||||
"com.system76.CosmicAppletTiling"
|
||||
"com.system76.CosmicAppletAudio"
|
||||
"com.system76.CosmicAppletNotifications"
|
||||
"com.system76.CosmicAppletMinimize"
|
||||
"com.system76.CosmicAppletPower"
|
||||
];
|
||||
};
|
||||
options = {
|
||||
size = "XS";
|
||||
border_radius = 0;
|
||||
};
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
"com.system76.CosmicComp".options = {
|
||||
autotile = true;
|
||||
active_hint = true;
|
||||
focus_follows_cursor = true;
|
||||
focus_follows_cursor_delay = 0;
|
||||
cursor_follows_focus = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -6,24 +6,91 @@
|
|||
}: let
|
||||
modifier = config.windowManager.modifierKey;
|
||||
menu = config.programs.menu.dmenuCommand;
|
||||
lock_cmd = "${config.programs.hyprlock.package}/bin/hyprlock";
|
||||
color = {
|
||||
inherit (config.lib.stylix.colors) yellow red;
|
||||
bg = config.lib.stylix.colors.base00;
|
||||
fg = config.lib.stylix.colors.base07;
|
||||
text = config.lib.stylix.colors.base05;
|
||||
};
|
||||
rgb = color: "rgb(${color})";
|
||||
in {
|
||||
imports = [
|
||||
(import ../utils/swaylock.nix)
|
||||
(import ../utils/swayidle.nix)
|
||||
(import ../utils/waybar.nix)
|
||||
(import ../utils/display.nix)
|
||||
../../workstation.nix
|
||||
];
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
configPackages = [pkgs.hyprland];
|
||||
extraPortals = [pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk];
|
||||
extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
||||
};
|
||||
|
||||
services.hypridle = {
|
||||
enable = true;
|
||||
settings = {
|
||||
general = {
|
||||
before_sleep_cmd = "rbw lock";
|
||||
after_sleep_cmd = "hyprctl dispatch dpms on";
|
||||
ignore_dbus_inhibit = false;
|
||||
lock_cmd = "pidof ${lock_cmd} || ${lock_cmd}";
|
||||
};
|
||||
|
||||
listener = [
|
||||
{
|
||||
timeout = 300;
|
||||
on-timeout = "loginctl lock-session";
|
||||
}
|
||||
{
|
||||
timeout = 1200;
|
||||
on-timeout = "hyprctl dispatch dpms off";
|
||||
on-resume = "hyprctl dispatch dpms on";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
settings = {
|
||||
# https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/
|
||||
general = {
|
||||
hide_cursor = true;
|
||||
grace = 10;
|
||||
ignore_empty_input = true;
|
||||
};
|
||||
|
||||
background = [
|
||||
{
|
||||
path = "screenshot";
|
||||
blur_passes = 3;
|
||||
blur_size = 8;
|
||||
}
|
||||
];
|
||||
|
||||
input-field = [
|
||||
{
|
||||
dots_center = true;
|
||||
fade_on_empty = true;
|
||||
outline_thickness = 5;
|
||||
shadow_passes = 2;
|
||||
inner_color = rgb color.bg;
|
||||
outer_color = rgb color.fg;
|
||||
font_color = rgb color.text;
|
||||
fail_color = rgb color.red;
|
||||
check_color = rgb color.yellow;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
systemd = {
|
||||
enable = true;
|
||||
variables = ["--all"];
|
||||
};
|
||||
settings = {
|
||||
exec-once = ["${pkgs.swaybg}/bin/swaybg -i ${config.stylix.image} -m fill"];
|
||||
input = {
|
||||
touchpad = {
|
||||
natural_scroll = true;
|
||||
|
|
@ -35,7 +102,6 @@ in {
|
|||
};
|
||||
gestures = {
|
||||
workspace_swipe = true;
|
||||
workspace_swipe_numbered = false;
|
||||
};
|
||||
decoration = {
|
||||
rounding = 0;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
timeouts = [
|
||||
{
|
||||
timeout = 300;
|
||||
command = "${pkgs.swaylock-effects}/bin/swaylock -f";
|
||||
command = "loginctl lock-session";
|
||||
}
|
||||
{
|
||||
timeout = 600;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
systemd.enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
layer = "bottom";
|
||||
position = "top";
|
||||
height = 36;
|
||||
modules-right = ["mpris" "idle_inhibitor" "pulseaudio" "clock" "tray" "battery"];
|
||||
|
|
|
|||
185
home/modules/aerc/binds.conf
Normal file
185
home/modules/aerc/binds.conf
Normal file
|
|
@ -0,0 +1,185 @@
|
|||
# Binds are of the form <key sequence> = <command to run>
|
||||
# To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
|
||||
# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
|
||||
<C-p> = :prev-tab<Enter>
|
||||
<C-PgUp> = :prev-tab<Enter>
|
||||
<C-n> = :next-tab<Enter>
|
||||
<C-PgDn> = :next-tab<Enter>
|
||||
\[t = :prev-tab<Enter>
|
||||
\]t = :next-tab<Enter>
|
||||
<C-t> = :term<Enter>
|
||||
? = :help keys<Enter>
|
||||
<C-c> = :prompt 'Quit?' quit<Enter>
|
||||
<C-q> = :prompt 'Quit?' quit<Enter>
|
||||
<C-z> = :suspend<Enter>
|
||||
|
||||
[messages]
|
||||
o = :term mbsync -a<Enter>
|
||||
q = :prompt 'Quit?' quit<Enter>
|
||||
|
||||
j = :next<Enter>
|
||||
<Down> = :next<Enter>
|
||||
<C-d> = :next 50%<Enter>
|
||||
<C-f> = :next 100%<Enter>
|
||||
<PgDn> = :next 100%<Enter>
|
||||
|
||||
k = :prev<Enter>
|
||||
<Up> = :prev<Enter>
|
||||
<C-u> = :prev 50%<Enter>
|
||||
<C-b> = :prev 100%<Enter>
|
||||
<PgUp> = :prev 100%<Enter>
|
||||
g = :select 0<Enter>
|
||||
G = :select -1<Enter>
|
||||
|
||||
J = :next-folder<Enter>
|
||||
<C-Down> = :next-folder<Enter>
|
||||
K = :prev-folder<Enter>
|
||||
<C-Up> = :prev-folder<Enter>
|
||||
H = :collapse-folder<Enter>
|
||||
<C-Left> = :collapse-folder<Enter>
|
||||
L = :expand-folder<Enter>
|
||||
<C-Right> = :expand-folder<Enter>
|
||||
|
||||
v = :mark -t<Enter>
|
||||
<Space> = :mark -t<Enter>:next<Enter>
|
||||
V = :mark -v<Enter>
|
||||
|
||||
T = :toggle-threads<Enter>
|
||||
zc = :fold<Enter>
|
||||
zo = :unfold<Enter>
|
||||
za = :fold -t<Enter>
|
||||
zM = :fold -a<Enter>
|
||||
zR = :unfold -a<Enter>
|
||||
<tab> = :fold -t<Enter>
|
||||
|
||||
zz = :align center<Enter>
|
||||
zt = :align top<Enter>
|
||||
zb = :align bottom<Enter>
|
||||
|
||||
<Enter> = :view<Enter>
|
||||
d = :choose -o y 'Really delete this message' delete-message<Enter>
|
||||
D = :delete<Enter>
|
||||
a = :archive flat<Enter>
|
||||
A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
|
||||
|
||||
C = :compose<Enter>
|
||||
m = :compose<Enter>
|
||||
|
||||
b = :bounce<space>
|
||||
|
||||
rr = :reply -a<Enter>
|
||||
rq = :reply -aq<Enter>
|
||||
Rr = :reply<Enter>
|
||||
Rq = :reply -q<Enter>
|
||||
|
||||
c = :cf<space>
|
||||
$ = :term<space>
|
||||
! = :term<space>
|
||||
| = :pipe<space>
|
||||
|
||||
/ = :search<space>
|
||||
\ = :filter<space>
|
||||
n = :next-result<Enter>
|
||||
N = :prev-result<Enter>
|
||||
<Esc> = :clear<Enter>
|
||||
|
||||
s = :split<Enter>
|
||||
S = :vsplit<Enter>
|
||||
|
||||
pl = :patch list<Enter>
|
||||
pa = :patch apply <Tab>
|
||||
pd = :patch drop <Tab>
|
||||
pb = :patch rebase<Enter>
|
||||
pt = :patch term<Enter>
|
||||
ps = :patch switch <Tab>
|
||||
|
||||
[messages:folder=Drafts]
|
||||
<Enter> = :recall<Enter>
|
||||
|
||||
[view]
|
||||
/ = :toggle-key-passthrough<Enter>/
|
||||
q = :close<Enter>
|
||||
O = :open<Enter>
|
||||
o = :open<Enter>
|
||||
S = :save<space>
|
||||
| = :pipe<space>
|
||||
D = :delete<Enter>
|
||||
A = :archive flat<Enter>
|
||||
|
||||
<C-l> = :open-link <space>
|
||||
|
||||
f = :forward<Enter>
|
||||
rr = :reply -a<Enter>
|
||||
rq = :reply -aq<Enter>
|
||||
Rr = :reply<Enter>
|
||||
Rq = :reply -q<Enter>
|
||||
|
||||
H = :toggle-headers<Enter>
|
||||
<C-k> = :prev-part<Enter>
|
||||
<C-Up> = :prev-part<Enter>
|
||||
<C-j> = :next-part<Enter>
|
||||
<C-Down> = :next-part<Enter>
|
||||
J = :next<Enter>
|
||||
<C-Right> = :next<Enter>
|
||||
K = :prev<Enter>
|
||||
<C-Left> = :prev<Enter>
|
||||
|
||||
[view::passthrough]
|
||||
$noinherit = true
|
||||
$ex = <C-x>
|
||||
<Esc> = :toggle-key-passthrough<Enter>
|
||||
|
||||
[compose]
|
||||
# Keybindings used when the embedded terminal is not selected in the compose
|
||||
# view
|
||||
$noinherit = true
|
||||
$ex = <C-x>
|
||||
$complete = <C-o>
|
||||
<C-k> = :prev-field<Enter>
|
||||
<C-Up> = :prev-field<Enter>
|
||||
<C-j> = :next-field<Enter>
|
||||
<C-Down> = :next-field<Enter>
|
||||
<A-p> = :switch-account -p<Enter>
|
||||
<C-Left> = :switch-account -p<Enter>
|
||||
<A-n> = :switch-account -n<Enter>
|
||||
<C-Right> = :switch-account -n<Enter>
|
||||
<tab> = :next-field<Enter>
|
||||
<backtab> = :prev-field<Enter>
|
||||
<C-p> = :prev-tab<Enter>
|
||||
<C-PgUp> = :prev-tab<Enter>
|
||||
<C-n> = :next-tab<Enter>
|
||||
<C-PgDn> = :next-tab<Enter>
|
||||
|
||||
[compose::editor]
|
||||
# Keybindings used when the embedded terminal is selected in the compose view
|
||||
$noinherit = true
|
||||
$ex = <C-x>
|
||||
<C-k> = :prev-field<Enter>
|
||||
<C-Up> = :prev-field<Enter>
|
||||
<C-j> = :next-field<Enter>
|
||||
<C-Down> = :next-field<Enter>
|
||||
<C-p> = :prev-tab<Enter>
|
||||
<C-PgUp> = :prev-tab<Enter>
|
||||
<C-n> = :next-tab<Enter>
|
||||
<C-PgDn> = :next-tab<Enter>
|
||||
|
||||
[compose::review]
|
||||
# Keybindings used when reviewing a message to be sent
|
||||
# Inline comments are used as descriptions on the review screen
|
||||
y = :send<Enter> # Send
|
||||
n = :abort<Enter> # Abort (discard message, no confirmation)
|
||||
v = :preview<Enter> # Preview message
|
||||
p = :postpone<Enter> # Postpone
|
||||
q = :choose -o d discard abort -o p postpone postpone<Enter> # Abort or postpone
|
||||
e = :edit<Enter> # Edit
|
||||
a = :attach<space> # Add attachment
|
||||
d = :detach<space> # Remove attachment
|
||||
|
||||
[terminal]
|
||||
$noinherit = true
|
||||
$ex = <C-x>
|
||||
|
||||
<C-p> = :prev-tab<Enter>
|
||||
<C-n> = :next-tab<Enter>
|
||||
<C-PgUp> = :prev-tab<Enter>
|
||||
<C-PgDn> = :next-tab<Enter>
|
||||
21
home/modules/aerc/default.nix
Normal file
21
home/modules/aerc/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
programs.aerc = {
|
||||
extraBinds = builtins.readFile ./binds.conf; # default binds
|
||||
extraConfig = {
|
||||
general = {
|
||||
pgp-provider = "gpg";
|
||||
unsafe-accounts-conf = true;
|
||||
};
|
||||
ui = {};
|
||||
viewer = {};
|
||||
filters = {
|
||||
"text/plain" = "colorize";
|
||||
"text/calendar" = "calendar";
|
||||
"message/delivery-status" = "colorize";
|
||||
"message/rfc822" = "colorize";
|
||||
"image/*" = "img2sixel";
|
||||
"text/html" = "html | colorize";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -21,6 +21,8 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
imports = [./aerc/.];
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.scripts = [
|
||||
{
|
||||
|
|
@ -73,156 +75,6 @@ in {
|
|||
|
||||
programs.aerc = {
|
||||
enable = cfg.terminal;
|
||||
extraBinds = ''
|
||||
# Binds are of the form <key sequence> = <command to run>
|
||||
# To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
|
||||
# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
|
||||
<C-p> = :prev-tab<Enter>
|
||||
<C-n> = :next-tab<Enter>
|
||||
<C-t> = :term<Enter>
|
||||
|
||||
[messages]
|
||||
Q = :quit<Enter>
|
||||
|
||||
T = :toggle-threads<Enter>
|
||||
|
||||
j = :next<Enter>
|
||||
<Down> = :next<Enter>
|
||||
<C-d> = :next 50%<Enter>
|
||||
<C-f> = :next 100%<Enter>
|
||||
<PgDn> = :next -s 100%<Enter>
|
||||
|
||||
k = :prev<Enter>
|
||||
<Up> = :prev<Enter>
|
||||
<C-u> = :prev 50%<Enter>
|
||||
<C-b> = :prev<Enter>
|
||||
<PgUp> = :prev -s 100%<Enter>
|
||||
gg = :select 0<Enter>
|
||||
G = :select -1<Enter>
|
||||
|
||||
J = :next-folder<Enter>
|
||||
K = :prev-folder<Enter>
|
||||
|
||||
v = :mark -t<Enter>
|
||||
V = :mark -v<Enter>
|
||||
|
||||
f = :flag<Enter>
|
||||
F = :unflag<Enter>
|
||||
|
||||
t = :toggle-threads<Enter>
|
||||
|
||||
<Enter> = :view<Enter>
|
||||
D = :mv Trash<Enter>
|
||||
|
||||
C = :compose<enter>
|
||||
|
||||
Rr = :reply<Enter>
|
||||
Rq = :reply -q<Enter>
|
||||
rr = :reply -a<Enter>
|
||||
rq = :reply -aq<Enter>
|
||||
rt = :unflag<Enter>:reply -a -Tthanks<Enter>
|
||||
Rt = :unflag<Enter>:reply -qa -Tquoted_thanks<Enter>
|
||||
|
||||
a = :mv Archive<Enter>
|
||||
|
||||
c = :cf<space>
|
||||
$ = :term<space>
|
||||
! = :term<space>
|
||||
| = :pipe<space>
|
||||
|
||||
ga = :flag<Enter>:pipe -mb git am -3<Enter>
|
||||
gp = :term git push<Enter>
|
||||
gl = :term git log<Enter>
|
||||
|
||||
/ = :search<space>
|
||||
\ = :filter<space>
|
||||
n = :next-result<Enter>
|
||||
N = :prev-result<Enter>
|
||||
|
||||
o = :term mbsync -a<Enter>
|
||||
q = :quit<Enter>
|
||||
|
||||
[view]
|
||||
/ = :toggle-key-passthrough<Enter>/
|
||||
q = :close<Enter>
|
||||
| = :pipe -m<space>
|
||||
S = :save<space>
|
||||
H = :toggle-headers<Enter>
|
||||
D = :mv Trash<Enter>
|
||||
<C-k> = :prev-part<Enter>
|
||||
<C-j> = :next-part<Enter>
|
||||
J = :next<Enter>
|
||||
K = :prev<Enter>
|
||||
|
||||
f = :forward<Enter>
|
||||
Rr = :reply<Enter>
|
||||
Rq = :reply -q<Enter>
|
||||
rr = :reply -a<Enter>
|
||||
rq = :reply -aq<Enter>
|
||||
rt = :reply -Tthanks<Enter>
|
||||
|
||||
ga = :pipe -b git am -3<Enter>
|
||||
gp = :term git push<Enter>
|
||||
gl = :term git log<Enter>
|
||||
|
||||
[view::passthrough]
|
||||
$noinherit = true
|
||||
$ex = <C-x>
|
||||
<Esc> = :toggle-key-passthrough<Enter>
|
||||
|
||||
[compose]
|
||||
$ex = <C-x>
|
||||
<C-k> = :prev-field<Enter>
|
||||
<C-j> = :next-field<Enter>
|
||||
<tab> = :next-field<Enter>
|
||||
|
||||
[compose::editor]
|
||||
# Keybindings used when the embedded terminal is selected in the compose view
|
||||
$noinherit = true
|
||||
$ex = <C-x>
|
||||
<C-t> = :term<Enter>
|
||||
<C-k> = :prev-field<Enter>
|
||||
<C-j> = :next-field<Enter>
|
||||
<C-p> = :prev-tab<Enter>
|
||||
<C-n> = :next-tab<Enter>
|
||||
|
||||
[compose::review]
|
||||
# Keybindings used when reviewing a message to be sent
|
||||
y = :send<Enter>
|
||||
n = :abort<Enter>
|
||||
e = :edit<Enter>
|
||||
a = :attach<space>
|
||||
c = :encrypt<Enter>
|
||||
s = :sign<Enter>
|
||||
V = :header -f X-Sourcehut-Patchset-Update NEEDS_REVISION<Enter>
|
||||
A = :header -f X-Sourcehut-Patchset-Update APPLIED<Enter>
|
||||
R = :header -f X-Sourcehut-Patchset-Update REJECTED<Enter>
|
||||
|
||||
[terminal]
|
||||
$noinherit = true
|
||||
$ex = <C-x>
|
||||
|
||||
<C-t> = :term<Enter>
|
||||
<C-p> = :prev-tab<Enter>
|
||||
<C-n> = :next-tab<Enter>
|
||||
'';
|
||||
|
||||
extraConfig = {
|
||||
general = {
|
||||
pgp-provider = "gpg";
|
||||
unsafe-accounts-conf = true;
|
||||
};
|
||||
ui = {};
|
||||
viewer = {};
|
||||
filters = {
|
||||
"text/plain" = "colorize";
|
||||
"text/calendar" = "calendar";
|
||||
"message/delivery-status" = "colorize";
|
||||
"message/rfc822" = "colorize";
|
||||
"image/*" = "img2sixel";
|
||||
"text/html" = "html | colorize";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@
|
|||
terminal = config.programs.terminal;
|
||||
termcmd = "${terminal}/bin/${terminal.pname}";
|
||||
menucmd = config.programs.menu.drunCommand;
|
||||
inherit (lib) mkPackageOption mkOption;
|
||||
in {
|
||||
options.programs = with lib; {
|
||||
options.programs = {
|
||||
menu = {
|
||||
package = mkPackageOption pkgs "wofi" {
|
||||
example = "pkgs.dmenu-wayland";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
{pkgs, ...}: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
aliases = {
|
||||
|
|
@ -6,6 +6,32 @@
|
|||
amend = "commit --amend --no-edit";
|
||||
sdiff = "diff --staged";
|
||||
t = "tag --annotate";
|
||||
bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" ''
|
||||
url=$1
|
||||
basename=''${url##*/}
|
||||
if [[ $2 == -* ]]
|
||||
then
|
||||
opts=''${@:2}
|
||||
name=''${basename%.*}
|
||||
else
|
||||
opts=''${@:3}
|
||||
name=''${2:-''${basename%.*}}
|
||||
fi
|
||||
|
||||
mkdir "$name"
|
||||
|
||||
git clone --bare "$url" "$name/.bare" $opts || {
|
||||
rm -r "$name"
|
||||
exit 1
|
||||
}
|
||||
|
||||
cd "$name"
|
||||
echo "gitdir: ./.bare" > .git
|
||||
|
||||
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
|
||||
|
||||
git fetch origin $opts
|
||||
''}/bin/bare-clone";
|
||||
};
|
||||
delta = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./qutebrowser.nix
|
||||
./pcmanfm.nix
|
||||
./mpv.nix
|
||||
./vscode.nix
|
||||
|
|
@ -18,13 +13,11 @@
|
|||
helvum
|
||||
|
||||
# tools
|
||||
obs-studio
|
||||
inkscape
|
||||
libsForQt5.okular
|
||||
gimp
|
||||
libreoffice
|
||||
dbeaver
|
||||
insomnia
|
||||
dbeaver-bin
|
||||
drawio
|
||||
|
||||
# entertainment
|
||||
|
|
@ -32,13 +25,16 @@
|
|||
shortwave
|
||||
|
||||
# other
|
||||
element-desktop
|
||||
element-desktop-wayland
|
||||
brave
|
||||
vieb
|
||||
bitwarden
|
||||
logseq
|
||||
];
|
||||
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
plugins = [pkgs.obs-studio-plugins.wlrobs];
|
||||
};
|
||||
|
||||
xdg.mimeApps.defaultApplications = {
|
||||
"application/pdf" = "sioyek.desktop";
|
||||
};
|
||||
|
|
@ -48,21 +44,10 @@
|
|||
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconTheme = {
|
||||
name = "Vimix-Doder";
|
||||
package = pkgs.vimix-icon-theme;
|
||||
};
|
||||
cursorTheme = {
|
||||
name = "Vanilla-DMZ";
|
||||
package = pkgs.vanilla-dmz;
|
||||
size = 24;
|
||||
};
|
||||
gtk3.bookmarks = [
|
||||
"file:///home/tristan/Documents"
|
||||
"file:///home/tristan/Pictures/Screenshots"
|
||||
"file:///home/tristan/Downloads"
|
||||
];
|
||||
};
|
||||
|
||||
programs.librewolf.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ in {
|
|||
R = "drag";
|
||||
"<f-2>" = ":rename";
|
||||
"<enter>" = "open-with";
|
||||
"<f-5>" = ":reload";
|
||||
};
|
||||
programs.lf.extraConfig = ''
|
||||
set sixel true
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
vim.g.mapleader = ' '
|
||||
vim.g.maplocalleader = ' '
|
||||
vim.o.relativenumber = true
|
||||
vim.o.number = true
|
||||
vim.o.signcolumn = 'yes'
|
||||
vim.o.tabstop = 2
|
||||
vim.o.shiftwidth = 2
|
||||
vim.o.expandtab = true
|
||||
vim.o.smartindent = true
|
||||
vim.o.scrolloff = 4
|
||||
vim.o.undofile = true
|
||||
vim.o.undodir = vim.fn.expand("$HOME/.local/share/nvim/undo")
|
||||
|
||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
||||
|
||||
vim.keymap.set("x", "p", "\"_dP")
|
||||
|
||||
vim.keymap.set("n", "<leader>y", "\"+y")
|
||||
vim.keymap.set("v", "<leader>y", "\"+y")
|
||||
|
||||
-- Global mappings.
|
||||
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
|
||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
|
||||
|
||||
vim.keymap.set('v', '<C-c>', '"+y')
|
||||
vim.keymap.set('i', '<C-v>', '<escape>"+p')
|
||||
|
|
@ -1,61 +1,20 @@
|
|||
{pkgs, ...}: {
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
extraLuaConfig = ''
|
||||
${builtins.readFile ./config.lua}
|
||||
'';
|
||||
extraPackages = with pkgs; [
|
||||
nodePackages_latest.typescript-language-server
|
||||
vscode-langservers-extracted
|
||||
gopls
|
||||
nil
|
||||
rust-analyzer
|
||||
];
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
{
|
||||
plugin = nvim-surround;
|
||||
type = "lua";
|
||||
config = ''
|
||||
require("nvim-surround").setup()
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = comment-nvim;
|
||||
type = "lua";
|
||||
config = ''
|
||||
require("Comment").setup()
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = vimwiki;
|
||||
config = ''
|
||||
let g:vimwiki_list = [{'path': '~/Documents/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = telescope-nvim;
|
||||
type = "lua";
|
||||
config = ''
|
||||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
|
||||
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
|
||||
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
|
||||
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = nvim-lspconfig;
|
||||
type = "lua";
|
||||
config = builtins.readFile ./lspconfig.lua;
|
||||
}
|
||||
];
|
||||
};
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs.nixvim =
|
||||
{
|
||||
enable = true;
|
||||
}
|
||||
// (import ../../../lib/nixvim.nix {inherit pkgs;});
|
||||
|
||||
programs.vscode = {
|
||||
extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim];
|
||||
userSettings = {
|
||||
"vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
|
||||
"vscode-neovim.neovimExecutablePaths.linux" =
|
||||
lib.getExe config.programs.nixvim.package;
|
||||
"extensions.experimental.affinity" = {
|
||||
"asvetliakov.vscode-neovim" = 1;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
-- Setup language servers.
|
||||
local lspconfig = require('lspconfig')
|
||||
|
||||
local on_attach = function(client)
|
||||
require'completion'.on_attach(client)
|
||||
client.server_capabilities.documentFormattingProvider = false
|
||||
end
|
||||
|
||||
lspconfig.tsserver.setup {
|
||||
on_attach = on_attach
|
||||
}
|
||||
|
||||
lspconfig.eslint.setup {
|
||||
on_attach = on_attach
|
||||
}
|
||||
|
||||
lspconfig.rust_analyzer.setup {
|
||||
on_attach = on_attach
|
||||
}
|
||||
|
||||
lspconfig.gopls.setup {}
|
||||
lspconfig.nil_ls.setup {}
|
||||
lspconfig.rust_analyzer.setup {}
|
||||
|
||||
-- Use LspAttach autocommand to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
|
||||
callback = function(ev)
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
|
||||
|
||||
-- Buffer local mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
local opts = { buffer = ev.buf }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
|
||||
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
|
||||
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
|
||||
vim.keymap.set('n', '<leader>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, opts)
|
||||
vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
|
||||
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
|
||||
vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
|
||||
vim.keymap.set('n', '<leader>f', function()
|
||||
vim.lsp.buf.format { async = true }
|
||||
end, opts)
|
||||
end,
|
||||
})
|
||||
|
|
@ -14,20 +14,38 @@
|
|||
|
||||
services.nextcloud-client.enable = true;
|
||||
|
||||
programs.nixvim.plugins = {
|
||||
lsp = {
|
||||
servers.gdscript.enable = true;
|
||||
};
|
||||
godot.enable = true;
|
||||
dap = {
|
||||
enable = true;
|
||||
adapters.servers.godot = {
|
||||
host = "127.0.0.1";
|
||||
port = 6006;
|
||||
};
|
||||
configurations.gdscript = [
|
||||
{
|
||||
type = "godot";
|
||||
request = "launch";
|
||||
name = "Launch scene";
|
||||
project = "\${workspaceFolder}";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
godot_4
|
||||
ardour
|
||||
blender
|
||||
# musescore
|
||||
musescore
|
||||
monero-gui
|
||||
electrum
|
||||
xmrig
|
||||
transmission-remote-gtk
|
||||
krita
|
||||
organicmaps
|
||||
anki
|
||||
hugo
|
||||
libsForQt5.neochat
|
||||
bookworm
|
||||
jellyfin-mpv-shim
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
grim = "${pkgs.grim}/bin/grim";
|
||||
slurp = "${pkgs.slurp}/bin/slurp";
|
||||
amixer = "${pkgs.alsa-utils}/bin/amixer";
|
||||
swaybg = "${pkgs.swaybg}/bin/swaybg";
|
||||
chafa = "${pkgs.chafa}/bin/chafa";
|
||||
exiftool = "${pkgs.exiftool}/bin/exiftool";
|
||||
wc = "${pkgs.coreutils}/bin/wc";
|
||||
|
|
@ -25,6 +24,7 @@
|
|||
gawk = "${pkgs.gawk}/bin/awk";
|
||||
hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
|
||||
sed = "${pkgs.gnused}/bin/sed";
|
||||
lock = "${pkgs.hyprlock}/bin/hyprlock";
|
||||
};
|
||||
in {
|
||||
programs.scripts = [
|
||||
|
|
@ -55,14 +55,13 @@ in {
|
|||
echo "$items" | ${my-deps.menu} | xargs -I_ rbw get _ | wl-copy -n
|
||||
'';
|
||||
hotkeys = [{key = "P";}];
|
||||
install = false;
|
||||
}
|
||||
{
|
||||
name = "bwusernamemenu";
|
||||
text = ''
|
||||
items="$(rbw list)"
|
||||
echo "$items" | ${my-deps.menu} | xargs -I_ rbw get --field username _ \
|
||||
| awk '{print $2}' | wl-copy -n
|
||||
| wl-copy -n
|
||||
'';
|
||||
hotkeys = [
|
||||
{
|
||||
|
|
@ -70,7 +69,6 @@ in {
|
|||
key = "P";
|
||||
}
|
||||
];
|
||||
install = false;
|
||||
}
|
||||
{
|
||||
name = "bwotpmenu";
|
||||
|
|
@ -84,7 +82,6 @@ in {
|
|||
key = "P";
|
||||
}
|
||||
];
|
||||
install = false;
|
||||
}
|
||||
{
|
||||
name = "screenshot";
|
||||
|
|
@ -279,7 +276,7 @@ in {
|
|||
sleep
|
||||
hibernate" | ${my-deps.menu})
|
||||
case $res in
|
||||
lock) swaylock;;
|
||||
lock) ${my-deps.lock};;
|
||||
sleep) systemctl suspend;;
|
||||
hibernate) systemctl hibernate;;
|
||||
esac
|
||||
|
|
@ -344,5 +341,12 @@ in {
|
|||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "prefetch-url";
|
||||
text = ''
|
||||
nix-build -E "with import <nixpkgs> {}; fetchzip {url = \"$1\"; sha256 = lib.fakeSha256; }"
|
||||
'';
|
||||
install = true;
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
|||
43
home/programs/tmux.nix
Normal file
43
home/programs/tmux.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
baseIndex = 1;
|
||||
escapeTime = 0;
|
||||
keyMode = "vi";
|
||||
mouse = true;
|
||||
terminal = "screen-256color";
|
||||
historyLimit = 5000;
|
||||
extraConfig = ''
|
||||
bind -n M-s split-window -v
|
||||
bind -n M-v split-window -h
|
||||
bind -n M-Enter split-window -h
|
||||
bind -n M-h select-pane -L
|
||||
bind -n M-j select-pane -D
|
||||
bind -n M-k select-pane -U
|
||||
bind -n M-l select-pane -R
|
||||
bind -n M-q kill-pane
|
||||
bind -n M-< resize-pane -L 10
|
||||
bind -n M-> resize-pane -R 10
|
||||
bind -n M-- resize-pane -D 10
|
||||
bind -n M-+ resize-pane -U 10
|
||||
bind -n M-z resize-pane -Z
|
||||
bind -n M-u copy-mode
|
||||
bind -n M-p paste-buffer
|
||||
bind -n M-n next-window
|
||||
|
||||
set-option -g renumber-windows on
|
||||
'';
|
||||
};
|
||||
|
||||
# programs.kitty = {
|
||||
# enable = true;
|
||||
# keybindings = {
|
||||
# "alt+h" = "neighboring_window left";
|
||||
# "alt+l" = "neighboring_window right";
|
||||
# "alt+j" = "neighboring_window down";
|
||||
# "alt+k" = "neighboring_window up";
|
||||
# "alt+enter" = "new_window";
|
||||
# };
|
||||
# shellIntegration.enableZshIntegration = true;
|
||||
# };
|
||||
}
|
||||
|
|
@ -19,6 +19,9 @@ in {
|
|||
"gitlens.telemetry.enabled" = false;
|
||||
"redhat.telemetry.enabled" = false;
|
||||
"cSpell.language" = "en,en-GB";
|
||||
"[typescript]" = {
|
||||
"editor.defaultFormatter" = "vscode.typescript-language-features";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
...
|
||||
}: let
|
||||
modifier = config.windowManager.modifierKey;
|
||||
browser = "${pkgs.brave}/opt/brave.com/brave/brave-browser";
|
||||
pwa = {
|
||||
slack = "mpagibdhafmlkgpemeicgogjnhclenoc";
|
||||
teams = "cifhbcnohmdccbgoicgdjpfamggdegmo";
|
||||
|
|
@ -15,23 +16,39 @@ in {
|
|||
terminal = false;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
thunderbird
|
||||
remmina
|
||||
home.packages = [
|
||||
pkgs.thunderbird
|
||||
pkgs.remmina
|
||||
(import ../../lib/mkapp.nix "slack" {
|
||||
inherit pkgs;
|
||||
inherit pkgs browser;
|
||||
desktopName = "Slack";
|
||||
app-id = pwa.slack;
|
||||
browser = "${brave}/opt/brave.com/brave/brave-browser";
|
||||
})
|
||||
(import ../../lib/mkapp.nix "teams" {
|
||||
inherit pkgs;
|
||||
browser = "${brave}/opt/brave.com/brave/brave-browser";
|
||||
inherit pkgs browser;
|
||||
app-id = pwa.teams;
|
||||
desktopName = "Microsoft Teams";
|
||||
})
|
||||
pkgs.devcontainer
|
||||
(pkgs.writeShellScriptBin "devcontainer-open" (let
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
devcontainer = "${pkgs.devcontainer}/bin/devcontainer";
|
||||
in ''
|
||||
res=$(${devcontainer} up --workspace-folder .)
|
||||
outcome=$(echo $res | ${jq} -r '.outcome')
|
||||
[[ $outcome = "success" ]] || exit 1
|
||||
containerId=$(echo $res | ${jq} -r '.containerId')
|
||||
remoteWorkspaceFolder=$(echo $res | ${jq} -r '.remoteWorkspaceFolder')
|
||||
docker exec -it --workdir=$remoteWorkspaceFolder $containerId bash
|
||||
''))
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
CYPRESS_INSTALL_BINARY = 0;
|
||||
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
|
||||
MONGOMS_SYSTEM_BINARY = "${pkgs.callPackage ../../pkgs/mongodb.nix pkgs}/bin/mongod";
|
||||
};
|
||||
|
||||
gtk.gtk3.bookmarks = [
|
||||
"file:///home/tristan/OneDrive/ OneDrive"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
./modules/terminal.nix
|
||||
./modules/scripts.nix
|
||||
./modules/email.nix
|
||||
./modules/mpd.nix
|
||||
./modules/menu.nix
|
||||
./modules/scripts.nix
|
||||
|
||||
|
|
@ -23,7 +22,6 @@
|
|||
dmenuCommand = "${pkgs.tofi}/bin/tofi --fuzzy-match true";
|
||||
drunCommand = "${pkgs.tofi}/bin/tofi-drun --drun-launch true";
|
||||
};
|
||||
roles.mpd.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
|
|
@ -38,8 +36,7 @@
|
|||
|
||||
programs.rbw.settings.pinentry = pkgs.pinentry-gnome3;
|
||||
|
||||
home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
|
||||
home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = ''
|
||||
xdg.configFile."pipewire/pipewire.conf.d/raop-discover.conf".text = ''
|
||||
context.modules = [
|
||||
{
|
||||
name = libpipewire-module-raop-discover
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue