winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat(i3): visual improvements

Browse source
This commit is contained in:
winston 2023-02-13 03:00:55 +01:00
parent c3464ec216
commit f83dc7216f
Signed by: winston
GPG key ID: 3786770EDBC2B481
2 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -189,11 +189,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1676244754, "lastModified": 1676254866,
"narHash": "sha256-yKvki56vvWhECehFPMCiJ3o7S+NIRD2Iw83kdR2ncRM=", "narHash": "sha256-5WNiCgi3lPQn4KvKTAiB/hQfbifport0SjH+sKlZgXA=",
"owner": "nekowinston", "owner": "nekowinston",
"repo": "nur", "repo": "nur",
"rev": "a006d09d76648eaf708751ccf255fd7702e94916", "rev": "ad26229468091d9e1c73ed65febb62186e3f2f1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,11 +348,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1676231165, "lastModified": 1676251563,
"narHash": "sha256-hlQS8XRucFsOAvBTotYn9a74hGka8ai6B/atARmcVoE=", "narHash": "sha256-itLKR2Haeh5wQ6dxkuZ8L5gwp3+CAggpN+w2e7cLQPg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "cf674ae770218559b0ed9a98e36663b0858fb02f", "rev": "9a8b28a9d6611f6af9f7abb3e690fc755d6906fe",
"type": "github" "type": "github"
}, },
"original": { "original": {

64
modules/i3.nix
View file

@ -6,15 +6,23 @@
... ...
}: let }: let
inherit (pkgs.stdenv.hostPlatform) isLinux; inherit (pkgs.stdenv.hostPlatform) isLinux;
fonts = {
names = ["Inter" "Symbols Nerd Font"];
size = 16.0;
};
in { in {
fonts.fontconfig.enable = true;
home = lib.mkIf isLinux { home = lib.mkIf isLinux {
packages = with pkgs; [ packages = with pkgs; [
arandr arandr
blueberry blueberry
libnotify
pavucontrol pavucontrol
xclip xclip
xdotool
# fonts
(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
inter
]; ];
}; };
@ -78,7 +86,8 @@ in {
riced = true; riced = true;
in { in {
enable = true; enable = true;
fade = true; package = pkgs.nur.repos.nekowinston.picom-ft-labs;
fade = false;
backend = "glx"; backend = "glx";
vSync = true; vSync = true;
shadow = riced; shadow = riced;
@ -123,12 +132,12 @@ in {
}; };
# https://github.com/nix-community/home-manager/issues/2064 # https://github.com/nix-community/home-manager/issues/2064
# systemd = lib.mkIf isLinux { systemd = lib.mkIf isLinux {
# user.targets.tray.Unit = { user.targets.tray.Unit = {
# Description = "Home Manager System Tray"; Description = "Home Manager System Tray";
# Requires = ["graphical-session-pre.target"]; Requires = ["graphical-session-pre.target"];
# }; };
# }; };
xsession = lib.mkIf isLinux { xsession = lib.mkIf isLinux {
enable = true; enable = true;
@ -139,8 +148,9 @@ in {
focus.wrapping = "no"; focus.wrapping = "no";
startup = [ startup = [
{ {
command = "${lib.getExe pkgs.autotiling}"; command = "${lib.getExe pkgs.autotiling} -l2";
notification = false; notification = false;
always = true;
} }
{ {
command = "${lib.getExe pkgs._1password-gui} --silent"; command = "${lib.getExe pkgs._1password-gui} --silent";
@ -155,6 +165,13 @@ in {
modMove = "${mod}+Shift"; modMove = "${mod}+Shift";
modFocus = "${mod}+Ctrl"; modFocus = "${mod}+Ctrl";
hyper = "Mod4+Mod1+Shift+Ctrl"; hyper = "Mod4+Mod1+Shift+Ctrl";
gopass = lib.getExe pkgs.gopass;
rofi = lib.getExe pkgs.rofi-wayland;
thunar = lib.getExe pkgs.xfce.thunar;
xargs = "${lib.getExe pkgs.findutils}/bin/xargs";
xdotool = lib.getExe pkgs.xdotool;
flameshot = lib.getExe pkgs.flameshot;
in { in {
"${mod}+Shift+b" = "border none"; "${mod}+Shift+b" = "border none";
"${mod}+b" = "border pixel 2"; "${mod}+b" = "border pixel 2";
@ -167,11 +184,10 @@ in {
"${mod}+Shift+q" = "kill"; "${mod}+Shift+q" = "kill";
# Start Applications # Start Applications
"${mod}+Shift+Return" = "exec ${config.xsession.windowManager.i3.config.terminal}"; "${mod}+Shift+Return" = "exec ${config.xsession.windowManager.i3.config.terminal}";
"${mod}+e" = "exec --no-startup-id $fileman"; "${mod}+e" = "exec --no-startup-id ${thunar}";
"${mod}+Ctrl+x" = "exec --no-startup-id ${lib.getExe pkgs.xorg.xkill}"; "${mod}+Ctrl+x" = "exec --no-startup-id ${lib.getExe pkgs.xorg.xkill}";
"${hyper}+p" = "--release exec --no-startup-id ${lib.getExe pkgs.flameshot} gui"; "${hyper}+p" = "--release exec --no-startup-id ${lib.getExe pkgs.flameshot} gui";
# TODO: yeah no "${hyper}+space" = "exec --no-startup-id ${gopass} ls --flat | ${rofi} -dmenu -dpi $dpi | ${xargs} --no-run-if-empty ${gopass} show -o | ${xdotool} type --clearmodifiers --file -";
# "${hyper}+space" = "exec --no-startup-id gopass ls --flat | rofi -dmenu -dpi $dpi | xargs --no-run-if-empty gopass show -o | xdotool type --clearmodifiers --file -";
# change focus # change focus
"${modFocus}+h" = "focus left"; "${modFocus}+h" = "focus left";
@ -284,18 +300,32 @@ in {
R = "resize set 50 ppt 50 ppt"; R = "resize set 50 ppt 50 ppt";
}; };
}; };
fonts = { inherit fonts;
names = ["Berkeley Mono"];
size = 16.0;
};
bars = [ bars = [
{ {
mode = "hide"; mode = "hide";
hiddenState = "hide"; hiddenState = "hide";
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${config.xdg.configHome}/i3status-rust/config-default.toml"; statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${config.xdg.configHome}/i3status-rust/config-default.toml";
position = "top"; position = "top";
workspaceNumbers = false;
inherit fonts;
colors = { colors = {
background = "#000000"; background = "#000000";
focusedWorkspace = {
background = "#F5C2E7";
text = "#000000";
border = "#F5C2E7";
};
activeWorkspace = {
background = "#CBA6F7";
text = "#000000";
border = "#CBA6F7";
};
inactiveWorkspace = {
background = "#000000";
text = "#CDD6F4";
border = "#000000";
};
}; };
} }
]; ];