continue refactor, home modules are actual modules and remove some useless files

Makefile

@@ -15,3 +15,6 @@ os:
 	sudo nixos-rebuild $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST)
 home :
 	home-manager $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST)
+
+cleanup :
+	sudo nix-collect-garbage -d

dotfiles/bashrc

@@ -1,33 +0,0 @@
-export PATH="$HOME/.local/bin:$PATH"
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-alias vim=nvim
-alias vi=nvim
-alias "copy=xclip -selection c"
-alias hl="Hyprland"
-cat_cp() {
-	cat $@ | xclip -selection c
-}
-
-shopt -s histappend
-
-alias clr=clear
-
-cd() {
-	builtin cd "$@"
-	echo -n "$PWD" > ~/.last_directory
-}
-
-export PATH="$HOME/.local/bin:$PATH"
-export PATH="$HOME/pyenv/bin:$PATH"
-alias tagueule="asusctl profile -P Quiet"
-
-[ -z "${PS1:-}" ] && return
-
-if [ -f ~/.last_directory ];then
-	echo -n going to
-	cat ~/.last_directory
-	echo
-	builtin cd "$(cat ~/.last_directory)"
-fi

dotfiles/config/bspwm/bspwmrc

@@ -1,22 +0,0 @@
-#! /bin/sh
-
-if [ -f $HOME/.config/bspwm/screenlayout.sh ];then /bin/sh $HOME/.config/bspwm/screenlayout.sh ;fi
-if [ -f $HOME/.config/bspwm/host.sh ];then /bin/sh $HOME/.config/bspwm/host.sh;fi
-
-pgrep sxhkd > /dev/null || sxhkd &
-pgrep polybar >/dev/null || polybar -q main -c "$HOME/.config/polybar/config.ini"&
-
-bspc config border_width         2
-bspc config window_gap          10
-
-bspc config split_ratio          0.52
-bspc config borderless_monocle   true
-bspc config gapless_monocle      true
-
-pgrep alacritty > /dev/null || alacritty &
-pgrep picom > /dev/null || picom &
-pgrep dunst >/dev/null || dunst &
-numlockx on &
-setxkbmap fr us&
-nitrogen --restore &
-pgrep activate-linux >/dev/null  || (sleep 2;activate-linux -d)&

dotfiles/config/polybar/colors.ini

@@ -1,15 +0,0 @@
-[color]
-
-;; Use pywal.sh in scripts directory to use colors from an image/wallpaper.
-
-;; main colors
-background = #AA111111
-foreground = #CCCCCC
-foreground-alt = #FFFFFF
-alpha = #00000000
-
-;; shades
-shade1 = #AAFFFFFF
-shade2 = #AAFF0000
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_

dotfiles/config/polybar/config-small.ini

