update config
This commit is contained in:
parent
b84b427fca
commit
6c857ee393
@ -1,12 +1,14 @@
|
|||||||
{ config, ... }:
|
{ config, pkgs, ... }:
|
||||||
let
|
let
|
||||||
username = config.var.git.username;
|
username = config.var.git.username;
|
||||||
email = config.var.git.email;
|
email = config.var.git.email;
|
||||||
in {
|
in {
|
||||||
|
home.packages = with pkgs; [ tea ];
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = username;
|
userName = username;
|
||||||
userEmail = email;
|
userEmail = email;
|
||||||
|
signing.key = "D8EDD65BCB54AC8719BE4EBD8D5D880EB08F1544";
|
||||||
ignores = [
|
ignores = [
|
||||||
".cache/"
|
".cache/"
|
||||||
".DS_Store"
|
".DS_Store"
|
||||||
@ -23,6 +25,7 @@ in {
|
|||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
color.ui = "1";
|
color.ui = "1";
|
||||||
|
commit.gpgSign = true;
|
||||||
};
|
};
|
||||||
aliases = {
|
aliases = {
|
||||||
essa = "push --force";
|
essa = "push --force";
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
# Nixvim is a NixOS module that installs and configures Neovim
|
# Nixvim is a NixOS module that installs and configures Neovim
|
||||||
{ inputs, ... }: {
|
{ inputs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nixvim.homeManagerModules.nixvim
|
inputs.nixvim.homeModules.nixvim
|
||||||
./plugins/cmp.nix
|
./plugins/cmp.nix
|
||||||
./plugins/dashboard.nix
|
./plugins/dashboard.nix
|
||||||
./plugins/lsp.nix
|
./plugins/lsp.nix
|
||||||
|
|||||||
@ -8,5 +8,6 @@
|
|||||||
marp-cli
|
marp-cli
|
||||||
qpdf
|
qpdf
|
||||||
temurin-jre-bin
|
temurin-jre-bin
|
||||||
|
librsvg
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,6 +4,7 @@
|
|||||||
"$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Terminal
|
"$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Terminal
|
||||||
"$mod,E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar
|
"$mod,E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar
|
||||||
"$mod,U, exec, ${pkgs.firefox}/bin/firefox" # Firefox
|
"$mod,U, exec, ${pkgs.firefox}/bin/firefox" # Firefox
|
||||||
|
"$mod,M, exec, ${pkgs.emacs-pgtk}/bin/emacs" # Emacs
|
||||||
"$shiftMod,Q, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock
|
"$shiftMod,Q, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock
|
||||||
"$mod,X, exec, powermenu" # Powermenu
|
"$mod,X, exec, powermenu" # Powermenu
|
||||||
"$mod,SPACE, exec, menu" # Launcher
|
"$mod,SPACE, exec, menu" # Launcher
|
||||||
|
|||||||
@ -41,7 +41,7 @@
|
|||||||
"float, class:^(thunderbird)$,title:^(Edit Event:)$"
|
"float, class:^(thunderbird)$,title:^(Edit Event:)$"
|
||||||
"float, class:^(thunderbird)$,title:^(An error has occurred)$"
|
"float, class:^(thunderbird)$,title:^(An error has occurred)$"
|
||||||
"float, class:^(thunar)$,title:^(File Operation Progress)$"
|
"float, class:^(thunar)$,title:^(File Operation Progress)$"
|
||||||
"float, class:^(firefox)$,title:^(.*Bitwarden Password Manager.*)$"
|
"float, class:firefox,title:(.*Bitwarden Password Manager.*)"
|
||||||
"float, class:^(org.kde.polkit-kde-authentication-agent-1)$"
|
"float, class:^(org.kde.polkit-kde-authentication-agent-1)$"
|
||||||
"size 60% 55%, class:^(nwg-look)$"
|
"size 60% 55%, class:^(nwg-look)$"
|
||||||
"center, class:^(nwg-look)$"
|
"center, class:^(nwg-look)$"
|
||||||
|
|||||||
@ -33,9 +33,11 @@ in {
|
|||||||
"tray"
|
"tray"
|
||||||
];
|
];
|
||||||
clock = {
|
clock = {
|
||||||
"format" = "{:%d %B %H:%M} ";
|
"format" = "{:%d %b %H:%M} ";
|
||||||
"format-alt" = "{:%A, %d %B %Y (%R)} ";
|
"format-alt" = "{:%A, %d %B %Y (%R)} ";
|
||||||
"tooltip-format" = "<tt><small>{calendar}</small></tt>";
|
"tooltip-format" = ''
|
||||||
|
<big>{:%Y %B}</big>
|
||||||
|
<tt><small>{calendar}</small></tt>'';
|
||||||
"calendar" = {
|
"calendar" = {
|
||||||
"mode" = "year";
|
"mode" = "year";
|
||||||
"mode-mon-col" = 3;
|
"mode-mon-col" = 3;
|
||||||
@ -111,20 +113,7 @@ in {
|
|||||||
};
|
};
|
||||||
separate-outputs = true;
|
separate-outputs = true;
|
||||||
};
|
};
|
||||||
"hyprland/workspaces" = {
|
"hyprland/workspaces" = { format = "<small>{name}</small>"; };
|
||||||
format = "{name}";
|
|
||||||
format-icons = {
|
|
||||||
"2" = "";
|
|
||||||
"3" = "";
|
|
||||||
"9" = "";
|
|
||||||
"active" = "";
|
|
||||||
"default" = "";
|
|
||||||
};
|
|
||||||
# "persistent-workspaces" = {
|
|
||||||
# "eDP-1" = [ 1 2 3 4 5 ];
|
|
||||||
# "DP-3" = [ 6 7 8 9 0 ];
|
|
||||||
# };
|
|
||||||
};
|
|
||||||
mpris = {
|
mpris = {
|
||||||
"format" = "{player_icon} {dynamic}";
|
"format" = "{player_icon} {dynamic}";
|
||||||
"format-paused" = "{status_icon} <i>{dynamic}</i>";
|
"format-paused" = "{status_icon} <i>{dynamic}</i>";
|
||||||
@ -182,35 +171,30 @@ in {
|
|||||||
|
|
||||||
style = ''
|
style = ''
|
||||||
* { border: none; border-radius: 0; }
|
* { border: none; border-radius: 0; }
|
||||||
|
window#waybar { background-color: @base00; color: @base05; transition-property: background-color; transition-duration: 0.5s; }
|
||||||
|
window#waybar.hidden { opacity: 0.2; }
|
||||||
label.module { padding: 0 ${toString gaps-out}px; }
|
label.module { padding: 0 ${toString gaps-out}px; }
|
||||||
|
#workspaces {
|
||||||
|
background-color: @base03;
|
||||||
|
border-radius: 1em;
|
||||||
|
margin: 0 1em;
|
||||||
|
}
|
||||||
#workspaces button {
|
#workspaces button {
|
||||||
padding-top: ${toString border-size}px;
|
padding: 0 .3em;
|
||||||
border-bottom: ${toString border-size}px solid transparent;
|
border-radius: 1em;
|
||||||
}
|
background-color: @base03;
|
||||||
#workspaces button.focused,
|
|
||||||
#workspaces button.active {
|
|
||||||
border-bottom: ${toString border-size}px solid @base09;
|
|
||||||
}
|
}
|
||||||
|
#workspaces button.urgent { background-color: @base09; }
|
||||||
|
#workspaces button.empty { background-color: @base03; }
|
||||||
|
#workspaces button.visible { background-color: @base04; color: @base01 }
|
||||||
|
#workspaces button.active { background-color: @base0A; }
|
||||||
label#battery.1 { padding-right: 0; }
|
label#battery.1 { padding-right: 0; }
|
||||||
label#battery.2 { padding-left: ${toString gaps-in}px; }
|
label#battery.2 { padding-left: ${toString gaps-in}px; }
|
||||||
#privacy, #tray { padding: 0 ${toString gaps-in}px; }
|
#privacy, #tray { padding: 0 ${toString gaps-in}px; }
|
||||||
#pulseaudio-slider slider {
|
#tray { background-color: @base03; border-radius: 1em 0 0 1em ; }
|
||||||
min-height: 0px;
|
#tray > .passive { -gtk-icon-effect: dim; }
|
||||||
min-width: 0px;
|
#tray > .needs-attention { -gtk-icon-effect: highlight; background-color: @base08; }
|
||||||
opacity: 0;
|
tooltip { border-radius: ${toString rounding}px; }
|
||||||
background-image: none;
|
|
||||||
border: none;
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
#pulseaudio-slider trough {
|
|
||||||
min-height: 5px;
|
|
||||||
min-width: 80px;
|
|
||||||
border-radius: ${toString rounding}px;
|
|
||||||
}
|
|
||||||
#pulseaudio-slider highlight {
|
|
||||||
min-width: 10px;
|
|
||||||
border-radius: ${toString rounding}px;
|
|
||||||
}
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -80,7 +80,8 @@
|
|||||||
sha256 = "sha256-caff7K4++eQJE/7kbKJb8DgI6aWJdiHBbdV1+46aFMs=";
|
sha256 = "sha256-caff7K4++eQJE/7kbKJb8DgI6aWJdiHBbdV1+46aFMs=";
|
||||||
};
|
};
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
buildInputs = [ pip ];
|
pyproject = true;
|
||||||
|
propagatedBuildInputs = [ pip setuptools pyyaml mypy ];
|
||||||
})
|
})
|
||||||
]))
|
]))
|
||||||
jq
|
jq
|
||||||
@ -115,13 +116,13 @@
|
|||||||
inxi
|
inxi
|
||||||
|
|
||||||
# Just cool
|
# Just cool
|
||||||
peaclock
|
# peaclock
|
||||||
cbonsai
|
# cbonsai
|
||||||
cmatrix
|
# cmatrix
|
||||||
# cava
|
# cava
|
||||||
|
|
||||||
# Backup
|
# Backup
|
||||||
zed-editor
|
# zed-editor
|
||||||
neovide
|
neovide
|
||||||
inkscape-with-extensions
|
inkscape-with-extensions
|
||||||
# gimp-with-plugins
|
# gimp-with-plugins
|
||||||
|
|||||||
@ -29,6 +29,13 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# To prevent getting stuck at shutdown
|
# To prevent getting stuck at shutdown
|
||||||
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
|
# systemd.extraConfig = "DefaultTimeoutStopSec=10s";
|
||||||
|
systemd.settings.Manager = {
|
||||||
|
# KExecWatchdogSec = "5min";
|
||||||
|
# RebootWatchdogSec = "10min";
|
||||||
|
# RuntimeWatchdogSec = "30s";
|
||||||
|
# WatchdogDevice = "/dev/watchdog";
|
||||||
|
DefaultTimeoutStopSec = "10s";
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, inputs, ... }:
|
||||||
let
|
let
|
||||||
username = config.var.username;
|
username = config.var.username;
|
||||||
hashedPassword = config.var.hashedPassword;
|
hashedPassword = config.var.hashedPassword;
|
||||||
@ -14,6 +14,11 @@ in {
|
|||||||
programs.xfconf.enable = true;
|
programs.xfconf.enable = true;
|
||||||
services.tumbler.enable = true;
|
services.tumbler.enable = true;
|
||||||
|
|
||||||
|
hardware.graphics = {
|
||||||
|
package =
|
||||||
|
inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}.mesa;
|
||||||
|
};
|
||||||
|
|
||||||
users = {
|
users = {
|
||||||
defaultUserShell = pkgs.zsh;
|
defaultUserShell = pkgs.zsh;
|
||||||
users.${username} = {
|
users.${username} = {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user