diff options
| -rw-r--r-- | hypr/hyprland.conf | 8 | ||||
| -rw-r--r-- | nixos/apps.nix | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | nixos/cachix/cuda-maintainers.nix | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | nixos/cachix/nix-community.nix | 0 | ||||
| -rw-r--r-- | nixos/environment.nix | 4 | ||||
| -rw-r--r-- | nixos/home.nix | 3 | ||||
| -rw-r--r-- | nixos/nvim.nix | 2 | ||||
| -rw-r--r-- | waybar/config | 75 | ||||
| -rw-r--r-- | waybar/style.css | 106 |
9 files changed, 47 insertions, 155 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index f6acf14..b106b07 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -47,8 +47,8 @@ env = XCURSOR_THEME,Adwaita # https://wiki.hyprland.org/Configuring/Variables/#general general { - gaps_in = 5 - gaps_out = 20 + gaps_in = 0 + gaps_out = 0 border_size = 2 @@ -62,11 +62,11 @@ general { # https://wiki.hyprland.org/Configuring/Variables/#decoration decoration { - rounding = 10 + rounding = 0 rounding_power = 2 active_opacity = 1.0 - inactive_opacity = 0.8 + inactive_opacity = 1.0 shadow { enabled = true diff --git a/nixos/apps.nix b/nixos/apps.nix index 1c1814b..8f98fd2 100644 --- a/nixos/apps.nix +++ b/nixos/apps.nix @@ -34,6 +34,6 @@ }; # for Localsend - networking.firewall.allowedTCPPorts = [ 53317 ]; - networking.firewall.allowedUDPPorts = [ 53317 ]; + networking.firewall.allowedTCPPorts = [ 53317 8081 ]; + networking.firewall.allowedUDPPorts = [ 53317 8081 ]; } diff --git a/nixos/cachix/cuda-maintainers.nix b/nixos/cachix/cuda-maintainers.nix index b1d70d6..b1d70d6 100755..100644 --- a/nixos/cachix/cuda-maintainers.nix +++ b/nixos/cachix/cuda-maintainers.nix diff --git a/nixos/cachix/nix-community.nix b/nixos/cachix/nix-community.nix index 7fc4c65..7fc4c65 100755..100644 --- a/nixos/cachix/nix-community.nix +++ b/nixos/cachix/nix-community.nix diff --git a/nixos/environment.nix b/nixos/environment.nix index a0eb145..6627772 100644 --- a/nixos/environment.nix +++ b/nixos/environment.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ gcc - python311 + # python312 # already added with nvim.nix zoxide starship cmake @@ -12,6 +12,8 @@ pipes playerctl libnotify + (pkgs.python313.withPackages (ps: with ps; [ + ])) ]; fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono diff --git a/nixos/home.nix b/nixos/home.nix index 2f7fbf1..458b270 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -3,10 +3,11 @@ users.users.aargh = { isNormalUser = true; description = "Aargh"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel" "kvm" "adbusers" ]; packages = with pkgs; []; shell = pkgs.fish; }; + programs.adb.enable = true; programs.fish.enable = true; home-manager.users.aargh = { pkgs, ... }: { programs.firefox.enable = true; diff --git a/nixos/nvim.nix b/nixos/nvim.nix index 8eb0026..23ec64f 100644 --- a/nixos/nvim.nix +++ b/nixos/nvim.nix @@ -7,7 +7,7 @@ in { go gcc cargo - python311 + python312 nodejs_20 lua zig diff --git a/waybar/config b/waybar/config index 1e91d89..46cef16 100644 --- a/waybar/config +++ b/waybar/config @@ -4,20 +4,23 @@ "height": 36, "spacing": 0, "modules-left": [ - "clock", "hyprland/workspaces", - "tray", ], "modules-right": [ "network", + "custom/space", "battery", + "custom/space", "pulseaudio", + "custom/space", "custom/temperature", + "custom/space", "memory", + "custom/space", "cpu", - "custom/lock", - "custom/reboot", - "custom/power", + "custom/space", + "clock", + "custom/space", ], "hyprland/workspaces": { "disable-scroll": false, @@ -28,32 +31,17 @@ "*":[1,2,3,4,5,6,7,8,9] }, }, - "custom/lock": { - "format": "<span color='#00FFFF'> </span>", - "on-click": "hyprlock", - "tooltip": true, - "tooltip-format": "Lock" - }, - "custom/reboot": { - "format": "<span color='#FFD700'> </span>", - "on-click": "systemctl reboot", - "tooltip": true, - "tooltip-format": "Reboot" - }, - "custom/power": { - "format": "<span color='#FF4040'> </span>", - "on-click": "systemctl poweroff", - "tooltip": true, - "tooltip-format": "Power" + "custom/space": { + "format": " ", }, "network": { - "format-wifi": "<span color='#00FFFF'> </span>{essid} ", - "format-ethernet": "<span color='#7FFF00'> </span>Wired ", - "tooltip-format": "<span color='#FF1493'> </span>{bandwidthUpBytes} <span color='#00BFFF'> </span>{bandwidthDownBytes}", - "format-linked": "<span color='#FFA500'> </span>{ifname} (No IP) ", - "format-disconnected": "<span color='#FF4040'> </span>Disconnected ", + "format-wifi": "Signal(Wifi):<span color='#28CD41'>{essid}</span>", + "format-ethernet": "Signal(Ethernet)", + "format-linked": "Signal(Linked)<span color='#28CD41'>{ifname}</span>", + "format-disconnected": "Signal:<span color='#FF4040'>Offline</span>", "interval": 1, "on-click": "foot -e nmtui", + "tooltip-format": "Sending: <span color='#28CD41'>{bandwidthUpBytes}</span> Receiving: <span color='#00BFFF'>{bandwidthDownBytes}</span>", }, "battery": { "states": { @@ -65,15 +53,15 @@ "on-discharging-critical": "notify-send -u critical 'Very Low Battery' -i /home/aargh/.config/waybar/battery_low.png", "on-charging-100": "notify-send -u normal 'Battery Full!' -i /home/aargh/.config/waybar/battery_high.png" }, - "format": "<span color='#28CD41'> {icon} </span>{capacity}%", - "format-charging": " {capacity}%", + "format": "Battery:<span color='#28CD41'>{capacity}%</span>", + "format-charging": "AC/DC:<span color='#28CD41'>{capacity}%</span>", "interval": 1, "format-icons": ["", "", "", "", ""], "tooltip": true }, "pulseaudio": { - "format": "<span color='#00FF7F'> {icon} </span>{volume}%", - "format-muted": "<span color='#FF4040'> </span>0%", + "format": "Sound:<span color='#28CD41'>{volume}%</span>", + "format-muted": "Sound:<span color='#FF4040'>off</span>", "format-icons": { "headphone": "<span color='#BF00FF'> </span>", "hands-free": "<span color='#BF00FF'> </span>", @@ -89,29 +77,26 @@ }, "on-click-right": "pavucontrol -t 3", "on-click": "pactl -- set-sink-mute 0 toggle", - "tooltip": true, - "tooltip-format": "Volume: {volume}%" + "tooltip": false, }, "custom/temperature": { "exec": "sensors | awk '/^Package id 0:/ {print int($4) + 273}'", - "format": "<span color='#FFA500'> </span>{} K", + "format": "Heat:<span color='#FFA500'>{}K</span>", "interval": 5, - "tooltip": true, - "tooltip-format": "CPU Temperature: {} K" + "tooltip": false, }, "memory": { - "format": "<span color='#8A2BE2'> </span>{used:0.1f}G/{total:0.1f}G ", - "tooltip": true, - "tooltip-format": "Memory: {used:0.2f}G/{total:0.2f}G" + "format": "RAM({total}G):<span color='#FFA500'>{used}G</span>", + "tooltip": false, }, "cpu": { - "format": "<span color='#FF9F0A'> </span>{usage}% ", - "tooltip": true + "format": "CPU:<span color='#FFA500'>{avg_frequency}Hz</span>", + "tooltip": true, }, "clock": { "interval": 1, "timezone": "Asia/Kolkata", - "format": "<span color='#BF00FF'> </span>{:%H:%M:%S} ", + "format": "Time:<span color='#BF00FF'>{:%H:%M:%S}</span>", "calendar": { "mode" : "year", "mode-mon-col" : 3, @@ -127,11 +112,7 @@ } }, "tooltip": true, - "format-alt": "<span color='#BF00FF'> </span>{:L%Y/%m/%d, %A} ", + "format-alt": "Time:<span color='#BF00FF'>{:L%Y/%m/%d, %A}</span>", "tooltip-format": "<tt><small>{calendar}</small></tt>", }, - "tray": { - "icon-size": 17, - "spacing": 6 - }, } diff --git a/waybar/style.css b/waybar/style.css index a0dac2d..a9b80a6 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -6,112 +6,20 @@ } #waybar { - background-color: rgba(0, 0, 0, 0); - border: none; - box-shadow: none; -} - -#workspaces, -#window, -#tray { - background-color: #414559; - padding: 4px 6px; - margin-top: 6px; - margin-left: 6px; - margin-right: 6px; - border-radius: 10px; - border-width: 0px; -} - -#clock { - background-color: #414559; - margin-top: 6px; - margin-right: 6px; - padding: 4px 2px; - border-radius: 0 10px 10px 0; - border-width: 0px; -} - -#custom-power { - background-color: #414559; - margin-top: 6px; - margin-right: 0px; - padding: 4px 2px; - border-radius: 0px; - border-width: 0px; -} - -#network, -#custom-lock { - background-color: #414559; - margin-top: 6px; - margin-left: 6px; - padding: 4px 2px; - border-radius: 10px 0 0 10px; - border-width: 0px; -} - -#custom-reboot, -#bluetooth, -#battery, -#pulseaudio, -#custom-temperature, -#memory, -#cpu { - background-color: #414559; - margin-top: 6px; - padding: 4px 2px; - border-width: 0px; -} - -#cpu { - border-radius: 0 10px 10px 0; -} - -#custpm-temperature.critical, -#pulseaudio.muted { - color: #e78284; - padding-top: 0; -} - -#bluetooth:hover, -#network:hover, -#backlight:hover, -#battery:hover, -#pulseaudio:hover, -#custom-temperature:hover, -#memory:hover, -#cpu:hover, -#clock:hover, -#custom-lock:hover, -#custom-reboot:hover, -#custom-power:hover, -#window:hover { - background-color: #414559; + background-color: rgb(0, 0, 0); } #workspaces button:hover { - background-color: #949cbb; - padding: 2px 8px; - margin: 0 2px; - border-radius: 10px; + background-color: #303030; + margin: 0px; + border-radius: 0px; } #workspaces button.active { - background-color: #ca9ee6; + background-color: #28CD41; color: #ea999c; - padding: 2px 8px; - margin: 0 2px; - border-radius: 10px; -} - -#workspaces button { - background: transparent; - border: none; - color: #e5c890; - padding: 2px 8px; - margin: 0 2px; - font-weight: bold; + margin: 0; + border-radius: 0px; } #window { |