@@ -1,297 +0,0 @@
-# **************************************************************************** #
-#                                                                              #
-#                                                         :::      ::::::::    #
-#    config-small.ini                                   :+:      :+:    :+:    #
-#                                                     +:+ +:+         +:+      #
-#    By: tomoron <tomoron@student.42.fr>            +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2024/08/28 20:38:59 by tomoron           #+#    #+#              #
-#    Updated: 2024/10/16 22:18:29 by tomoron          ###   ########.fr        #
-#                                                                              #
-# **************************************************************************** #
-
-;; Global WM Settings
-
-[global/wm]
-; Adjust the _NET_WM_STRUT_PARTIAL top value
-; Used for top aligned bars
-margin-bottom = 0
-
-; Adjust the _NET_WM_STRUT_PARTIAL bottom value
-; Used for bottom aligned bars
-margin-top = 0
-
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-;; File Inclusion
-; include an external file, like module file, etc.
-
-include-file = ~/.config/polybar/colors.ini
-include-file = ~/.config/polybar/modules.ini
-include-file = ~/.config/polybar/user_modules.ini
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-;; Bar Settings
-
-[bar/main]
-; Use either of the following command to list available outputs:
-; If unspecified, the application will pick the first one it finds.
-; $ polybar -m | cut -d ':' -f 1
-; $ xrandr -q | grep " connected" | cut -d ' ' -f1
-monitor = ${env:MONITOR:}
-
-; Use the specified monitor as a fallback if the main one is not found.
-monitor-fallback =
-
-; Require the monitor to be in connected state
-; XRandR sometimes reports my monitor as being disconnected (when in use)
-monitor-strict = false
-
-; Tell the Window Manager not to configure the window.
-; Use this to detach the bar if your WM is locking its size/position.
-override-redirect = false
-
-; Put the bar at the bottom of the screen
-bottom = false
-
-; Prefer fixed center position for the `modules-center` block
-; When false, the center position will be based on the size of the other blocks.
-fixed-center = true
-
-; Dimension defined as pixel value (e.g. 35) or percentage (e.g. 50%),
-; the percentage can optionally be extended with a pixel offset like so:
-; 50%:-10, this will result in a width or height of 50% minus 10 pixels
-width = 100%
-height = 40
-
-; Offset defined as pixel value (e.g. 35) or percentage (e.g. 50%)
-; the percentage can optionally be extended with a pixel offset like so:
-; 50%:-10, this will result in an offset in the x or y direction 
-; of 50% minus 10 pixels
-offset-x = 0
-offset-y = 0
-
-; Background ARGB color (e.g. #f00, #ff992a, #ddff1023)
-background = ${color.alpha}
-
-; Foreground ARGB color (e.g. #f00, #ff992a, #ddff1023)
-foreground = ${color.foreground}
-
-; Background gradient (vertical steps)
-;   background-[0-9]+ = #aarrggbb
-;;background-0 = 
-
-; Value used for drawing rounded corners
-; Note: This shouldn't be used together with border-size because the border 
-; doesn't get rounded
-; Individual top/bottom values can be defined using:
-;   radius-{top,bottom}
-radius-top = 0.0
-radius-bottom = 0.0
-
-; Under-/overline pixel size and argb color
-; Individual values can be defined using:
-;   {overline,underline}-size
-;   {overline,underline}-color
-underline-size = 2
-underline-color = ${color.foreground}
-
-; Values applied to all borders
-; Individual side values can be defined using:
-;   border-{left,top,right,bottom}-size
-;   border-{left,top,right,bottom}-color
-; The top and bottom borders are added to the bar height, so the effective
-; window height is:
-;   height + border-top-size + border-bottom-size
-; Meanwhile the effective window width is defined entirely by the width key and
-; the border is placed withing this area. So you effectively only have the
-; following horizontal space on the bar:
-;   width - border-right-size - border-left-size
-border-size = 0
-border-color = ${color.background}
-
-; Number of spaces to add at the beginning/end of the bar
-; Individual side values can be defined using:
-;   padding-{left,right}
-padding = 0
-
-; Number of spaces to add before/after each module
-; Individual side values can be defined using:
-;   module-margin-{left,right}
-module-margin-left = 0
-module-margin-right = 0
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-; Fonts are defined using <font-name>;<vertical-offset>
-; Font names are specified using a fontconfig pattern.
-;   font-0 = NotoSans-Regular:size=8;2
-;   font-1 = MaterialIcons:size=10
-;   font-2 = Termsynu:size=8;-1
-;   font-3 = FontAwesome:size=10
-; See the Fonts wiki page for more details
-
-font-0 = "Iosevka Nerd Font:style=Bold:pixelsize=13;4"
-font-1 = "Iosevka Nerd Font:style=Bold:pixelsize=15;4"
-font-2 = "Iosevka Nerd Font:style=Bold:pixelsize=15;4"
-
-; Modules are added to one of the available blocks
-;   modules-left = cpu ram
-;   modules-center = xwindow xbacklight
-;   modules-right = ipc clock
-
-modules-left = workspaces space mpris 
-modules-center =
-modules-right = fans dgpu memory sep filesystem sep cpu sep temperature sep polybar sep battery sep network sep date
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-; The separator will be inserted between the output of each module
-separator =
-
-; Opacity value between 0.0 and 1.0 used on fade in/out
-dim-value = 1.0
-
-; Value to be used to set the WM_NAME atom
-; If the value is empty or undefined, the atom value
-; will be created from the following template: polybar-[BAR]_[MONITOR]
-; NOTE: The placeholders are not available for custom values
-wm-name = 
-
-; Locale used to localize various module data (e.g. date)
-; Expects a valid libc locale, for example: sv_SE.UTF-8
-locale = 
-
-; Position of the system tray window
-; If empty or undefined, tray support will be disabled
-; NOTE: A center aligned tray will cover center aligned modules
-;
-; Available positions:
-;   left
-;   center
-;   right
-;   none
-tray-position = none
-
-; If true, the bar will not shift its
-; contents when the tray changes
-tray-detached = false
-
-; Tray icon max size
-tray-maxsize = 16
-
-; Background color for the tray container 
-; ARGB color (e.g. #f00, #ff992a, #ddff1023)
-; By default the tray container will use the bar
-; background color.
-tray-background = ${color.background}
-
-; Tray offset defined as pixel value (e.g. 35) or percentage (e.g. 50%)
-tray-offset-x = 0
-tray-offset-y = 0
-
-; Pad the sides of each tray icon
-tray-padding = 0
-
-; Scale factor for tray clients
-tray-scale = 1.0
-
-; Restack the bar window and put it above the
-; selected window manager's root
-;
-; Fixes the issue where the bar is being drawn
-; on top of fullscreen window's
-;
-; Currently supported WM's:
-;   bspwm
-;   i3 (requires: `override-redirect = true`)
-;;wm-restack =
-
-; Set a DPI values used when rendering text
-; This only affects scalable fonts
-; dpi = 
-
-; Enable support for inter-process messaging
-; See the Messaging wiki page for more details.
-enable-ipc = true
-
-; Fallback click handlers that will be called if
-; there's no matching module handler found.
-click-left = 
-click-middle = 
-click-right =
-scroll-up =
-scroll-down =
-double-click-left =
-double-click-middle =
-double-click-right =
-
-; Requires polybar to be built with xcursor support (xcb-util-cursor)
-; Possible values are:
-; - default   : The default pointer as before, can also be an empty string (default)
-; - pointer   : Typically in the form of a hand
-; - ns-resize : Up and down arrows, can be used to indicate scrolling
-cursor-click = 
-cursor-scroll = 
-
-;; WM Workspace Specific
-
-; bspwm
-;;scroll-up = bspwm-desknext
-;;scroll-down = bspwm-deskprev
-;;scroll-up = bspc desktop -f prev.local
-;;scroll-down = bspc desktop -f next.local
-
-;i3
-;;scroll-up = i3wm-wsnext
-;;scroll-down = i3wm-wsprev
-;;scroll-up = i3-msg workspace next_on_output
-;;scroll-down = i3-msg workspace prev_on_output
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-;; Application Settings
-
-[settings]
-; The throttle settings lets the eventloop swallow up til X events
-; if they happen within Y millisecond after first event was received.
-; This is done to prevent flood of update event.
-;
-; For example if 5 modules emit an update event at the same time, we really
-; just care about the last one. But if we wait too long for events to swallow
-; the bar would appear sluggish so we continue if timeout
-; expires or limit is reached.
-throttle-output = 5
-throttle-output-for = 10
-
-; Time in milliseconds that the input handler will wait between processing events
-;throttle-input-for = 30
-
-; Reload upon receiving XCB_RANDR_SCREEN_CHANGE_NOTIFY events
-screenchange-reload = false
-
-; Compositing operators
-; @see: https://www.cairographics.org/manual/cairo-cairo-t.html#cairo-operator-t
-compositing-background = source
-compositing-foreground = over
-compositing-overline = over
-compositing-underline = over
-compositing-border = over
-
-; Define fallback values used by all module formats
-;format-foreground = 
-;format-background = 
-;format-underline =
-;format-overline =
-;format-spacing =
-;format-padding =
-;format-margin =
-;format-offset =
-
-; Enables pseudo-transparency for the bar
-; If set to true the bar can be transparent without a compositor.
-pseudo-transparency = false
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_

dotfiles/config/polybar/modules.ini

@@ -1,636 +0,0 @@
-# **************************************************************************** #
-#                                                                              #
-#                                                         :::      ::::::::    #
-#    modules.ini                                        :+:      :+:    :+:    #
-#                                                     +:+ +:+         +:+      #
-#    By: tomoron <tomoron@student.42.fr>            +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2024/08/28 20:38:49 by tomoron           #+#    #+#              #
-#    Updated: 2024/10/16 22:55:55 by tomoron          ###   ########.fr        #
-#                                                                              #
-# **************************************************************************** #
-
-[module/mpris]
-type = custom/script
-exec-if = playerctl metadata
-exec = playerctl metadata --format '{{ playerName }}:{{ artist }} - {{title}}'
-interval = 1
-interval-if = 1
-
-[module/dgpu]
-type = custom/script
-exec-if = test "$(supergfxctl -g)" = "Hybrid"
-exec = echo "  on |"
-format-padding=1
-interval-if = 10
-interval = 100
-
-[module/fans]
-type = custom/script
-exec-if = test "$(cat /sys/class/hwmon/hwmon6/fan1_input)" -gt 0 -o "$(cat /sys/class/hwmon/hwmon6/fan2_input)" -gt 0 
-exec = echo " " "$(cat /sys/class/hwmon/hwmon6/fan1_input).$(cat /sys/class/hwmon/hwmon6/fan2_input) |"
-interval = 1
-interval-if = 1
-
-[module/pulseaudio]
-type = internal/pulseaudio
-
-; Soundcard to be used
-; Usually in the format hw:# where # is the card number
-; You can find the different card numbers in `/proc/asound/cards`
-master-soundcard = default
-speaker-soundcard = default
-headphone-soundcard = default
-
-; Name of the master, speaker and headphone mixers
-; Use the following command to list available mixer controls:
-; $ amixer scontrols | sed -nr "s/.*'([[:alnum:]]+)'.*/\1/p"
-; If master, speaker or headphone-soundcard isn't the default, 
-; use `amixer -c # scontrols` instead where # is the number 
-; of the master, speaker or headphone soundcard respectively
-;
-; Default: Master
-master-mixer = Master
-
-; Optionally define speaker and headphone mixers
-; Default: none
-;;speaker-mixer = Speaker
-; Default: none
-;;headphone-mixer = Headphone
-
-; NOTE: This is required if headphone_mixer is defined
-; Use the following command to list available device controls
-; $ amixer controls | sed -r "/CARD/\!d; s/.*=([0-9]+).*name='([^']+)'.*/printf '%3.0f: %s\n' '\1' '\2'/e" | sort
-; You may also need to use `amixer -c # controls` as above for the mixer names
-; Default: none
-;;headphone-id = 9
-
-; Use volume mapping (similar to amixer -M and alsamixer), where the increase in volume is linear to the ear
-; Default: false
-;;mapped = true
-
-; Interval for volume increase/decrease (in percent points)
-; Default: 5
-interval = 5
-
-; Available tags:
-;   <label-volume> (default)
-;   <ramp-volume>
-;   <bar-volume
-format-volume = "<ramp-volume> <label-volume>"
-format-volume-padding = 1
-
-; Available tags:
-;   <label-muted> (default)
-;   <ramp-volume>
-;   <bar-volume>
-format-muted = "<label-muted>"
-format-muted-prefix = "󰝟 "
-format-muted-prefix-font = 2
-format-muted-padding = 1
-
-; Available tokens:
-;   %percentage% (default)
-label-volume = %percentage%%
-
-; Available tokens:
-;   %percentage% (default
-label-muted = " M"
-label-muted-foreground = ${color.foreground}
-
-; Only applies if <ramp-volume> is used
-ramp-volume-0 = ""
-ramp-volume-1 = ""
-ramp-volume-2 = " "
-ramp-volume-font = 2
-
-; If defined, it will replace <ramp-volume> when
-; headphones are plugged in to `headphone_control_numid`
-; If undefined, <ramp-volume> will be used for both
-; Only applies if <ramp-volume> is used
-ramp-headphones-0 = 
-
-[module/battery]
-type = internal/battery
-
-; This is useful in case the battery never reports 100% charge
-full-at = 100
-
-; Use the following command to list batteries and adapters:
-; $ ls -1 /sys/class/power_supply/
-battery = BAT0
-adapter = AC0
-
-; If an inotify event haven't been reported in this many
-; seconds, manually poll for new values.
-;
-; Needed as a fallback for systems that don't report events
-; on sysfs/procfs.
-;
-; Disable polling by setting the interval to 0.
-;
-; Default: 5
-poll-interval = 2
-
-; see "man date" for details on how to format the time string
-; NOTE: if you want to use syntax tags here you need to use %%{...}
-; Default: %H:%M:%S
-time-format = %H:%M
-
-; Available tags:
-;   <label-charging> (default)
-;   <bar-capacity>
-;   <ramp-capacity>
-;   <animation-charging>
-format-charging = "󰂄 <label-charging>"
-format-charging-padding = 1
-
-; Available tags:
-;   <label-discharging> (default)
-;   <bar-capacity>
-;   <ramp-capacity>
-;   <animation-discharging>
-format-discharging = "<ramp-capacity> <label-discharging>"
-format-discharging-padding = 1
-
-; Available tags:
-;   <label-full> (default)
-;   <bar-capacity>
-;   <ramp-capacity>
-format-full = <label-full>
-format-full-prefix = " "
-format-full-prefix-font = 2
-format-full-padding = 2
-
-; Available tokens:
-;   %percentage% (default)
-;   %time%
-;   %consumption% (shows current charge rate in watts)
-label-charging = %percentage%% %time%
-
-; Available tokens:
-;   %percentage% (default)
-;   %time%
-;   %consumption% (shows current discharge rate in watts)
-label-discharging = %percentage%% %time%
-
-; Available tokens:
-;   %percentage% (default)
-label-full = " Full"
-
-; Only applies if <ramp-capacity> is used
-ramp-capacity-0 = " "
-ramp-capacity-1 = " "
-ramp-capacity-2 = " "
-ramp-capacity-3 = " "
-ramp-capacity-4 = " "
-ramp-capacity-font = 2
-
-; Only applies if <bar-capacity> is used
-;bar-capacity-width = 10
-
-; Only applies if <animation-charging> is used
-animation-charging-0 = "󰂇 "
-animation-charging-1 = "󰢝 "
-animation-charging-2 = "󰂉 "
-animation-charging-3 = "󰂋 " 
-animation-charging-4 = "󰂅 "
-animation-charging-font = 2
-
-; Framerate in milliseconds
-animation-charging-framerate = 750
-
-; Only applies if <animation-discharging> is used
-;;animation-discharging-0 = ${battery.anim0}
-;;animation-discharging-1 = ${battery.anim1}
-
-; Framerate in milliseconds
-;animation-discharging-framerate = 500
-
-; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-[module/cpu]
-type = internal/cpu
-
-; Seconds to sleep between updates
-; Default: 1
-interval = 1
-
-; Available tags:
-;   <label> (default)
-;   <bar-load>
-;   <ramp-load>
-;   <ramp-coreload>
-;;format = <label> <ramp-coreload>
-format = <label>
-format-prefix = " "
-format-prefix-font = 2
-format-foreground = ${color.foreground}
-format-padding = 1
-
-; Available tokens:
-;   %percentage% (default) - total cpu load averaged over all cores
-;   %percentage-sum% - Cumulative load on all cores
-;   %percentage-cores% - load percentage for each core
-;   %percentage-core[1-9]% - load percentage for specific core
-label = " %percentage%%"
-
-; Spacing between individual per-core ramps
-;;ramp-coreload-spacing = 1
-;;ramp-coreload-0 = ${cpu.load0}
-;;ramp-coreload-1 = ${cpu.load1}
-
-;;ramp-load-0 = ${cpu.load0}
-;;ramp-load-1 = ${cpu.load1}
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-[module/date]
-type = internal/date
-
-; Seconds to sleep between updates
-interval = 1.0
-
-; See "http://en.cppreference.com/w/cpp/io/manip/put_time" for details on how to format the date string
-; NOTE: if you want to use syntax tags here you need to use %%{...}
-;;date = %Y-%m-%d%
-
-; Optional time format
-time = " %H:%M:%S"
-
-; if `date-alt` or `time-alt` is defined, clicking
-; the module will toggle between formats
-;;date-alt = %A, %d %B %Y
-time-alt = " %a, %d %b %Y"
-
-; Available tags:
-;   <label> (default)
-format = <label>
-format-prefix = " "
-format-prefix-font = 2
-format-foreground = ${color.foreground}
-format-padding = 1
-
-; Available tokens:
-;   %date%
-;   %time%
-; Default: %date%
-label = %time%
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-[module/filesystem]
-type = internal/fs
-
-; Mountpoints to display
-mount-0 = /
-;;mount-1 = /home
-;;mount-2 = /var
-
-; Seconds to sleep between updates
-; Default: 30
-interval = 30
-
-; Display fixed precision values
-; Default: false
-fixed-values = true
-
-; Spacing between entries
-; Default: 2
-;;spacing = 4
-
-; Available tags:
-;   <label-mounted> (default)
-;   <bar-free>
-;   <bar-used>
-;   <ramp-capacity>
-format-mounted = <label-mounted>
-format-mounted-prefix = 󰋊
-format-mounted-prefix-font = 2
-format-mounted-padding = 2
-
-; Available tokens:
-;   %mountpoint%
-;   %type%
-;   %fsname%
-;   %percentage_free%
-;   %percentage_used%
-;   %total%
-;   %free%
-;   %used%
-; Default: %mountpoint% %percentage_free%%
-label-mounted = " %percentage_used%%"
-
-; Available tokens:
-;   %mountpoint%
-; Default: %mountpoint% is not mounted
-label-unmounted = " %mountpoint%: not mounted"
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-[module/memory]
-type = internal/memory
-
-; Seconds to sleep between updates
-; Default: 1
-interval = 1
-
-; Available tags:
-;   <label> (default)
-;   <bar-used>
-;   <bar-free>
-;   <ramp-used>
-;   <ramp-free>
-;   <bar-swap-used>
-;   <bar-swap-free>
-;   <ramp-swap-used>
-;   <ramp-swap-free>
-format = <label>
-format-prefix = 
-format-prefix-font = 2 
-format-padding = 1
-
-; Available tokens:
-;   %percentage_used% (default)
-;   %percentage_free%
-;   %gb_used%
-;   %gb_free%
-;   %gb_total%
-;   %mb_used%
-;   %mb_free%
-;   %mb_total%
-;   %percentage_swap_used%
-;   %percentage_swap_free%
-;   %mb_swap_total%
-;   %mb_swap_free%
-;   %mb_swap_used%
-;   %gb_swap_total%
-;   %gb_swap_free%
-;   %gb_swap_used%
-
-label = "  %percentage_used%%"
-
-; Only applies if <ramp-used> is used
-;;ramp-used-0 = ${memory.used0}
-;;ramp-used-1 = ${memory.used1}
-;;ramp-used-2 = ${memory.used2}
-
-; Only applies if <ramp-free> is used
-;;ramp-free-0 = ${memory.free0}
-;;ramp-free-1 = ${memory.free1}
-;;ramp-free-2 = ${memory.free2}
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/network]
-type = internal/network
-interface = wlp2s0 
-
-; Seconds to sleep between updates
-; Default: 1
-interval = 1.0
-
-; Test connectivity every Nth update
-; A value of 0 disables the feature
-; NOTE: Experimental (needs more testing)
-; Default: 0
-;ping-interval = 3
-
-; @deprecated: Define min width using token specifiers (%downspeed:min% and %upspeed:min%)
-; Minimum output width of upload/download rate
-; Default: 3
-;;udspeed-minwidth = 5
-
-; Accumulate values from all interfaces
-; when querying for up/downspeed rate
-; Default: false
-accumulate-stats = true
-
-; Consider an `UNKNOWN` interface state as up.
-; Some devices have an unknown state, even when they're running
-; Default: false
-unknown-as-up = true
-
-; Available tags:
-;   <label-connected> (default)
-;   <ramp-signal>
-format-connected = "<ramp-signal><label-connected>"
-format-connected-prefix = ""
-format-connected-prefix-font = 2
-format-connected-padding = 1
-
-; Available tags:
-;   <label-disconnected> (default)
-format-disconnected = <label-disconnected>
-format-disconnected-prefix = "󱚼 "
-format-disconnected-prefix-font = 2
-format-disconnected-padding = 1
-
-; Available tags:
-;   <label-connected> (default)
-;   <label-packetloss>
-;   <animation-packetloss>
-;;format-packetloss = <animation-packetloss> <label-connected>
-
-; Available tokens:
-;   %ifname%    [wireless+wired]
-;   %local_ip%  [wireless+wired]
-;   %local_ip6% [wireless+wired]
-;   %essid%     [wireless]
-;   %signal%    [wireless]
-;   %upspeed%   [wireless+wired]
-;   %downspeed% [wireless+wired]
-;   %linkspeed% [wired]
-; Default: %ifname% %local_ip%
-label-connected = "%{A1:networkmanager_dmenu &:} %essid%%{A}"
-
-; Available tokens:
-;   %ifname%    [wireless+wired]
-; Default: (none)
-label-disconnected = "%{A1:networkmanager_dmenu &:}%{A}"
-;;label-disconnected-foreground = #66ffffff
-
-; Available tokens:
-;   %ifname%    [wireless+wired]
-;   %local_ip%  [wireless+wired]
-;   %local_ip6% [wireless+wired]
-;   %essid%     [wireless]
-;   %signal%    [wireless]
-;   %upspeed%   [wireless+wired]
-;   %downspeed% [wireless+wired]
-;   %linkspeed% [wired]
-; Default: (none)
-;label-packetloss = %essid%
-;label-packetloss-foreground = #eefafafa
-
-; Only applies if <ramp-signal> is used
-ramp-signal-0 = "󰤟 "
-ramp-signal-1 = "󰤢 "
-ramp-signal-2 = "󰤨 "
-
-; Only applies if <animation-packetloss> is used
-;;animation-packetloss-0 = ⚠
-;;animation-packetloss-0-foreground = #ffa64c
-;;animation-packetloss-1 = ⚠
-;;animation-packetloss-1-foreground = #000000
-; Framerate in milliseconds
-;;animation-packetloss-framerate = 500
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-[module/temperature]
-type = internal/temperature
-
-; Seconds to sleep between updates
-; Default: 1
-interval = 1
-
-; Thermal zone to use
-; To list all the zone types, run 
-; $ for i in /sys/class/thermal/thermal_zone*; do echo "$i: $(<$i/type)"; done
-; Default: 0
-thermal-zone = 0
-
-; Full path of temperature sysfs path
-; Use `sensors` to find preferred temperature source, then run
-; $ for i in /sys/class/hwmon/hwmon*/temp*_input; do echo "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*})) $(readlink -f $i)"; done
-; to find path to desired file
-; Default reverts to thermal zone setting
-;;hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input
-hwmon-path = /sys/devices/virtual/thermal/thermal_zone0/temp
-
-; Threshold temperature to display warning label (in degrees celsius)
-; Default: 80
-warn-temperature = 80
-
-; Whether or not to show units next to the temperature tokens (°C, °F)
-; Default: true
-units = true
-
-; Available tags:
-;   <label> (default)
-;   <ramp>
-format = "<ramp> <label>"
-format-padding = 1
-
-; Available tags:
-;   <label-warn> (default)
-;   <ramp>
-format-warn = "<ramp> <label-warn>"
-format-warn-foreground = #FF0000 
-format-warn-padding = 1
-
-; Available tokens:
-;   %temperature% (deprecated)
-;   %temperature-c%   (default, temperature in °C)
-;   %temperature-f%   (temperature in °F)
-label = %temperature-c%
-
-; Available tokens:
-;   %temperature% (deprecated)
-;   %temperature-c%   (default, temperature in °C)
-;   %temperature-f%   (temperature in °F)
-label-warn = "%temperature-c%"
-
-; Requires the <ramp> tag
-; The icon selection will range from 0 to `warn-temperature`
-; with the current temperature as index.
-ramp-0 = ""
-ramp-1 = ""
-ramp-2 = ""
-ramp-3 = ""
-ramp-4 = ""
-ramp-font = 2
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-[module/workspaces]
-type = internal/xworkspaces
-
-; Only show workspaces defined on the same output as the bar
-;
-; Useful if you want to show monitor specific workspaces
-; on different bars
-;
-; Default: false
-pin-workspaces = false
-
-; Create click handler used to focus desktop
-; Default: true
-enable-click = true
-
-; Create scroll handlers used to cycle desktops
-; Default: true
-enable-scroll = false
-
-; icon-[0-9]+ = <desktop-name>;<icon>
-; NOTE: The desktop name needs to match the name configured by the WM
-; You can get a list of the defined desktops using:
-; $ xprop -root _NET_DESKTOP_NAMES
-icon-0 = 1;1
-icon-1 = 2;2 
-icon-2 = 3;3 
-icon-3 = 4;4 
-icon-4 = 5;5 
-icon-5 = A;A 
-icon-6 = B;B 
-icon-default = 0
-
-
-; Available tags:
-;   <label-monitor>
-;   <label-state> - gets replaced with <label-(active|urgent|occupied|empty)>
-; Default: <label-state>
-format = <label-state>
-format-font = 3
-format-background = #0000FF
-format-foreground = #FF0000
-
-; Available tokens:
-;   %name%
-; Default: %name%
-label-monitor = %name%
-
-; Available tokens:
-;   %name%
-;   %icon%
-;   %index%
-; Default: %icon%  %name%
-label-active = %icon%
-label-active-background = #44ffffff
-label-active-foreground = #00FF00
-
-; Available tokens:
-;   %name%
-;   %icon%
-;   %index%
-; Default: %icon%  %name%
-label-occupied = %icon%
-label-occupied-background = #00FFFFFF 
-label-occupied-foreground = #00FF00
-
-; Available tokens:
-;   %name%
-;   %icon%
-;   %index%
-; Default: %icon%  %name%
-label-urgent = %icon%
-label-urgent-background = ${color.background}
-label-urgent-foreground = #CC6666
-
-; Available tokens:
-;   %name%
-;   %icon%
-;   %index%
-; Default: %icon%  %name%
-label-empty = %icon%
-label-empty-background = #0000FFFF
-label-empty-foreground = #FFFFFF
-
-label-active-padding = 1.85
-label-urgent-padding = 1.85
-label-occupied-padding = 1.85
-label-empty-padding = 1.85
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_

dotfiles/config/polybar/scripts/launcher.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-PATH = "/var/lib/flatpak/exports/bin:$PATH"
-rofi -show drun -show-icons

dotfiles/config/polybar/scripts/launcher_bin.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-PATH="$HOME/.local/bin:$PATH"
-rofi -show-icons -show run 

dotfiles/local/share/icons/bibata-modern-classic/manifest.hl

@@ -1,4 +0,0 @@
-name = Bibata-Modern-Classic
-description = Generated Bibata repository
-version = 0.1
-cursors_directory = hyprcursors

dotfiles/xinitrc

@@ -1 +0,0 @@
-exec bspwm

flake.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:24 by tomoron           #+#    #+#              #
-#    Updated: 2025/02/09 02:55:40 by tomoron          ###   ########.fr        #
+#    Updated: 2025/02/09 23:12:04 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -35,23 +35,26 @@
 	let
 	  pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
 
-
       osConfig = {flakeName, extraModules ? []}: nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; flakeName = flakeName; };
-        modules = nixpkgs.lib.concatLists [ [./osConfigs/global.nix ./osConfigs/hosts/${flakeName}.nix ] extraModules];
+        modules = nixpkgs.lib.concatLists [
+		  [./osConfigs/global.nix ./osConfigs/hosts/${flakeName}.nix ]
+		  extraModules
+		];
       };
 
-
 	  homeConfig = {flakeName, extraModules ? [], username ? "tom", homeDir ? "/home/tom"}: home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
 	    extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; };
