chore: spring cleaning

purge unused files
fmt according to alejandra syntax
This commit is contained in:
Zhongheng Liu 2024-12-17 00:51:29 +02:00
commit b60c28d972
Signed by: steven
GPG key ID: 805A28B071DAD84B
6 changed files with 31 additions and 7 deletions

View file

@ -10,6 +10,7 @@ in {
# Type definitions for nix variables used in this configuration # Type definitions for nix variables used in this configuration
options = with lib; options = with lib;
with types; { with types; {
defaultApplications = {fileManager = mkOption {type = str;};};
myWallPaperPath = mkOption {type = path;}; myWallPaperPath = mkOption {type = path;};
myUserName = mkOption {type = str;}; myUserName = mkOption {type = str;};
myHostName = mkOption {type = str;}; myHostName = mkOption {type = str;};
@ -35,13 +36,15 @@ in {
myAutostartCommands = ["${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}"]; myAutostartCommands = ["${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}"];
}; };
myConfigLocation = "/home/${myUserName}/nix-conf"; myConfigLocation = "/home/${myUserName}/nix-conf";
desktopFontFullName = "JetBrainsMono Nerd Font"; desktopFontFullName = "IntoneMono NFM:style=Regular";
myAutostartCommands = [ myAutostartCommands = [
"${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMaxBrightness}" "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMaxBrightness}"
"fcitx5" "fcitx5"
# "${pkgs.foot}/bin/foot --server -f \"${desktopFontFullName}:size=12\" -o colors.alpha=0.85" # "${pkgs.foot}/bin/foot --server -f \"${desktopFontFullName}:size=12\" -o colors.alpha=0.85"
"${pkgs.udiskie}/bin/udiskie" "${pkgs.udiskie}/bin/udiskie"
"${pkgs.pa-notify}/bin/pa-notify" "${pkgs.pa-notify}/bin/pa-notify"
"${pkgs.networkmanagerapplet}/bin/nm-applet"
]; ];
defaultApplications.fileManager = "${pkgs.nemo}/bin/nemo";
}; };
} }

View file

@ -1,6 +1,8 @@
{ {
config, config,
pkgs, pkgs,
lib,
...
}: let }: let
terminalCmd = "${pkgs.foot}/bin/footclient"; terminalCmd = "${pkgs.foot}/bin/footclient";
screenshotLocation = "/home/${config.myUserName}/Screenshots/$(date '+%Y-%m-%d-%H-%M-%S').png"; screenshotLocation = "/home/${config.myUserName}/Screenshots/$(date '+%Y-%m-%d-%H-%M-%S').png";
@ -21,13 +23,18 @@ in
"$mod, Q, killactive" "$mod, Q, killactive"
"$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel" "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
"$mod, F, fullscreen" "$mod, F, fullscreen"
"$mod, E, exec, ${pkgs.pcmanfm}/bin/pcmanfm" "$mod, E, exec, ${config.defaultApplications.fileManager}"
# foot terminal # foot terminal
"$mod, Return, exec, ${terminalCmd} ${config.myShells.defaultShell}" "$mod, Return, exec, ${terminalCmd} ${config.myShells.defaultShell}"
"$mod SHIFT, Return, exec, [float] ${terminalCmd} ${config.myShells.defaultShell}" "$mod SHIFT, Return, exec, [float] ${terminalCmd} ${config.myShells.defaultShell}"
# cmdline utilities # cmdline utilities
"$mod, N, exec, [float] ${terminalCmd} ${pkgs.networkmanager}/bin/nmtui" /*
NOTE Replaced by network manager applet
nmtui interface is no longer needed
TODO Fix floating window rule
*/
# "$mod, N, exec, [float] ${terminalCmd} ${pkgs.networkmanager}/bin/nmtui"
"$mod, M, exec, [float] ${terminalCmd} ${pkgs.zenith}/bin/zenith" "$mod, M, exec, [float] ${terminalCmd} ${pkgs.zenith}/bin/zenith"
# vimkeys navigation # vimkeys navigation
@ -36,6 +43,11 @@ in
"$mod, K, movefocus, u" "$mod, K, movefocus, u"
"$mod, L, movefocus, r" "$mod, L, movefocus, r"
] ]
++ (
if config.services.swaync.enable
then ["$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"]
else []
)
++ ( ++ (
# workspaces # workspaces
# binds $mod + [shift +] {1..10} to [move to] workspace {1..10} # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}

View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [foot]; home.packages = with pkgs; [foot];
@ -58,6 +59,7 @@
}; };
bind = import ./binds.nix { bind = import ./binds.nix {
inherit config; inherit config;
inherit lib;
inherit pkgs; inherit pkgs;
}; };
bindm = [ bindm = [

View file

@ -10,5 +10,6 @@
./discord.nix ./discord.nix
./wayland-utils.nix ./wayland-utils.nix
./pentesting.nix ./pentesting.nix
./dev.nix
]; ];
} }

View file

@ -0,0 +1,9 @@
{
pkgs,
config,
...
}: {
home.packages = with pkgs; [
wget
];
}

View file

@ -9,12 +9,9 @@
settings = { settings = {
main = { main = {
term = "xterm-256color"; term = "xterm-256color";
#font = "${config.desktopFontFullName}:size=24";
dpi-aware = lib.mkForce "yes"; dpi-aware = lib.mkForce "yes";
}; };
mouse = { mouse = {hide-when-typing = "yes";};
hide-when-typing = "yes";
};
}; };
server.enable = true; server.enable = true;
}; };