reformating
This commit is contained in:
parent
9f44008493
commit
e521af0b12
@ -8,42 +8,22 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
password-store = {
|
password-store = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.pass.withExtensions (e: with e; [ pass-otp pass-file ]);
|
package = pkgs.pass.withExtensions (e: with e; [ pass-otp pass-file ]);
|
||||||
settings = {
|
settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; };
|
||||||
PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
git = {
|
git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
delta.enable = true;
|
delta.enable = true;
|
||||||
userName = pkgs.lib.mkDefault "Ivan Kirilov Dimitrov";
|
userName = pkgs.lib.mkDefault "Ivan Kirilov Dimitrov";
|
||||||
userEmail = pkgs.lib.mkDefault "ivan@idimitrov.dev";
|
userEmail = pkgs.lib.mkDefault "ivan@idimitrov.dev";
|
||||||
signing = {
|
signing = { signByDefault = true; key = "ivan@idimitrov.dev"; };
|
||||||
signByDefault = true;
|
extraConfig = { color.ui = "auto"; pull.rebase = true; push.autoSetupRemote = true; };
|
||||||
key = "ivan@idimitrov.dev";
|
aliases = { a = "add ."; c = "commit"; d = "diff --cached"; p = "push"; };
|
||||||
};
|
|
||||||
extraConfig = {
|
|
||||||
color.ui = "auto";
|
|
||||||
pull.rebase = true;
|
|
||||||
push.autoSetupRemote = true;
|
|
||||||
};
|
|
||||||
aliases = {
|
|
||||||
a = "add .";
|
|
||||||
c = "commit";
|
|
||||||
d = "diff --cached";
|
|
||||||
p = "push";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
gpg.enable = true;
|
gpg.enable = true;
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
pueue.enable = true;
|
pueue.enable = true;
|
||||||
gpg-agent = {
|
gpg-agent = { enable = true; enableBashIntegration = true; enableZshIntegration = true; enableNushellIntegration = true; pinentryPackage = pkgs.pinentry-qt; };
|
||||||
enable = true;
|
|
||||||
enableBashIntegration = true;
|
|
||||||
enableZshIntegration = true;
|
|
||||||
enableNushellIntegration = true;
|
|
||||||
pinentryPackage = pkgs.pinentry-qt;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
home = {
|
home = {
|
||||||
stateVersion = toplevel.config.flake.stateVersion;
|
stateVersion = toplevel.config.flake.stateVersion;
|
||||||
@ -55,17 +35,8 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
TERM = "screen-256color";
|
TERM = "screen-256color";
|
||||||
MAKEFLAGS = "-j 4";
|
MAKEFLAGS = "-j 4";
|
||||||
};
|
};
|
||||||
pointerCursor = with pkgs; {
|
pointerCursor = with pkgs; { name = "catppuccin-mocha-green-cursors"; package = catppuccin-cursors.mochaGreen; size = 24; gtk.enable = true; };
|
||||||
name = "catppuccin-mocha-green-cursors";
|
packages = with pkgs; [ transmission_4 speedtest-cli nvim ];
|
||||||
package = catppuccin-cursors.mochaGreen;
|
|
||||||
size = 24;
|
|
||||||
gtk.enable = true;
|
|
||||||
};
|
|
||||||
packages = with pkgs; [
|
|
||||||
transmission_4
|
|
||||||
speedtest-cli
|
|
||||||
nvim
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -111,13 +82,12 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
ls = "${pkgs.nushell}/bin/nu -c 'ls'";
|
ls = "${pkgs.nushell}/bin/nu -c 'ls'";
|
||||||
la = "${pkgs.nushell}/bin/nu -c 'ls -al'";
|
la = "${pkgs.nushell}/bin/nu -c 'ls -al'";
|
||||||
torrent = "transmission-remote";
|
torrent = "transmission-remote";
|
||||||
|
torrent-start = "transmission-daemon";
|
||||||
vi = "nvim";
|
vi = "nvim";
|
||||||
sc = "systemctl";
|
sc = "systemctl";
|
||||||
neofetch = "${pkgs.fastfetch}/bin/fastfetch -c all.jsonc";
|
neofetch = "${pkgs.fastfetch}/bin/fastfetch -c all.jsonc";
|
||||||
};
|
};
|
||||||
sessionVariables = {
|
sessionVariables = { TERM = "screen-256color"; };
|
||||||
TERM = "screen-256color";
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
bash = {
|
bash = {
|
||||||
@ -125,11 +95,7 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableVteIntegration = true;
|
enableVteIntegration = true;
|
||||||
historyControl = [ "erasedups" ];
|
historyControl = [ "erasedups" ];
|
||||||
historyIgnore = [
|
historyIgnore = [ "ls" "cd" "exit" ];
|
||||||
"ls"
|
|
||||||
"cd"
|
|
||||||
"exit"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
zsh = {
|
zsh = {
|
||||||
inherit shellAliases sessionVariables;
|
inherit shellAliases sessionVariables;
|
||||||
@ -144,30 +110,10 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
};
|
};
|
||||||
nushell = {
|
nushell = {
|
||||||
enable = true;
|
enable = true;
|
||||||
environmentVariables = {
|
environmentVariables = { config = '' { show_banner: false, completions: { quick: false partial: false algorithm: "prefix" } } ''; };
|
||||||
config = ''
|
shellAliases = shellAliases // { gcal = '' bash -c "cal $(date +%Y)" ''; la = "ls -al"; dev = "nix develop --command $env.SHELL"; };
|
||||||
{
|
|
||||||
show_banner: false,
|
|
||||||
completions: {
|
|
||||||
quick: false
|
|
||||||
partial: false
|
|
||||||
algorithm: "prefix"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
shellAliases = shellAliases // {
|
|
||||||
gcal = ''
|
|
||||||
bash -c "cal $(date +%Y)"
|
|
||||||
'';
|
|
||||||
la = "ls -al";
|
|
||||||
dev = "nix develop --command $env.SHELL";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
kitty.shellIntegration = {
|
|
||||||
enableBashIntegration = true;
|
|
||||||
enableZshIntegration = true;
|
|
||||||
};
|
};
|
||||||
|
kitty.shellIntegration = { enableBashIntegration = true; enableZshIntegration = true; };
|
||||||
tmux = {
|
tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
clock24 = true;
|
clock24 = true;
|
||||||
@ -181,12 +127,7 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
set-option -a terminal-features 'screen-256color:RGB'
|
set-option -a terminal-features 'screen-256color:RGB'
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
starship = {
|
starship = { enable = true; enableNushellIntegration = true; enableZshIntegration = true; enableBashIntegration = true; };
|
||||||
enable = true;
|
|
||||||
enableNushellIntegration = true;
|
|
||||||
enableZshIntegration = true;
|
|
||||||
enableBashIntegration = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -196,21 +137,12 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
programs = {
|
programs = {
|
||||||
tealdeer = {
|
tealdeer = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = { display = { compact = true; }; updates = { auto_update = true; }; };
|
||||||
display = {
|
|
||||||
compact = true;
|
|
||||||
};
|
|
||||||
updates = {
|
|
||||||
auto_update = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
bottom = {
|
bottom = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
flags = {
|
flags = { rate = "250ms"; };
|
||||||
rate = "250ms";
|
|
||||||
};
|
|
||||||
row = [
|
row = [
|
||||||
{ ratio = 40; child = [{ type = "cpu"; } { type = "mem"; } { type = "net"; }]; }
|
{ ratio = 40; child = [{ type = "cpu"; } { type = "mem"; } { type = "net"; }]; }
|
||||||
{ ratio = 35; child = [{ type = "temp"; } { type = "disk"; }]; }
|
{ ratio = 35; child = [{ type = "temp"; } { type = "disk"; }]; }
|
||||||
@ -233,46 +165,34 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
terminal = "kitty";
|
terminal = "kitty";
|
||||||
modifier = "Mod4";
|
modifier = "Mod4";
|
||||||
startup = [
|
startup = [
|
||||||
{ command = "swaymsg 'workspace 1; exec kitty'"; }
|
|
||||||
{ command = "swaymsg 'workspace 2; exec firefox'"; }
|
{ command = "swaymsg 'workspace 2; exec firefox'"; }
|
||||||
|
{ command = "swaymsg 'workspace 1; exec kitty'"; }
|
||||||
];
|
];
|
||||||
bars = [ ];
|
bars = [ ];
|
||||||
window.titlebar = false;
|
window.titlebar = false;
|
||||||
keybindings = pkgs.lib.mkOptionDefault {
|
keybindings = pkgs.lib.mkOptionDefault {
|
||||||
# Audio
|
|
||||||
"XF86AudioMicMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
"XF86AudioMicMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||||
"XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
"XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||||
"XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
"XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||||
"Alt+XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ +5%";
|
"Alt+XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ +5%";
|
||||||
"Alt+XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ -5%";
|
"Alt+XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ -5%";
|
||||||
"XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
"XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||||
# Display
|
"Alt+Shift+l" = "exec ${pkgs.swaylock}/bin/swaylock";
|
||||||
"Alt+Shift+l" = "exec ${pkgs.swaylock}/bin/swaylock"; # Lock screen
|
"XF86ScreenSaver" = "output 'eDP-1' toggle";
|
||||||
"XF86ScreenSaver" = "output 'eDP-1' toggle"; # Turn screen off
|
|
||||||
"XF86MonBrightnessUp" = "exec doas ${pkgs.light}/bin/light -A 10";
|
"XF86MonBrightnessUp" = "exec doas ${pkgs.light}/bin/light -A 10";
|
||||||
"XF86MonBrightnessDown" = "exec doas ${pkgs.light}/bin/light -U 10";
|
"XF86MonBrightnessDown" = "exec doas ${pkgs.light}/bin/light -U 10";
|
||||||
# Programs
|
|
||||||
"${modifier}+p" = "exec ${menu}";
|
"${modifier}+p" = "exec ${menu}";
|
||||||
"${modifier}+Shift+a" = "exec ${pkgs.screenshot}/bin/screenshot area";
|
"${modifier}+Shift+a" = "exec ${pkgs.screenshot}/bin/screenshot area";
|
||||||
"${modifier}+Shift+s" = "exec ${pkgs.screenshot}/bin/screenshot";
|
"${modifier}+Shift+s" = "exec ${pkgs.screenshot}/bin/screenshot";
|
||||||
"${modifier}+c" = "exec ${pkgs.sal}/bin/sal";
|
"${modifier}+c" = "exec ${pkgs.sal}/bin/sal";
|
||||||
"End" = "exec rofi -show calc";
|
"End" = "exec rofi -show calc";
|
||||||
# sway commands
|
|
||||||
"${modifier}+Shift+r" = "reload";
|
"${modifier}+Shift+r" = "reload";
|
||||||
"${modifier}+Shift+c" = "kill";
|
"${modifier}+Shift+c" = "kill";
|
||||||
"${modifier}+Shift+q" = "exit";
|
"${modifier}+Shift+q" = "exit";
|
||||||
};
|
};
|
||||||
input = {
|
input = { "*" = { xkb_layout = "us,bg"; xkb_options = "grp:win_space_toggle"; xkb_variant = ",phonetic"; }; };
|
||||||
"*" = {
|
|
||||||
xkb_layout = "us,bg";
|
|
||||||
xkb_options = "grp:win_space_toggle";
|
|
||||||
xkb_variant = ",phonetic";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
swaynag = {
|
|
||||||
enable = true;
|
|
||||||
};
|
};
|
||||||
|
swaynag = { enable = config.wayland.windowManager.sway.enable; };
|
||||||
};
|
};
|
||||||
programs = {
|
programs = {
|
||||||
waybar = {
|
waybar = {
|
||||||
@ -285,55 +205,33 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
layer = "top";
|
layer = "top";
|
||||||
position = "top";
|
position = "top";
|
||||||
height = 30;
|
height = 30;
|
||||||
output = [
|
output = [ "eDP-1" "HDMI-A-1" ];
|
||||||
"eDP-1"
|
|
||||||
"HDMI-A-1"
|
|
||||||
];
|
|
||||||
modules-left = [ "sway/workspaces" ];
|
modules-left = [ "sway/workspaces" ];
|
||||||
modules-center = [ "clock#week" "clock#year" "clock#time" ];
|
modules-center = [ "clock#week" "clock#year" "clock#time" ];
|
||||||
modules-right = [ "network" "pulseaudio" "memory" "cpu" "battery" ];
|
modules-right = [ "network" "pulseaudio" "memory" "cpu" "battery" ];
|
||||||
|
|
||||||
"clock#time" = {
|
"clock#time" = { format = "{:%H:%M:%S}"; interval = 1; };
|
||||||
format = "{:%H:%M:%S}";
|
"clock#week" = { format = "{:%a}"; };
|
||||||
interval = 1;
|
"clock#year" = { format = "{:%Y-%m-%d}"; };
|
||||||
};
|
|
||||||
|
|
||||||
"clock#week" = {
|
|
||||||
format = "{:%a}";
|
|
||||||
};
|
|
||||||
|
|
||||||
"clock#year" = {
|
|
||||||
format = "{:%Y-%m-%d}";
|
|
||||||
};
|
|
||||||
|
|
||||||
battery = {
|
battery = {
|
||||||
format = "{icon} <span color='#cdd6f4'>{capacity}% {time}</span>";
|
format = "{icon} <span color='#cdd6f4'>{capacity}% {time}</span>";
|
||||||
format-time = " {H} h {M} m";
|
format-time = " {H} h {M} m";
|
||||||
format-icons = [ "" "" "" "" "" ];
|
format-icons = [ "" "" "" "" "" ];
|
||||||
states = {
|
states = { warning = 30; critical = 15; };
|
||||||
warning = 30;
|
|
||||||
critical = 15;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
cpu = {
|
cpu = { format = "<span color='#74c7ec'></span> {usage}%"; };
|
||||||
format = "<span color='#74c7ec'></span> {usage}%";
|
|
||||||
};
|
|
||||||
|
|
||||||
memory = {
|
memory = { format = "<span color='#89b4fa'></span> {percentage}%"; interval = 5; };
|
||||||
format = "<span color='#89b4fa'></span> {percentage}%";
|
|
||||||
interval = 5;
|
|
||||||
};
|
|
||||||
|
|
||||||
pulseaudio = {
|
pulseaudio = {
|
||||||
format = "<span color='#a6e3a1'>{icon}</span> {volume}% | {format_source}";
|
format = "<span color='#a6e3a1'>{icon}</span> {volume}% | {format_source}";
|
||||||
format-muted = "<span color='#f38ba8'></span> {volume}% | {format_source}";
|
format-muted = "<span color='#f38ba8'></span> {volume}% | {format_source}";
|
||||||
format-source = "{volume}% <span color='#a6e3a1'></span>";
|
format-source = "{volume}% <span color='#a6e3a1'></span>";
|
||||||
format-source-muted = "{volume}% <span color='#f38ba8'></span>";
|
format-source-muted = "{volume}% <span color='#f38ba8'></span>";
|
||||||
format-icons = {
|
format-icons = { headphone = ""; default = [ "" "" "" ]; };
|
||||||
headphone = "";
|
|
||||||
default = [ "" "" "" ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
network = {
|
network = {
|
||||||
@ -344,17 +242,12 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
interval = 5;
|
interval = 5;
|
||||||
};
|
};
|
||||||
|
|
||||||
"sway/workspaces" = {
|
"sway/workspaces" = { disable-scroll = true; all-outputs = true; };
|
||||||
disable-scroll = true;
|
|
||||||
all-outputs = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
systemd = { enable = true; target = "sway-session.target"; };
|
||||||
systemd = {
|
style = /* CSS */
|
||||||
enable = true;
|
''
|
||||||
target = "sway-session.target";
|
|
||||||
};
|
|
||||||
style = /* CSS */ ''
|
|
||||||
@define-color rosewater #f5e0dc;
|
@define-color rosewater #f5e0dc;
|
||||||
@define-color flamingo #f2cdcd;
|
@define-color flamingo #f2cdcd;
|
||||||
@define-color pink #f5c2e7;
|
@define-color pink #f5c2e7;
|
||||||
@ -483,14 +376,12 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
animation-iteration-count: infinite;
|
animation-iteration-count: infinite;
|
||||||
animation-direction: alternate;
|
animation-direction: alternate;
|
||||||
}
|
}
|
||||||
'';
|
''
|
||||||
|
;
|
||||||
};
|
};
|
||||||
swaylock = {
|
swaylock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = { show-failed-attempts = true; image = config.home.homeDirectory + "/pic/bg.png"; };
|
||||||
show-failed-attempts = true;
|
|
||||||
image = config.home.homeDirectory + "/pic/bg.png";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
rofi = {
|
rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -510,45 +401,22 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
};
|
};
|
||||||
kitty = {
|
kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
font = {
|
font = { package = pkgs.fira-code; name = "FiraCodeNFM-Reg"; };
|
||||||
package = pkgs.fira-code;
|
settings = { background_opacity = "0.90"; cursor_shape = "beam"; term = "screen-256color"; };
|
||||||
name = "FiraCodeNFM-Reg";
|
|
||||||
};
|
|
||||||
settings = {
|
|
||||||
background_opacity = "0.90";
|
|
||||||
cursor_shape = "beam";
|
|
||||||
term = "screen-256color";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
imv.enable = true;
|
imv.enable = true;
|
||||||
mpv.enable = true;
|
mpv.enable = true;
|
||||||
bash.profileExtra = ''
|
bash.profileExtra = '' [ "$(tty)" = "/dev/tty1" ] && exec sway '';
|
||||||
[ "$(tty)" = "/dev/tty1" ] && exec sway
|
zsh.loginExtra = '' [ "$(tty)" = "/dev/tty1" ] && exec sway '';
|
||||||
'';
|
nushell.loginFile.text = '' if (tty) == "/dev/tty1" { sway } '';
|
||||||
zsh.loginExtra = ''
|
|
||||||
[ "$(tty)" = "/dev/tty1" ] && exec sway
|
|
||||||
'';
|
|
||||||
nushell.loginFile.text = ''
|
|
||||||
if (tty) == "/dev/tty1" {
|
|
||||||
sway
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
services = {
|
|
||||||
mako.enable = true;
|
|
||||||
cliphist = {
|
|
||||||
enable = true;
|
|
||||||
systemdTarget = "sway-session.target";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
services = { mako.enable = true; cliphist = { enable = true; systemdTarget = "sway-session.target"; }; };
|
||||||
systemd.user = {
|
systemd.user = {
|
||||||
timers = { rbingwp = { Timer = { OnCalendar = "*-*-* 10:00:00"; Persistent = true; }; Install = { WantedBy = [ "timers.target" ]; }; }; };
|
timers = { rbingwp = { Timer = { OnCalendar = "*-*-* 10:00:00"; Persistent = true; }; Install = { WantedBy = [ "timers.target" ]; }; }; };
|
||||||
services = {
|
services = {
|
||||||
wpd = {
|
wpd = {
|
||||||
Service = {
|
Service = {
|
||||||
Environment = [
|
Environment = [ "PATH=${pkgs.xdg-user-dirs}/bin:${pkgs.swaybg}/bin" ];
|
||||||
"PATH=${pkgs.xdg-user-dirs}/bin:${pkgs.swaybg}/bin"
|
|
||||||
];
|
|
||||||
ExecStart = [ "${pkgs.nushell}/bin/nu -c 'swaybg -i ((xdg-user-dir PICTURES) | path split | path join bg.png)'" ];
|
ExecStart = [ "${pkgs.nushell}/bin/nu -c 'swaybg -i ((xdg-user-dir PICTURES) | path split | path join bg.png)'" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -565,19 +433,7 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [ audacity gimp grim libnotify libreoffice-qt mupdf slurp wl-clipboard xdg-user-dirs xdg-utils xwayland ];
|
||||||
audacity
|
|
||||||
gimp
|
|
||||||
grim
|
|
||||||
libnotify
|
|
||||||
libreoffice-qt
|
|
||||||
mupdf
|
|
||||||
slurp
|
|
||||||
wl-clipboard
|
|
||||||
xdg-user-dirs
|
|
||||||
xdg-utils
|
|
||||||
xwayland
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
web = moduleWithSystem (
|
web = moduleWithSystem (
|
||||||
@ -591,14 +447,8 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
id = 0;
|
id = 0;
|
||||||
search.default = "DuckDuckGo";
|
search.default = "DuckDuckGo";
|
||||||
bookmarks = [
|
bookmarks = [
|
||||||
{
|
{ name = "home-options"; url = "https://nix-community.github.io/home-manager/options.xhtml"; }
|
||||||
name = "home-options";
|
{ name = "nixvim-docs"; url = "https://nix-community.github.io/nixvim/"; }
|
||||||
url = "https://nix-community.github.io/home-manager/options.xhtml";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "nixvim-docs";
|
|
||||||
url = "https://nix-community.github.io/nixvim/";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
settings = {
|
settings = {
|
||||||
"general.smoothScroll" = true;
|
"general.smoothScroll" = true;
|
||||||
@ -617,31 +467,13 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
OfferToSaveLoginsDefault = false;
|
OfferToSaveLoginsDefault = false;
|
||||||
PasswordManagerEnabled = false;
|
PasswordManagerEnabled = false;
|
||||||
|
|
||||||
FirefoxHome = {
|
FirefoxHome = { Search = true; Pocket = false; Snippets = false; TopSites = false; Highlights = false; };
|
||||||
Search = true;
|
|
||||||
Pocket = false;
|
|
||||||
Snippets = false;
|
|
||||||
TopSites = false;
|
|
||||||
Highlights = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
UserMessaging = {
|
UserMessaging = { ExtensionRecommendations = false; SkipOnboarding = true; };
|
||||||
ExtensionRecommendations = false;
|
|
||||||
SkipOnboarding = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
Handlers = {
|
Handlers = {
|
||||||
schemes = {
|
schemes = {
|
||||||
mailto = {
|
mailto = { action = "useHelperApp"; ask = false; handlers = [{ name = "RoundCube"; uriTemplate = "https://mail.idimitrov.dev/?_task=mail&_action=compose&_to=%s"; }]; };
|
||||||
action = "useHelperApp";
|
|
||||||
ask = false;
|
|
||||||
handlers = [
|
|
||||||
{
|
|
||||||
name = "RoundCube";
|
|
||||||
uriTemplate = "https://mail.idimitrov.dev/?_task=mail&_action=compose&_to=%s";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -653,9 +485,7 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
description = "Integration with GnuPG";
|
description = "Integration with GnuPG";
|
||||||
path = "${pkgs.gpgme.dev}/bin/gpgme-json";
|
path = "${pkgs.gpgme.dev}/bin/gpgme-json";
|
||||||
type = "stdio";
|
type = "stdio";
|
||||||
allowed_extensions = [
|
allowed_extensions = [ "jid1-AQqSMBYb0a8ADg@jetpack" ];
|
||||||
"jid1-AQqSMBYb0a8ADg@jetpack"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -663,10 +493,7 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
work = moduleWithSystem (
|
work = moduleWithSystem (
|
||||||
top@{ ... }:
|
top@{ ... }:
|
||||||
perSystem@{ pkgs, ... }: {
|
perSystem@{ pkgs, ... }: {
|
||||||
programs.chromium = {
|
programs.chromium = { enable = true; package = pkgs.ungoogled-chromium; };
|
||||||
enable = true;
|
|
||||||
package = pkgs.ungoogled-chromium;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -48,13 +48,7 @@ top@{ moduleWithSystem, ... }: {
|
|||||||
security = moduleWithSystem (toplevel@{ ... }: perSystem@{ ... }: {
|
security = moduleWithSystem (toplevel@{ ... }: perSystem@{ ... }: {
|
||||||
security = {
|
security = {
|
||||||
sudo = { enable = false; execWheelOnly = true; extraRules = [{ groups = [ "wheel" ]; }]; };
|
sudo = { enable = false; execWheelOnly = true; extraRules = [{ groups = [ "wheel" ]; }]; };
|
||||||
doas = {
|
doas = { enable = true; extraRules = [{ groups = [ "wheel" ]; noPass = true; keepEnv = true; }]; };
|
||||||
enable = true;
|
|
||||||
extraRules = [
|
|
||||||
# Allow wheel to run all commands without password and keep user env.
|
|
||||||
{ groups = [ "wheel" ]; noPass = true; keepEnv = true; }
|
|
||||||
];
|
|
||||||
};
|
|
||||||
polkit.enable = true;
|
polkit.enable = true;
|
||||||
rtkit.enable = true;
|
rtkit.enable = true;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user