diff options
Diffstat (limited to 'nixpkgs')
| -rwxr-xr-x | nixpkgs/.config/nixpkgs/common/scripts/start | 53 | ||||
| -rw-r--r-- | nixpkgs/.config/nixpkgs/common/waybar/config | 78 | ||||
| -rw-r--r-- | nixpkgs/.config/nixpkgs/common/waybar/style.css | 74 | ||||
| -rw-r--r-- | nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix | 49 |
4 files changed, 212 insertions, 42 deletions
diff --git a/nixpkgs/.config/nixpkgs/common/scripts/start b/nixpkgs/.config/nixpkgs/common/scripts/start index 6811a52..c8b1235 100755 --- a/nixpkgs/.config/nixpkgs/common/scripts/start +++ b/nixpkgs/.config/nixpkgs/common/scripts/start @@ -2,29 +2,32 @@ # This a sort-of auto-start script. # Run this from a tty to start my graphical env. # -export XDG_CURRENT_DESKTOP=dwl -export XDG_SESSION_TYPE=wayland -export XDG_SESSION_DESKTOP=dwl -systemctl --user import-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE - -exec dwl -s 'somebar' & - -# set blocks on bar -exec /usr/local/bin/someblocks & - -# give wayland session some time to init -sleep 1 - -exec mako & - -sleep 1 - -# set bg -exec walp & - -# set monitor to be left of the laptop display -exec wlr-randr --output DP-1 --pos 0,0 & - -# fix for screen-sharing -exec fixwlr +#export XDG_CURRENT_DESKTOP=dwl +#export XDG_SESSION_TYPE=wayland +#export XDG_SESSION_DESKTOP=dwl +# +#systemctl --user import-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE +# +#exec dwl -s 'somebar' & +# +## set blocks on bar +#exec /usr/local/bin/someblocks & +# +## give wayland session some time to init +#sleep 1 +# +#exec mako & +# +#sleep 1 +# +## set bg +#exec walp & +# +## set monitor to be left of the laptop display +#exec wlr-randr --output DP-1 --pos 0,0 & +# +## fix for screen-sharing +#exec fixwlr +# +nix run github:guibou/nixGL#nixGLIntel -- Hyprland diff --git a/nixpkgs/.config/nixpkgs/common/waybar/config b/nixpkgs/.config/nixpkgs/common/waybar/config new file mode 100644 index 0000000..04ec64c --- /dev/null +++ b/nixpkgs/.config/nixpkgs/common/waybar/config @@ -0,0 +1,78 @@ +{ + "layer": "top", // Waybar at top layer + "height": 30, // Waybar height (to be removed for auto height) + "spacing": 4, // Gaps between modules (4px) + "modules-left": ["hyprland/workspaces"], + "modules-center": ["hyprland/window"], + "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "clock", "tray"], + "hyprland/workspaces": { + "format": "{name}", + "format-icons": { + "active": "", + "default": "", + } + }, + "hyprland/window": { + "max-length": 200, + "format": "👉 {}", + "separate-outputs": true + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + "timezone": "America/Toronto", + "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "battery": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": ["", "", "", "", ""] + }, + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "{ipaddr}/{cidr} ", + "tooltip-format": "{ifname} via {gwaddr} ", + "format-linked": "{ifname} (No IP) ", + "format-disconnected": "Disconnected ⚠", + "format-alt": "{ifname}: {ipaddr}/{cidr}" + }, + "pulseaudio": { + // "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon} {format_source}", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": " {format_source}", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + }, + "on-click": "pavucontrol" + }, +} diff --git a/nixpkgs/.config/nixpkgs/common/waybar/style.css b/nixpkgs/.config/nixpkgs/common/waybar/style.css new file mode 100644 index 0000000..fe58f76 --- /dev/null +++ b/nixpkgs/.config/nixpkgs/common/waybar/style.css @@ -0,0 +1,74 @@ +* { + font-family: "Font Awesome 6 Free", Roboto, Helvetica, Arial, sans-serif; + font-size: 14px; +} + +window#waybar { + background: rgba(43, 48, 59, 0.5); + border-bottom: 3px solid rgba(100, 114, 125, 0.5); + color: white; + transition-property: background-color; + transition-duration: .5s; +} + +tooltip { + background: rgba(43, 48, 59, 0.5); + border: 1px solid rgba(100, 114, 125, 0.5); +} +tooltip label { + color: white; +} + +#workspaces button { + padding: 0 5px; + background: transparent; + color: white; + border-bottom: 3px solid transparent; +} + +#workspaces button.focused { + background: #64727D; + border-bottom: 3px solid white; +} + +#workspaces button.active { + background: rgba(43, 48, 59, 0.5); + border-bottom: 3px solid white; +} + +#workspaces button.urgent { + background-color: #eb4d4b; +} + +#mode, #clock, #battery, #pulseaudio, #network, #memory, #cpu { + padding: 0 10px; +} + +#mode { + background: #64727D; + border-bottom: 3px solid white; +} + +#clock { + background-color: #64727D; +} + +#battery { + background-color: white; + color: black; +} + +#battery.charging { + color: white; + background-color: #26A65B; +} + +#battery.warning:not(.charging) { + background: #f53c3c; + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} diff --git a/nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix b/nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix index c53b319..38c511d 100644 --- a/nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix +++ b/nixpkgs/.config/nixpkgs/per-user/kdam0-work/home.nix @@ -16,7 +16,6 @@ v = "nvim $@"; r = "ranger $@"; gst = "git status"; - cdwl = "nvim ~/.config/nixpkgs/common/dwl_4/config.h"; chm = "nvim ~/.config/nixpkgs/per-user/kdam0-work/home.nix"; cvim = "nvim ~/.config/nixpkgs/common/nvim/init.vim"; clsp = "nvim ~/.config/nixpkgs/common/nvim/plugins/lspconfig.lua"; @@ -134,6 +133,11 @@ enable = true; tmux.enableShellIntegration = true; }; + programs.direnv = { + enable = true; + enableZshIntegration = true; # see note on other shells below + nix-direnv.enable = true; + }; programs.waybar.enable = true; @@ -153,6 +157,7 @@ wl-clipboard wf-recorder grimblast + pinta #grim #slurp wbg @@ -219,6 +224,9 @@ awscli rclone moonlight-qt + wireguard-tools + wireshark + step-cli ]; fonts.fontconfig.enable = true; @@ -261,22 +269,6 @@ input = { "kb_options" = "caps:swapescape"; }; - "exec-once" = [ - "walp" - "waybar" - "[workspace 9 silient] firefox" - "[workspace 8 silient] brave" - "[workspace 2 silent] foot" - "[workspace 1 silient] slack" - "[workspace 1 silient] signal-desktop" - ]; - windowrulev2 = [ - "workspace 9,class:^firefox$" - "workspace 8,class:^Brave(.*)$" - "workspace 7,class:^remote-viewer$" - "workspace 1,class:^Slack$" - "workspace 1,class:^Signal$" - ]; monitor = [ "DP-1, 1920x1080@60, 0x0,1" ", preferred,auto,1" @@ -293,6 +285,13 @@ "9,monitor:DP-1" "10,monitor:DP-1" ]; + windowrulev2 = [ + "workspace 9,class:^firefox$" + "workspace 8,class:^Brave(.*)$" + "workspace 7,class:^remote-viewer$" + "workspace 1,class:^Slack$" + "workspace 1,class:^Signal$" + ]; animation = [ "workspaces,1,2,default" "windows,1,3,default" @@ -313,6 +312,7 @@ "$mod, p, exec, wofi --show run" "$mod, r, exec, foot -e ranger" ", Delete, exec, grimblast copy area" + "Shift, Delete, exec, GRIMBLAST_EDITOR=pinta grimblast edit area" ] ++ ( # workspaces @@ -339,9 +339,23 @@ "$mod, h, resizeactive, -20 20" "$mod, l, resizeactive, 20 -20" ]; + bindm = [ + "$mod,mouse:272,movewindow" + "$mod,mouse:273,resizewindow" + ]; binds = { "allow_workspace_cycles" = true; }; + "exec-once" = [ + "mako" + "walp" + "waybar" + "[workspace 9 silient] firefox" + "[workspace 8 silient] brave" + "[workspace 2 silent] foot" + "[workspace 1 silient] slack" + "[workspace 1 silient] signal-desktop" + ]; }; }; @@ -350,6 +364,7 @@ home.file.".config/wofi/style.css".source = ../../common/wofi/style.css; home.file.".config/mako/config".source = ../../common/mako/config; home.file.".local/share/fonts".source = ../../common/fonts; + home.file.".config/waybar".source = ../../common/waybar; #home.file.".config/way-displays".source = ../../common/way-displays; #home.file.".config/foot/foot.ini".text = '' |