-        modules = nixpkgs.lib.concatLists [ [ ./home.nix ./homes/${flakeName}/home.nix] extraModules ];
+        modules = nixpkgs.lib.concatLists [
+		  [ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}/home.nix]
+		  extraModules
+		];
 	  };
 
 	in {
 
-      nixosConfigurations = {
-	    server = osConfig {flakeName = "server";};
+      nixosConfigurations = { server = osConfig {flakeName = "server";};
 	    vbox = osConfig {flakeName = "vbox";};
 		laptop = osConfig {flakeName = "laptop"; extraModules = [ nixos-hardware.nixosModules.asus-zephyrus-ga401 ];};
 		desktop = osConfig {flakeName = "desktop";};

homeConfigs/dotfiles/config/bspwm/bspwmrc

@@ -0,0 +1,2 @@
+#! /bin/sh
+

homeConfigs/dotfiles/config/polybar/colors.ini

@@ -0,0 +1,152 @@
+[module/fans]
+type = custom/script
+exec-if = test "$(cat /sys/class/hwmon/hwmon6/fan1_input)" -gt 0 -o "$(cat /sys/class/hwmon/hwmon6/fan2_input)" -gt 0 
+exec = echo " " "$(cat /sys/class/hwmon/hwmon6/fan1_input).$(cat /sys/class/hwmon/hwmon6/fan2_input) |"
+interval = 1
+interval-if = 1
+
+[module/dgpu]
+type = custom/script
+exec-if = test "$(supergfxctl -g)" = "Hybrid"
+exec = echo "  on |"
+format-padding=1
+interval-if = 10
+interval = 100
+
+[module/memory]
+type = internal/memory
+interval = 1
+format = <label>
+format-prefix = 
+format-prefix-font = 2 
+format-padding = 1
+label = "  %percentage_used%%"
+
+[module/filesystem]
+type = internal/fs
+mount-0 = /
+interval = 30
+fixed-values = true
+format-mounted = <label-mounted>
+format-mounted-prefix = 󰋊
+format-mounted-prefix-font = 2
+format-mounted-padding = 2
+label-mounted = " %percentage_used%%"
+label-unmounted = " %mountpoint%: not mounted"
+
+[module/cpu]
+type = internal/cpu
+interval = 1
+format = <label>
+format-prefix = " "
+format-prefix-font = 2
+format-foreground = ${color.foreground}
+format-padding = 1
+label = " %percentage%%"
+
+[module/temperature]
+type = internal/temperature
+interval = 1
+thermal-zone = 0
+hwmon-path = /sys/devices/virtual/thermal/thermal_zone0/temp
+warn-temperature = 80
+units = true
+format = "<ramp> <label>"
+format-padding = 1
+format-warn = "<ramp> <label-warn>"
+format-warn-foreground = #FF0000 
+format-warn-padding = 1
+label = %temperature-c%
+label-warn = "%temperature-c%"
+ramp-0 = ""
+ramp-1 = ""
+ramp-2 = ""
+ramp-3 = ""
+ramp-4 = ""
+ramp-font = 2
+
+[module/sep]
+type = custom/text
+content = "|"
+
+content-foreground = #FFFFFF
+
+[module/space]
+type = custom/text
+content = "  "
+content-padding=1
+
+
+[module/network]
+type = internal/network
+interface = wlp2s0 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+format-connected = "<ramp-signal><label-connected>"
+format-connected-prefix = ""
+format-connected-prefix-font = 2
+format-connected-padding = 1
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "󱚼 "
+format-disconnected-prefix-font = 2
+format-disconnected-padding = 1
+label-connected = "%{A1:networkmanager_dmenu &:} %essid%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}%{A}"
+ramp-signal-0 = "󰤟 "
+ramp-signal-1 = "󰤢 "
+ramp-signal-2 = "󰤨 "
+
+[module/date]
+type = internal/date
+interval = 1.0
+time = " %H:%M:%S"
+time-alt = " %a, %d %b %Y"
+format = <label>
+format-prefix = " "
+format-prefix-font = 2
+format-foreground = ${color.foreground}
+format-padding = 1
+label = %time%
+
+[module/workspaces]
+type = internal/xworkspaces
+pin-workspaces = false
+enable-click = true
+enable-scroll = false
+icon-0 = 1;1
+icon-1 = 2;2 
+icon-2 = 3;3 
+icon-3 = 4;4 
+icon-4 = 5;5 
+icon-5 = A;A 
+icon-6 = B;B 
+icon-default = 0
+format = <label-state>
+format-font = 3
+format-background = #0000FF
+format-foreground = #FF0000
+label-monitor = %name%
+label-active = %icon%
+label-active-background = #44ffffff
+label-active-foreground = #00FF00
+label-occupied = %icon%
+label-occupied-background = #00FFFFFF 
+label-occupied-foreground = #00FF00
+label-urgent = %icon%
+label-urgent-background = ${color.background}
+label-urgent-foreground = #CC6666
+label-empty = %icon%
+label-empty-background = #0000FFFF
+label-empty-foreground = #FFFFFF
+label-active-padding = 1.85
+label-urgent-padding = 1.85
+label-occupied-padding = 1.85
+label-empty-padding = 1.85
+
+[module/mpris]
+type = custom/script
+exec-if = playerctl metadata
+exec = playerctl metadata --format '{{ playerName }}:{{ artist }} - {{title}}'
+interval = 1
+interval-if = 1

homeConfigs/dotfiles/config/polybar/config-small.ini

@@ -0,0 +1,233 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    config-small.ini                                   :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42.fr>            +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2024/08/28 20:38:59 by tomoron           #+#    #+#              #
+#    Updated: 2025/02/10 02:50:15 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+[global/wm]
+margin-bottom = 0
+margin-top = 0
+
+[color]
+background = #AA111111
+foreground = #CCCCCC
+foreground-alt = #FFFFFF
+alpha = #00000000
+
+shade1 = #AAFFFFFF
+shade2 = #AAFF0000
+
+[module/fans]
+type = custom/script
+exec-if = test "$(cat /sys/class/hwmon/hwmon6/fan1_input)" -gt 0 -o "$(cat /sys/class/hwmon/hwmon6/fan2_input)" -gt 0 
+exec = echo " " "$(cat /sys/class/hwmon/hwmon6/fan1_input).$(cat /sys/class/hwmon/hwmon6/fan2_input) |"
+interval = 1
+interval-if = 1
+
+[module/dgpu]
+type = custom/script
+exec-if = test "$(supergfxctl -g)" = "Hybrid"
+exec = echo "  on |"
+format-padding=1
+interval-if = 10
+interval = 100
+
+[module/memory]
+type = internal/memory
+interval = 1
+format = <label>
+format-prefix = 
+format-prefix-font = 2 
+format-padding = 1
+label = "  %percentage_used%%"
+
+[module/filesystem]
+type = internal/fs
+mount-0 = /
+interval = 30
+fixed-values = true
+format-mounted = <label-mounted>
+format-mounted-prefix = 󰋊
+format-mounted-prefix-font = 2
+format-mounted-padding = 2
+label-mounted = " %percentage_used%%"
+label-unmounted = " %mountpoint%: not mounted"
+
+[module/cpu]
+type = internal/cpu
+interval = 1
+format = <label>
+format-prefix = " "
+format-prefix-font = 2
+format-foreground = ${color.foreground}
+format-padding = 1
+label = " %percentage%%"
+
+[module/temperature]
+type = internal/temperature
+interval = 1
+thermal-zone = 0
+hwmon-path = /sys/devices/virtual/thermal/thermal_zone0/temp
+warn-temperature = 80
+units = true
+format = "<ramp> <label>"
+format-padding = 1
+format-warn = "<ramp> <label-warn>"
+format-warn-foreground = #FF0000 
+format-warn-padding = 1
+label = %temperature-c%
+label-warn = "%temperature-c%"
+ramp-0 = ""
+ramp-1 = ""
+ramp-2 = ""
+ramp-3 = ""
+ramp-4 = ""
+ramp-font = 2
+
+[module/sep]
+type = custom/text
+content = "|"
+
+content-foreground = #FFFFFF
+
+[module/space]
+type = custom/text
+content = "  "
+content-padding=1
+
+
+[module/network]
+type = internal/network
+interface = wlp2s0 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+format-connected = "<ramp-signal><label-connected>"
+format-connected-prefix = ""
+format-connected-prefix-font = 2
+format-connected-padding = 1
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "󱚼 "
+format-disconnected-prefix-font = 2
+format-disconnected-padding = 1
+label-connected = "%{A1:networkmanager_dmenu &:} %essid%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}%{A}"
+ramp-signal-0 = "󰤟 "
+ramp-signal-1 = "󰤢 "
+ramp-signal-2 = "󰤨 "
+
+[module/date]
+type = internal/date
+interval = 1.0
+time = " %H:%M:%S"
+time-alt = " %a, %d %b %Y"
+format = <label>
+format-prefix = " "
+format-prefix-font = 2
+format-foreground = ${color.foreground}
+format-padding = 1
+label = %time%
+
+[module/workspaces]
+type = internal/xworkspaces
+pin-workspaces = false
+enable-click = true
+enable-scroll = false
+icon-0 = 1;1
+icon-1 = 2;2 
+icon-2 = 3;3 
+icon-3 = 4;4 
+icon-4 = 5;5 
+icon-5 = A;A 
+icon-6 = B;B 
+icon-default = 0
+format = <label-state>
+format-font = 3
+format-background = #0000FF
+format-foreground = #FF0000
+label-monitor = %name%
+label-active = %icon%
+label-active-background = #44ffffff
+label-active-foreground = #00FF00
+label-occupied = %icon%
+label-occupied-background = #00FFFFFF 
+label-occupied-foreground = #00FF00
+label-urgent = %icon%
+label-urgent-background = ${color.background}
+label-urgent-foreground = #CC6666
+label-empty = %icon%
+label-empty-background = #0000FFFF
+label-empty-foreground = #FFFFFF
+label-active-padding = 1.85
+label-urgent-padding = 1.85
+label-occupied-padding = 1.85
+label-empty-padding = 1.85
+
+[module/mpris]
+type = custom/script
+exec-if = playerctl metadata
+exec = playerctl metadata --format '{{ playerName }}:{{ artist }} - {{title}}'
+interval = 1
+interval-if = 1
+
+include-file = ~/.config/polybar/modules.ini
+include-file = ~/.config/polybar/user_modules.ini
+
+[bar/main]
+monitor = ${env:MONITOR:}
+monitor-fallback =
+monitor-strict = false
+override-redirect = false
+bottom = false
+fixed-center = true
+width = 100%
+height = 40
+offset-x = 0
+offset-y = 0
+background = ${color.alpha}
+foreground = ${color.foreground}
+radius-top = 0.0
+radius-bottom = 0.0
+underline-size = 2
+underline-color = ${color.foreground}
+border-size = 0
+border-color = ${color.background}
+padding = 0
+module-margin-left = 0
+module-margin-right = 0
+font-0 = "Iosevka Nerd Font:style=Bold:pixelsize=13;4"
+font-1 = "Iosevka Nerd Font:style=Bold:pixelsize=15;4"
+font-2 = "Iosevka Nerd Font:style=Bold:pixelsize=15;4"
+modules-left = workspaces space mpris 
+modules-center =
+modules-right = fans dgpu memory sep filesystem sep cpu sep temperature sep polybar sep network sep date
+separator =
+dim-value = 1.0
+tray-position = none
+tray-detached = false
+tray-maxsize = 16
+tray-background = ${color.background}
+tray-offset-x = 0
+tray-offset-y = 0
+tray-padding = 0
+tray-scale = 1.0
+enable-ipc = true
+
+[settings]
+throttle-output = 5
+throttle-output-for = 10
+screenchange-reload = false
+
+compositing-background = source
+compositing-foreground = over
+compositing-overline = over
+compositing-underline = over
+compositing-border = over
+
+pseudo-transparency = false

homeConfigs/dotfiles/config/polybar/modules.ini

@@ -0,0 +1,132 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    modules.ini                                        :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42.fr>            +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2024/08/28 20:38:49 by tomoron           #+#    #+#              #
+#    Updated: 2025/02/10 01:59:55 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+[module/pulseaudio]
+type = internal/pulseaudio
+
+master-soundcard = default
+speaker-soundcard = default
+headphone-soundcard = default
+
+master-mixer = Master
+interval = 5
+format-volume = "<ramp-volume> <label-volume>"
+format-volume-padding = 1
+format-muted = "<label-muted>"
+format-muted-prefix = "󰝟 "
+format-muted-prefix-font = 2
+format-muted-padding = 1
+label-volume = %percentage%%
+label-muted = " M"
+label-muted-foreground = ${color.foreground}
+ramp-volume-0 = ""
+ramp-volume-1 = ""
+ramp-volume-2 = " "
+ramp-volume-font = 2
+ramp-headphones-0 = 
+
+[module/battery]
+type = internal/battery
+
+; This is useful in case the battery never reports 100% charge
+full-at = 100
+
+; Use the following command to list batteries and adapters:
+; $ ls -1 /sys/class/power_supply/
+battery = BAT0
+adapter = AC0
+
+; If an inotify event haven't been reported in this many
+; seconds, manually poll for new values.
+;
+; Needed as a fallback for systems that don't report events
+; on sysfs/procfs.
+;
+; Disable polling by setting the interval to 0.
+;
+; Default: 5
+poll-interval = 2
+
+; see "man date" for details on how to format the time string
+; NOTE: if you want to use syntax tags here you need to use %%{...}
+; Default: %H:%M:%S
+time-format = %H:%M
+
+; Available tags:
+;   <label-charging> (default)
+;   <bar-capacity>
+;   <ramp-capacity>
+;   <animation-charging>
+format-charging = "󰂄 <label-charging>"
+format-charging-padding = 1
+
+; Available tags:
+;   <label-discharging> (default)
+;   <bar-capacity>
+;   <ramp-capacity>
+;   <animation-discharging>
+format-discharging = "<ramp-capacity> <label-discharging>"
+format-discharging-padding = 1
+
+; Available tags:
+;   <label-full> (default)
+;   <bar-capacity>
+;   <ramp-capacity>
+format-full = <label-full>
+format-full-prefix = " "
+format-full-prefix-font = 2
+format-full-padding = 2
+
+; Available tokens:
+;   %percentage% (default)
+;   %time%
+;   %consumption% (shows current charge rate in watts)
+label-charging = %percentage%% %time%
+
+; Available tokens:
+;   %percentage% (default)
+;   %time%
+;   %consumption% (shows current discharge rate in watts)
+label-discharging = %percentage%% %time%
+
+; Available tokens:
+;   %percentage% (default)
+label-full = " Full"
+
+; Only applies if <ramp-capacity> is used
+ramp-capacity-0 = " "
+ramp-capacity-1 = " "
+ramp-capacity-2 = " "
+ramp-capacity-3 = " "
+ramp-capacity-4 = " "
+ramp-capacity-font = 2
+
+; Only applies if <bar-capacity> is used
+;bar-capacity-width = 10
+
+; Only applies if <animation-charging> is used
+animation-charging-0 = "󰂇 "
+animation-charging-1 = "󰢝 "
+animation-charging-2 = "󰂉 "
+animation-charging-3 = "󰂋 " 
+animation-charging-4 = "󰂅 "
+animation-charging-font = 2
+
+; Framerate in milliseconds
+animation-charging-framerate = 750
+
+; Only applies if <animation-discharging> is used
+;;animation-discharging-0 = ${battery.anim0}
+;;animation-discharging-1 = ${battery.anim1}
+
+; Framerate in milliseconds
+;animation-discharging-framerate = 500

homeConfigs/home.nix

@@ -6,20 +6,16 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2025/02/09 02:42:49 by tomoron          ###   ########.fr        #
+#    Updated: 2025/02/10 05:27:03 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 {lib, pkgs, username,homeDir, ... }:
 
 {
-  imports = [
-	modules/git.nix
-	modules/picom.nix
-	modules/alacritty.nix
-	modules/vim.nix
-	modules/firefox.nix
-	modules/waybar.nix
+  imports = lib.concatLists [
+    [ ./packages.nix ]
+    (lib.fileset.toList ./modules)
   ];
   
   home.username = "${username}";
@@ -36,72 +32,54 @@
 
   gtk = {
     enable = true;
-
-    theme = {
-      package = pkgs.flat-remix-gtk;
-      name = "Flat-Remix-GTK-Grey-Darkest";
-    };
-
-    iconTheme = {
-      package = pkgs.adwaita-icon-theme;
-      name = "Adwaita";
-    };
-
-    font = {
-      name = "Sans";
-      size = 11;
-    };
+    theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; };
+    iconTheme = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; };
+    font = { name = "Sans"; size = 11; };
   };
 
-  home.packages = with pkgs;[
-    polybarFull
-    sxhkd
-    nitrogen
-	neovim
-	ripgrep
-	activate-linux
-	bspwm
-	dunst
-	numlockx
-	unison
-	discord	
-	google-chrome
-	brightnessctl	
-	playerctl
-	swaybg
-	hyprlock
-	python3
-	vlc
-    nerd-fonts.iosevka
-	moonlight-qt
+  home.shellAliases = {
+    ls= "ls --color=auto";
+    grep = "grep --color=auto";
+    vim = "nvim";
+    vi = "nvim";
+    hl = "Hyprland";
+    clr = "clear";
+    tagueule = "asusctl profile -P Quiet";
+    parle = "asusctl profile -P performance";
+  };
+  
+  programs.bash = {
+	enable = true;
+    historyControl = ["ignoreboth"];
+	historyIgnore = [ "ls" "cd" "exit" ];
+	shellOptions = [ "cdspell" "autocd"];
+	bashrcExtra = ''
+      cd() {
+      	builtin cd "$@"
+      	echo -n "$PWD" > ~/.last_directory
+      }
+      [ -z "\$${PS1:-}" ] && return
+      
+      if [ -f ~/.last_directory ];then
+      	echo -n going to
+      	cat ~/.last_directory
+      	echo
+      	builtin cd "$(cat ~/.last_directory)"
+      fi
+	'';
+  };
 
-	grim
-	slurp
-	nix-index
-	yubikey-manager
-	yubico-pam
-	wl-clipboard
-  ];
-
-  home.file = {
-    ".config/bspwm/bspwmrc".source = lib.mkDefault dotfiles/config/bspwm/bspwmrc;
-#	".config/hypr/hyprland.conf".source = dotfiles/config/hypr/hyprland.conf;
-	".config/hypr/hyprlock.conf".source = dotfiles/config/hypr/hyprlock.conf;
-#	".config/waybar/config".source = dotfiles/config/waybar/config;
-#	".config/waybar/style.css".source = dotfiles/config/waybar/style.css;
-    ".config/sxhkd".source = lib.mkDefault dotfiles/config/sxhkd;
-    ".config/polybar".source = dotfiles/config/polybar;
+  home.file = { #should be able to make most of these in nix configs 
     ".config/nitrogen/wallpaper.png".source = lib.mkDefault dotfiles/config/nitrogen/wallpaper.png;
-    ".xinitrc".source = dotfiles/xinitrc;
-    ".bashrc".source = dotfiles/bashrc;
+    ".xinitrc".text = "exec bspwm";
 
 	".local/share/rofi/themes".source = "${builtins.fetchGit {
 		url = "https://github.com/newmanls/rofi-themes-collection";
 		rev = "c8239a45edced3502894e1716a8b661fdea8f1c9";
 		ref = "master";
     }}/themes";
+
 	".local/bin/desk_sync".source = dotfiles/local/bin/desk_sync;
-	".local/share/icons/bibata-modern-classic".source = dotfiles/local/share/icons/bibata-modern-classic;
   };
   programs.home-manager.enable = true;
 }