diff options
| -rw-r--r-- | home/rices/original/default.nix (renamed from modules/home/i3wm/original/default.nix) | 7 | ||||
| -rw-r--r-- | home/rices/original/dunst.nix (renamed from modules/home/i3wm/original/dunst.nix) | 28 | ||||
| -rw-r--r-- | home/rices/original/i3.nix (renamed from modules/home/i3wm/original/i3.nix) | 4 | ||||
| -rw-r--r-- | home/rices/original/kitty.nix (renamed from modules/home/i3wm/original/kitty.nix) | 2 | ||||
| -rw-r--r-- | home/rices/original/neovim.nix (renamed from modules/home/i3wm/original/neovim.nix) | 5 | ||||
| -rw-r--r-- | home/rices/original/nnn.nix (renamed from modules/home/i3wm/original/nnn.nix) | 2 | ||||
| -rw-r--r-- | home/rices/original/picom.nix (renamed from modules/home/i3wm/original/picom.nix) | 2 | ||||
| -rw-r--r-- | home/rices/original/polybar.nix | 172 | ||||
| -rw-r--r-- | home/rices/original/rofi.nix (renamed from modules/home/i3wm/original/rofi.nix) | 2 | ||||
| -rw-r--r-- | home/rices/original/scripts.nix (renamed from modules/home/i3wm/original/scripts.nix) | 2 | ||||
| -rw-r--r-- | home/rices/original/variables.nix | 14 | ||||
| -rw-r--r-- | home/rices/original/xdg.nix (renamed from modules/home/i3wm/original/xdg.nix) | 2 | ||||
| -rw-r--r-- | modules/home/i3wm/original/polybar.nix | 181 |
13 files changed, 210 insertions, 213 deletions
diff --git a/modules/home/i3wm/original/default.nix b/home/rices/original/default.nix index c861b04..cb2b4ca 100644 --- a/modules/home/i3wm/original/default.nix +++ b/home/rices/original/default.nix @@ -1,7 +1,4 @@ -{ ... }: - -{ - # i3wm home-manager configuration orchestrator +{...}: { imports = [ ./dunst.nix ./i3.nix @@ -14,4 +11,4 @@ ./scripts.nix ./xdg.nix ]; -}
\ No newline at end of file +} diff --git a/modules/home/i3wm/original/dunst.nix b/home/rices/original/dunst.nix index 6f217d9..9978d38 100644 --- a/modules/home/i3wm/original/dunst.nix +++ b/home/rices/original/dunst.nix @@ -1,16 +1,12 @@ { config, pkgs, lib, ... }: -{ +let + vars = import ./variables.nix; +in { services.dunst = { enable = true; - settings = let - colors = { - foreground = "#d0b6fd"; - background = "#1c182d"; - alert = "#7b91fc"; - }; - in { + settings = { global = { width = "(200,300)"; height = "(0,150)"; @@ -22,24 +18,24 @@ }; urgency_low = { - background = colors.background; - foreground = colors.foreground; + background = vars.colors.background; + foreground = vars.colors.foreground; timeout = 8; }; urgency_normal = { - background = colors.background; - foreground = colors.foreground; + background = vars.colors.background; + foreground = vars.colors.foreground; frame-size = "0"; timeout = 10; }; urgency_critical = { - background = colors.background; - foreground = colors.foreground; + background = vars.colors.background; + foreground = vars.colors.foreground; frame-size = "5"; - frame-color = colors.alert; + frame-color = vars.colors.alert; }; }; }; -}
\ No newline at end of file +} diff --git a/modules/home/i3wm/original/i3.nix b/home/rices/original/i3.nix index a4f6858..0982fcb 100644 --- a/modules/home/i3wm/original/i3.nix +++ b/home/rices/original/i3.nix @@ -20,7 +20,7 @@ exec_always --no-startup-id sh -c "killall -q polybar; sleep 1; polybar example --config=~/.config/polybar/config.ini &" exec_always --no-startup-id polybar-hide-on-fullscreen exec --no-startup-id flameshot - + gaps top 60 bindsym XF86MonBrightnessDown exec brightnessctl set 10%- @@ -127,4 +127,4 @@ hide_edge_borders smart ''; }; -}
\ No newline at end of file +} diff --git a/modules/home/i3wm/original/kitty.nix b/home/rices/original/kitty.nix index 17b220d..580d765 100644 --- a/modules/home/i3wm/original/kitty.nix +++ b/home/rices/original/kitty.nix @@ -42,4 +42,4 @@ color15 #d8cab8 ''; }; -}
\ No newline at end of file +} diff --git a/modules/home/i3wm/original/neovim.nix b/home/rices/original/neovim.nix index e59fd3d..54a9b83 100644 --- a/modules/home/i3wm/original/neovim.nix +++ b/home/rices/original/neovim.nix @@ -8,8 +8,7 @@ vimAlias = true; withNodeJs = true; - # +ANT FIX - plugins = []; # disable HM plugin processing + plugins = []; extraLuaConfig = '' -- LazyVim bootstrap @@ -98,4 +97,4 @@ vim.opt.clipboard = "unnamedplus" ''; }; -}
\ No newline at end of file +} diff --git a/modules/home/i3wm/original/nnn.nix b/home/rices/original/nnn.nix index 74b7dcb..fd2046f 100644 --- a/modules/home/i3wm/original/nnn.nix +++ b/home/rices/original/nnn.nix @@ -4,4 +4,4 @@ enable = true; package = pkgs.nnn.override { withNerdIcons = true; }; }; -}
\ No newline at end of file +} diff --git a/modules/home/i3wm/original/picom.nix b/home/rices/original/picom.nix index 93cb37d..a96f158 100644 --- a/modules/home/i3wm/original/picom.nix +++ b/home/rices/original/picom.nix @@ -24,4 +24,4 @@ corner-radius = 15; }; }; -}
\ No newline at end of file +} diff --git a/home/rices/original/polybar.nix b/home/rices/original/polybar.nix new file mode 100644 index 0000000..dcfc8ec --- /dev/null +++ b/home/rices/original/polybar.nix @@ -0,0 +1,172 @@ +{ config, pkgs, lib, ... }: + +let + vars = import ./variables.nix; +in { + services.polybar = { + enable = true; + + extraConfig = '' + [bar/example] + width = 98% + height = 30pt + radius = 15 + offset-x = 1% + offset-y = 1% + override-redirect = true + fixed-center = true + enable-ipc = true + + background = ${vars.colors.background} + foreground = ${vars.colors.foreground} + + line-size = 4pt + border-size = Opt + border-color = #00000000 + + padding-left = 1 + padding-right = 1 + module-margin = 1 + + separator = | + separator-foreground = ${vars.colors.disabled} + + font-0 = fira code;2 + + modules-left = xworkspaces spotify spotify-prev spotify-play-pause spotify-next + modules-center = date + modules-right = filesystem memory cpu pulseaudio-devices wlan xkeyboard battery + + [module/systray] + type = internal/tray + format-margin = 8pt + tray-spacing = 16pt + + [module/xworkspaces] + type = internal/xworkspaces + label-active = %name% + label-active-background = ${vars.colors.background-alt} + label-active-underline = ${vars.colors.primary} + label-active-padding = 1 + label-occupied = %name% + label-occupied-padding = 1 + label-urgent = %name% + label-urgent-background = ${vars.colors.alert} + label-urgent-padding = 1 + label-empty = %name% + label-empty-foreground = ${vars.colors.disabled} + label-empty-padding = 1 + + [module/xwindow] + type = internal/xwindow + label = %title:0:60:...% + + [module/filesystem] + type = internal/fs + interval = 25 + mount-0 = / + label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%% + label-unmounted = %mountpoint% not mounted + label-unmounted-foreground = ${vars.colors.disabled} + + [module/pulseaudio] + type = internal/pulseaudio + format-volume-prefix = "VOL " + format-volume-prefix-foreground = ${vars.colors.primary} + format-volume = <label-volume> + label-volume = %percentage%% + label-muted = muted + label-muted-foreground = ${vars.colors.disabled} + + [module/xkeyboard] + type = internal/xkeyboard + blacklist-0 = num lock + label-layout = %layout% + label-layout-foreground = ${vars.colors.primary} + label-indicator-padding = 2 + label-indicator-margin = 1 + label-indicator-foreground = ${vars.colors.background} + label-indicator-background = ${vars.colors.secondary} + + [module/memory] + type = internal/memory + interval = 2 + format-prefix = "RAM " + format-prefix-foreground = ${vars.colors.primary} + label = %percentage_used:2%% + + [module/cpu] + type = internal/cpu + interval = 2 + format-prefix = "CPU " + format-prefix-foreground = ${vars.colors.primary} + label = %percentage:2%% + + [network-base] + type = internal/network + interval = 5 + format-connected = <label-connected> + format-disconnected = <label-disconnected> + label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected + + [module/wlan] + inherit = network-base + interface-type = wireless + label-connected = %{F#F0C674}%ifname%%{F-} %essid% + + [module/eth] + inherit = network-base + interface-type = wired + label-connected = %{F#F0C674}%ifname%%{F-} + + [module/date] + type = internal/date + interval = 1 + date = %H:%M + date-alt = %Y-%m-%d %H:%M:%S + label = %date% + label-foreground = ${vars.colors.primary} + + [settings] + screenchange-reload = true + pseudo-transparency = true + + [module/battery] + type = internal/battery + full-at = 100 + low-at = 15 + battery = BAT0 + adapter = ADP1 + poll-interval = 5 + + [module/spotify] + type = custom/script + tail = true + interval = 1 + format-prefix = "♫" + format = <label> + exec = get-spotify-status + + [module/spotify-prev] + type = custom/script + exec = echo "◀◀" + format = <label> + click-left = playerctl previous -p spotify + + [module/spotify-play-pause] + type = custom/ipc + hook-0 = echo "▶" + hook-1 = echo "▶" + initial = 1 + click-left = playerctl play-pause -p spotify + + [module/spotify-next] + type = custom/script + exec = echo "▶▶" + format = <label> + click-left = playerctl next -p spotify + ''; + + script = "polybar example --config=~/.config/polybar/config.ini &"; + }; +} diff --git a/modules/home/i3wm/original/rofi.nix b/home/rices/original/rofi.nix index 9332efd..a266396 100644 --- a/modules/home/i3wm/original/rofi.nix +++ b/home/rices/original/rofi.nix @@ -10,4 +10,4 @@ modes = [ "drun" "ssh" "emoji" "calc" ]; plugins = with pkgs; [ rofi-emoji rofi-calc ]; }; -}
\ No newline at end of file +} diff --git a/modules/home/i3wm/original/scripts.nix b/home/rices/original/scripts.nix index 4eb0b61..5bf8c6b 100644 --- a/modules/home/i3wm/original/scripts.nix +++ b/home/rices/original/scripts.nix @@ -28,4 +28,4 @@ done '') ]; -}
\ No newline at end of file +} diff --git a/home/rices/original/variables.nix b/home/rices/original/variables.nix new file mode 100644 index 0000000..7aa70ff --- /dev/null +++ b/home/rices/original/variables.nix @@ -0,0 +1,14 @@ +{ + colors = { + background = "#1c182d"; + background-alt = "#2b1b3d"; + foreground = "#d0b6fd"; + primary = "#cfb5fd"; + secondary = "#8a78b0"; + accent = "#AC82E9"; + alert = "#7b91fc"; + disabled = "#707880"; + }; + + wallpaper = "~/Pictures/wallpapers/vox.jpg"; +} diff --git a/modules/home/i3wm/original/xdg.nix b/home/rices/original/xdg.nix index 7590ea8..b1b612e 100644 --- a/modules/home/i3wm/original/xdg.nix +++ b/home/rices/original/xdg.nix @@ -13,4 +13,4 @@ }; }; }; -}
\ No newline at end of file +} diff --git a/modules/home/i3wm/original/polybar.nix b/modules/home/i3wm/original/polybar.nix deleted file mode 100644 index 95130cf..0000000 --- a/modules/home/i3wm/original/polybar.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ config, pkgs, lib, ... }: - - -{ - services.polybar = { - enable = true; - - extraConfig = let - colors = { - background = "#1c182d"; - background-alt = "#2b1b3d"; - foreground = "#d0b6fd"; - primary = "#cfb5fd"; - secondary = "#8a78b0"; - alert = "#7b91fc"; - disabled = "#707880"; - }; - in '' - [bar/example] - width = 98% - height = 30pt - radius = 15 - offset-x = 1% - offset-y = 1% - override-redirect = true - fixed-center = true - enable-ipc = true - - background = ${colors.background} - foreground = ${colors.foreground} - - line-size = 4pt - border-size = Opt - border-color = #00000000 - - padding-left = 1 - padding-right = 1 - module-margin = 1 - - separator = | - separator-foreground = ${colors.disabled} - - font-0 = fira code;2 - - modules-left = xworkspaces spotify spotify-prev spotify-play-pause spotify-next - modules-center = date - modules-right = filesystem memory cpu pulseaudio-devices wlan xkeyboard battery - - [module/systray] - type = internal/tray - format-margin = 8pt - tray-spacing = 16pt - - [module/xworkspaces] - type = internal/xworkspaces - label-active = %name% - label-active-background = ${colors.background-alt} - label-active-underline = ${colors.primary} - label-active-padding = 1 - label-occupied = %name% - label-occupied-padding = 1 - label-urgent = %name% - label-urgent-background = ${colors.alert} - label-urgent-padding = 1 - label-empty = %name% - label-empty-foreground = ${colors.disabled} - label-empty-padding = 1 - - [module/xwindow] - type = internal/xwindow - label = %title:0:60:...% - - [module/filesystem] - type = internal/fs - interval = 25 - mount-0 = / - label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%% - label-unmounted = %mountpoint% not mounted - label-unmounted-foreground = ${colors.disabled} - - [module/pulseaudio] - type = internal/pulseaudio - format-volume-prefix = "VOL " - format-volume-prefix-foreground = ${colors.primary} - format-volume = <label-volume> - label-volume = %percentage%% - label-muted = muted - label-muted-foreground = ${colors.disabled} - - [module/xkeyboard] - type = internal/xkeyboard - blacklist-0 = num lock - label-layout = %layout% - label-layout-foreground = ${colors.primary} - label-indicator-padding = 2 - label-indicator-margin = 1 - label-indicator-foreground = ${colors.background} - label-indicator-background = ${colors.secondary} - - [module/memory] - type = internal/memory - interval = 2 - format-prefix = "RAM " - format-prefix-foreground = ${colors.primary} - label = %percentage_used:2%% - - [module/cpu] - type = internal/cpu - interval = 2 - format-prefix = "CPU " - format-prefix-foreground = ${colors.primary} - label = %percentage:2%% - - [network-base] - type = internal/network - interval = 5 - format-connected = <label-connected> - format-disconnected = <label-disconnected> - label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected - - [module/wlan] - inherit = network-base - interface-type = wireless - label-connected = %{F#F0C674}%ifname%%{F-} %essid% - - [module/eth] - inherit = network-base - interface-type = wired - label-connected = %{F#F0C674}%ifname%%{F-} - - [module/date] - type = internal/date - interval = 1 - date = %H:%M - date-alt = %Y-%m-%d %H:%M:%S - label = %date% - label-foreground = ${colors.primary} - - [settings] - screenchange-reload = true - pseudo-transparency = true - - [module/battery] - type = internal/battery - full-at = 100 - low-at = 15 - battery = BAT0 - adapter = ADP1 - poll-interval = 5 - - [module/spotify] - type = custom/script - tail = true - interval = 1 - format-prefix = "♫" - format = <label> - exec = get-spotify-status - - [module/spotify-prev] - type = custom/script - exec = echo "◀◀" - format = <label> - click-left = playerctl previous -p spotify - - [module/spotify-play-pause] - type = custom/ipc - hook-0 = echo "▶" - hook-1 = echo "▶" - initial = 1 - click-left = playerctl play-pause -p spotify - - [module/spotify-next] - type = custom/script - exec = echo "▶▶" - format = <label> - click-left = playerctl next -p spotify - ''; - - script = "polybar example --config=~/.config/polybar/config.ini &"; - }; -}
\ No newline at end of file |