diff --git a/profiles/wifi/default.nix b/profiles/wifi/default.nix index d98de847..4733fe07 100644 --- a/profiles/wifi/default.nix +++ b/profiles/wifi/default.nix @@ -3,29 +3,32 @@ { networking.wireless.userControlled.enable = true; networking.wireless.networks = { - "Chester 11403" = { - pskRaw="43fcb0bea43633899a9885865c53ea79d268b9bdfb8c3f4013718e43e6672e5e"; - }; - "HSBNEWiFi"={ - pskRaw="0820d84980eeb47630f13f04804fc9add684a8feebb64ba914cafc48f569d801"; - }; - "TP-LINK_1D79"={ - pskRaw="6d960910c33a59e94b151281cc3982863b4b112d8a4efd1b165e4f8e52e7dae8"; - }; - "nadir"={ - pskRaw="92e0c1f0b3a1bada333964f0ee4ac04e0d9ba941aa3f29216cc3782595a41e5f"; - }; - "WiFi-399631"={ - pskRaw="2e312c9721e470847f751d8b844d264dc5e2612361a579fc0bdebd2135b5a8ea"; - }; - "line"={ - pskRaw="ec36a5a116224c12e305c90b7f3c5a0b7417abfaacf15828748f6a1e1e316c03"; - }; - "MEHRA"={ - pskRaw="e1573bc9e30fd68ac8a805b7c5f9871322ffcdac909746831555905c2e156abb"; - }; - "Sandeep1"={ - pskRaw="035972401640bf4dc2d8651c0b9df515a69f6bc2bffa07cc936183128a6ccf0a"; - }; + "Chester 11403" = { + pskRaw = "43fcb0bea43633899a9885865c53ea79d268b9bdfb8c3f4013718e43e6672e5e"; + }; + "HSBNEWiFi" = { + pskRaw = "0820d84980eeb47630f13f04804fc9add684a8feebb64ba914cafc48f569d801"; + }; + "TP-LINK_1D79" = { + pskRaw = "6d960910c33a59e94b151281cc3982863b4b112d8a4efd1b165e4f8e52e7dae8"; + }; + "nadir" = { + pskRaw = "92e0c1f0b3a1bada333964f0ee4ac04e0d9ba941aa3f29216cc3782595a41e5f"; + }; + "WiFi-399631" = { + pskRaw = "2e312c9721e470847f751d8b844d264dc5e2612361a579fc0bdebd2135b5a8ea"; + }; + "line" = { + pskRaw = "ec36a5a116224c12e305c90b7f3c5a0b7417abfaacf15828748f6a1e1e316c03"; + }; + "MEHRA" = { + pskRaw = "e1573bc9e30fd68ac8a805b7c5f9871322ffcdac909746831555905c2e156abb"; + }; + "Sandeep1" = { + pskRaw = "035972401640bf4dc2d8651c0b9df515a69f6bc2bffa07cc936183128a6ccf0a"; + }; + "chadpad" = { + pskRaw = "2594b3880a60817950bd60b2770c9793fd4cb784ed183f685a52502a9df2c7b1"; + }; }; } diff --git a/users/anish/default.nix b/users/anish/default.nix index 1a43a8eb..77fe3d71 100644 --- a/users/anish/default.nix +++ b/users/anish/default.nix @@ -5,6 +5,7 @@ users.users.anish = { description = "Personal user for Anish"; + hashedPassword = "MVHHpy9gbe3ow"; isNormalUser = true; extraGroups = [ "wheel" "audio" ]; }; diff --git a/users/profiles/desktop/default.nix b/users/profiles/desktop/default.nix index 84b2081d..0d784a61 100644 --- a/users/profiles/desktop/default.nix +++ b/users/profiles/desktop/default.nix @@ -74,6 +74,7 @@ in pulseSupport = true; nlSupport = true; }) + papirus-icon-theme ]; @@ -171,7 +172,7 @@ in siji font-awesome-ttf proggyfonts - (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) + (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Iosevka" ]; }) ]; home-manager.users.anish = { @@ -181,6 +182,7 @@ in dracula-theme capitaine-cursors paper-icon-theme + papirus-icon-theme libsForQt5.qtstyleplugin-kvantum qt5ct gtk-engine-murrine diff --git a/users/profiles/desktop/polybar/config b/users/profiles/desktop/polybar/config index d0cac16a..0aa3a8bc 100644 --- a/users/profiles/desktop/polybar/config +++ b/users/profiles/desktop/polybar/config @@ -1,34 +1,25 @@ [colors] -black = ${xrdb:color0} -bblack = ${xrdb:color8} -red = ${xrdb:color1} -bred = ${xrdb:color9} -green = ${xrdb:color2} -bgreen = ${xrdb:color10} -yellow = ${xrdb:color3} -byellow = ${xrdb:color11} -blue = ${xrdb:color4} -bblue = ${xrdb:color12} -magenta = ${xrdb:color5} -bmagenta = ${xrdb:color13} -cyan = ${xrdb:color6} -bcyan = ${xrdb:color14} -white = ${xrdb:color7} -bwhite = ${xrdb:color15} -bg = ${xrdb:background} -fg = ${colors.magenta} +yellow = #ffd580 +orange = #fe8019 +blue = #73d0ff +green = #bae67e +red = #ff3333 +bg = #1f2430 +fg = #bfbab0 +icons = #bae67e +cyan = #95e6cb +text = ${xrdb:color2} +unfocus = ${xrdb:color1} +accent = #604c7e +sky = #73d0ff +mauve = #bae67e +alert = ${colors.yellow} + bg-alt = #1E2029 fg-alt = #373844 bg-dark = #181a23 -alert = ${colors.yellow} -accent = #604c7e - - -[global/wm] -margin-top = 0 -margin-bottom = 34 [bar/mybar] ; monitor = VGA-1 @@ -41,7 +32,7 @@ bottom = false fixed-center = true width = 100% -height = 29 +height = 34 offset-x = offset-y = @@ -65,14 +56,17 @@ padding-left = 0 ; Individual side values can be defined using: ; module-margin-{left,right} module-margin = 0 +margin-bottom = 34 font-0 = "Iosevka Term:pixelsize=13;4" font-1 = "Iosevka Term:pixelsize=6;1" +font-2 = "Fira Code:pixelsize=13;2" +font-3 = "Siji:pixelsize=8;2" ; Add module mpd for artist - title info -modules-left = i3 sps mpd_i sps mpd sps pulseaudio +modules-left = bspwm sps volume modules-center = title -modules-right = network sps memory sps cpu sps date +modules-right = wireless-network sps battery sps memory sps cpu sps date ; The separator will be inserted between the output of each module separator = @@ -84,7 +78,7 @@ spacing = 0 ; Opacity value between 0.0 and 1.0 used on fade in/out dim-value = 1.0 -wm-name = i3 +wm-name = bspwm tray-position = right @@ -107,7 +101,7 @@ tray-padding = 0 ; Scale factor for tray clients tray-scale = 1.0 -wm-restack = i3 +wm-restack = bspwm dpi-x = 133 dpi-y = 133 @@ -116,53 +110,45 @@ enable-ipc = false ; Fallback click handlers that will be called if ; there's no matching module handler found. -[module/i3] -type = internal/i3 + +[module/bspwm] +type = internal/bspwm pin-workspaces = true - -strip-wsnumbers = true - -index-sort = true - -; Create click handler used to focus workspace -; Default: true enable-click = true -; Create scroll handlers used to cycle workspaces -; Default: true -enable-scroll = true +ws-icon-0 = 1;%{T1}%{T-} +ws-icon-1 = 2;%{T1}%{T-} +ws-icon-2 = 3;%{T1}%{T-} +ws-icon-3 = 4;%{T1}%{T-} +ws-icon-4 = 5;%{T1}%{T-} +ws-icon-default =  +; fuzzy-match = true -; Wrap around when reaching the first/last workspace -; Default: true -wrapping-scroll = false - -; Set the scroll cycle direction -; Default: true -reverse-scroll = false -ws-icon-0 = 1;%{T1}%{T-} -ws-icon-1 = 2;%{T1}%{T-} -ws-icon-2 = 3;%{T1}%{T-} -ws-icon-3 = 4;%{T1}%{T-} -ws-icon-4 = 5;%{T1}%{T-} -ws-icon-5 = 6;%{T1}%{T-} -ws-icon-6 = 7;%{T1}%{T-} -ws-icon-7 = 8;%{T1}%{T-} -ws-icon-8 = 9;%{T1}%{T-} -ws-icon-9 = 0;%{T1}%{T-} -ws-icon-default = %{T1}%{T-} -fuzzy-match = true - - -label-unfocused = %icon% -label-unfocused-padding = 1 -label-unfocused-foreground = ${colors.yellow} +format = +label-padding = 1 +label-foreground = ${colors.green} label-focused = %icon% -label-focused-foreground = ${colors.bg} label-focused-background = ${colors.yellow} -label-focused-underline = #f92672 +label-focused-foreground = ${colors.bg} +# label-focused-underline = ${colors.magenta} +; label-focused-foreground = ${xrdb:color2} label-focused-padding = 1 +label-occupied = %icon% +label-occupied-foreground = ${colors.accent} +label-occupied-padding = 1 + +label-urgent = %icon% +label-urgent-foreground = ${colors.alert} +; label-urgent-background = ${colors.alert} +label-urgent-padding = 1 +; label-urgent-font = 3 + +label-empty = %icon% +label-empty-foreground = ${colors.fg-alt} +label-empty-padding = 1 + [module/date] type = internal/date @@ -187,24 +173,25 @@ label-foreground = ${colors.green} [module/wireless-network] type = internal/network -interface = wlan0 +interface = wlp3s0 label-connected = %essid% -format-connected = +label-connected-font = 2 +format-connected = label-connected-foreground = #82b414 format-disconnected = -label-disconnected = Not connected +label-disconnected = "睊" label-disconnected-foreground = #f92672 label-disconnected-background = #99000000 ramp-signal-foreground = #82b414 -ramp-signal-0 =  -ramp-signal-1 =  -ramp-signal-2 =  -ramp-signal-3 =  -ramp-signal-4 =  -ramp-signal-5 =  +ramp-signal-0 = " " +ramp-signal-1 = " " +ramp-signal-2 = " " +ramp-signal-3 = " " +ramp-signal-4 = " " +ramp-signal-5 = " " [module/cpu] type = internal/cpu @@ -293,7 +280,7 @@ content-padding = 0 [module/network] type = internal/network -interface = wlan0 +interface = wlp3s0 ;enp0s29u1u2 interval = 1.0 label-connected = "%{T1}龍%{T-}%{T2} %downspeed% | %upspeed%%{T-}" @@ -323,53 +310,103 @@ label-maxlen = 65 label-empty =%{T2}Empty%{T-} label-empty-foreground = #707880 -[module/pulseaudio] +[module/volume] type = internal/pulseaudio -; Sink to be used, if it exists (find using `pacmd list-sinks`, name field) -; If not, uses default sink -; sink = alsa_output.pci-0000_12_00.3.analog-stereo -; sink = alsa_output.pci-0000_00_1b.0.analog-stereo +use-ui-max = false -; Use PA_VOLUME_UI_MAX (~153%) if true, or PA_VOLUME_NORM (100%) if false -; Default: true -use-ui-max = true - -; Interval for volume increase/decrease (in percent points) -; Default: 5 interval = 5 -; Available tags: -; (default) -; -; -format-volume = +format-volume = -; Available tags: -; (default) -; -; format-muted = +format-muted-prefix = "  " +format-muted-prefix-font = 2 +format-muted-prefix-foreground = ${colors.mauve} -; Available tokens: -; %percentage% (default) -; %decibels% (unreleased) -label-volume = %{T2}%percentage%%%{T-} +label-volume = "%percentage%% " +label-muted = "Mute" -; Available tokens: -; %percentage% (default) -; %decibels% (unreleased) -label-muted = %{T1} %{T-} -label-muted-foreground = #666 +label-volume-foreground = ${colors.mauve} +label-muted-foreground = ${colors.mauve} -; Only applies if is used -ramp-volume-0 = %{T1}🔈%{T-} -ramp-volume-1 = %{T1}🔉%{T-} -ramp-volume-2 = %{T1}🔊%{T-} +bar-volume-width = 8 +bar-volume-gradient = false +bar-volume-indicator = | +bar-volume-indicator-font = 2 +bar-volume-indicator-foreground = ${colors.mauve} +bar-volume-fill = ─ +bar-volume-fill-font = 2 +bar-volume-fill-foreground = ${colors.mauve} +bar-volume-empty = ─ +bar-volume-empty-font = 2 +bar-volume-empty-foreground = ${colors.fg-alt} -; Right and Middle click (unreleased) -click-right = pavucontrol & -; click-middle = +ramp-volume-0 = "  " +ramp-volume-1 = "  " +ramp-volume-2 = "  " +ramp-volume-3 = "  " +ramp-volume-4 = "  " +ramp-volume-5 = "  " +ramp-volume-6 = "  " +ramp-volume-7 = "  " +ramp-volume-8 = "  " +ramp-volume-9 = "  " +ramp-volume-font = 1 +ramp-volume-foreground = ${colors.mauve} -;[settings] -;pseudo-transparency = true +ramp-headphones-0 =  +ramp-headphones-1 =  + +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ + +[module/battery] +type = internal/battery + +full-at = 99 + +adapter = ACAD +battery = BAT0 + +poll-interval = 2 +time-format = %H:%M + +format-charging = +format-charging-prefix = + +format-discharging = + +format-full = +format-full-prefix = " " +format-full-prefix-font = 1 +format-full-prefix-foreground = ${colors.sky} + +label-charging = "%percentage%% " +label-discharging = "%percentage%% " +label-full = "%percentage%% " + +label-charging-foreground = ${colors.sky} +label-discharging-foreground = ${colors.sky} +label-charging-font = 2 +label-discharging-font = 2 +label-full-foreground = ${colors.sky} +label-full-font = 2 + +ramp-capacity-0 = " " +ramp-capacity-1 = " " +ramp-capacity-2 = " " +ramp-capacity-3 = " " +ramp-capacity-4 = " " +ramp-capacity-font =3 +ramp-capacity-foreground = ${colors.sky} + +animation-charging-0 = " " +animation-charging-1 = " " +animation-charging-2 = " " +animation-charging-3 = " " +animation-charging-4 = " " +animation-charging-font =3 +animation-charging-foreground = ${colors.sky} +animation-charging-framerate = 750 + +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ diff --git a/users/profiles/desktop/polybar/config.bak b/users/profiles/desktop/polybar/config.bak index 6d89840e..3d65c2a5 100644 --- a/users/profiles/desktop/polybar/config.bak +++ b/users/profiles/desktop/polybar/config.bak @@ -62,8 +62,8 @@ padding-right = 2 module-margin-left = 0 module-margin-right = 0 -font-0 = "Fira Code:pixelsize=9;2" -font-1 = "Wuncon Siji:pixelsize=12;2" +font-0 = "Fira Code:pixelsize=13;2" +font-1 = "Wuncon Siji:pixelsize=16;2" font-2 = "Siji:pixelsize=10;2" ; modules-left = volume pad cpu memory pad pkg mail @@ -88,6 +88,7 @@ enable-click = true # ws-icon-4 = 5; # ws-icon-5 = 6; ws-icon-default =  +fuzzy-match = true format = label-padding = 1 @@ -130,8 +131,8 @@ format-prefix-foreground = ${colors.accent} [module/fs] type = internal/fs mount-0 = / -mount-1 = /mnt/projects ; for desktops -mount-2 = /home ; for laptop +# mount-1 = /mnt/projects ; for desktops +mount-2 = /home/anish interval = 30 ; Available tags: @@ -254,17 +255,18 @@ format-disconnected-foreground = ; label-disconnected = ! ; label-disconnected-foreground = ${colors.red} -ramp-signal-0 =  +ramp-signal-0 =  ramp-signal-0-foreground = ${colors.yellow} -ramp-signal-1 =  +ramp-signal-1 =  ramp-signal-1-foreground = ${colors.yellow} -ramp-signal-2 =  +ramp-signal-2 =  ramp-signal-2-foreground = ${colors.yellow} -ramp-signal-3 =  +ramp-signal-3 =  ramp-signal-3-foreground = ${colors.accent} -ramp-signal-4 =  +ramp-signal-4 =  ramp-signal-4-foreground = ${colors.fg} + [module/network-up] type = internal/network interface = ${env:LAN:eno1} diff --git a/users/profiles/desktop/rofi/appmenu.rasi b/users/profiles/desktop/rofi/appmenu.rasi index a4d62c5c..8ab2c0eb 100644 --- a/users/profiles/desktop/rofi/appmenu.rasi +++ b/users/profiles/desktop/rofi/appmenu.rasi @@ -2,7 +2,7 @@ @import "config.rasi" textbox-icon { - str: "  "; + str: "  "; } prompt { diff --git a/users/profiles/desktop/run.sh b/users/profiles/desktop/run.sh index 6b4536c9..6fcdcf4d 100755 --- a/users/profiles/desktop/run.sh +++ b/users/profiles/desktop/run.sh @@ -3,5 +3,5 @@ pkill -u $UID -x polybar while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -polybar main >$XDG_DATA_HOME/polybar.log 2>&1 & +polybar mybar >$XDG_DATA_HOME/polybar.log 2>&1 & echo 'Polybar launched...'