diff --git a/flake.nix b/flake.nix index 8ab9388..c6d5e32 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/17 18:15:24 by tomoron #+# #+# # -# Updated: 2025/02/09 23:12:04 by tomoron ### ########.fr # +# Updated: 2025/02/10 17:35:45 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -47,7 +47,7 @@ inherit pkgs; extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; }; modules = nixpkgs.lib.concatLists [ - [ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}/home.nix] + [ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}.nix] extraModules ]; }; diff --git a/homeConfigs/hosts/ft.nix b/homeConfigs/hosts/ft.nix new file mode 100644 index 0000000..48b5f6f --- /dev/null +++ b/homeConfigs/hosts/ft.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, username,homeDir, ... }: + +{ + imports = []; + + home.packages = with pkgs;[ + neovim + dmenu + brightnessctl + rofi + ]; + + mods.game.enable = false; + mods.hyprland.enable = false; + mods.x11.enable = true; + programs.firefox.enable = false; + + programs.bash.profileExtra = + '' + export PATH="$HOME/.local/bin:$HOME/.nix-profile/bin:$PATH" + export C_INCLUDE_PATH="$HOME/.local/include" + export CPLUS_INCLUDE_PATH="$HOME/.local/include" + export LIBRARY_PATH="$HOME/.local/lib" + export LD_LIBRARY_PATH=$HOME/.local/lib + + #ft_cockd& + #bash -c "while :; do sleep 30; killall ft_lock; done"& + /usr/bin/xterm +cm -cr RED -maximized -bg BLACK -selbg WHITE -selfg BLACK -fg WHITE -fa Monospace -fs 14 + + msg_daemon& + blink& + BLINK_PID=$! + ft_lock -d& + #sync_desktop -batch >/dev/null 2> /dev/null& + /usr/bin/xterm +cm -cr RED -maximized -bg BLACK -selbg WHITE -selfg BLACK -fg WHITE -fa Monospace -fs 14 -e "bash -c \"dwm&alacritty&update_home;killall dwm\"" + (sleep 10 ;setxkbmap fr us)& + bspwm + kill $BLINK_PID + exit + ''; +} diff --git a/homeConfigs/hosts/ft/bspwm/host.sh b/homeConfigs/hosts/ft/bspwm/host.sh deleted file mode 100644 index c40e95c..0000000 --- a/homeConfigs/hosts/ft/bspwm/host.sh +++ /dev/null @@ -1 +0,0 @@ -bspc monitor -d 1 2 3 4 5 diff --git a/homeConfigs/hosts/ft/dotfiles/config/bspwm/bspwmrc b/homeConfigs/hosts/ft/dotfiles/config/bspwm/bspwmrc deleted file mode 100755 index 6bb6d02..0000000 --- a/homeConfigs/hosts/ft/dotfiles/config/bspwm/bspwmrc +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh - -pgrep -x sxhkd > /dev/null || sxhkd & -bspc monitor -d 1 2 3 4 5 -bspc desktop 1 -f -pgrep -x polybar || polybar -q main -c "$HOME/.config/polybar/config-small.ini"& - -bspc config border_width 2 -bspc config window_gap 10 - -bspc config split_ratio 0.52 -bspc config borderless_monocle true -bspc config focus_follows_pointer true -bspc config gapless_monocle true - -pgrep -x alacritty > /dev/null || alacritty & - -#autostart appps -picom --experimental-backends & -nitrogen --restore & -dunst & -numlockx on & -setxkbmap fr us& -killall activate-linux -(sleep 1;activate-linux -c 1-1-1-0.7 -V 50 -H 70 -d)& diff --git a/homeConfigs/hosts/ft/dotfiles/config/nitrogen/607699.png b/homeConfigs/hosts/ft/dotfiles/config/nitrogen/607699.png deleted file mode 100644 index 0eb8d9f..0000000 Binary files a/homeConfigs/hosts/ft/dotfiles/config/nitrogen/607699.png and /dev/null differ diff --git a/homeConfigs/hosts/ft/dotfiles/config/nitrogen/bg-saved.cfg b/homeConfigs/hosts/ft/dotfiles/config/nitrogen/bg-saved.cfg deleted file mode 100644 index bd43cef..0000000 --- a/homeConfigs/hosts/ft/dotfiles/config/nitrogen/bg-saved.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[xin_-1] -file=/nfs/homes/tomoron/.config/nitrogen/thumb-1920-814854.png -mode=0 -bgcolor=#000000 diff --git a/homeConfigs/hosts/ft/dotfiles/config/nitrogen/nitrogen.cfg b/homeConfigs/hosts/ft/dotfiles/config/nitrogen/nitrogen.cfg deleted file mode 100644 index 69dcc18..0000000 --- a/homeConfigs/hosts/ft/dotfiles/config/nitrogen/nitrogen.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[geometry] -posx=-1 -posy=-1 -sizex=450 -sizey=500 - -[nitrogen] -view=icon -recurse=true -sort=alpha -icon_caps=false -dirs=/nfs/homes/tomoron/.config/nitrogen; diff --git a/homeConfigs/hosts/ft/dotfiles/config/nitrogen/thumb-1920-814854.png b/homeConfigs/hosts/ft/dotfiles/config/nitrogen/thumb-1920-814854.png deleted file mode 100644 index 3269dd6..0000000 Binary files a/homeConfigs/hosts/ft/dotfiles/config/nitrogen/thumb-1920-814854.png and /dev/null differ diff --git a/homeConfigs/hosts/ft/dotfiles/config/sxhkd/sxhkdrc b/homeConfigs/hosts/ft/dotfiles/config/sxhkd/sxhkdrc deleted file mode 100755 index 6b2d110..0000000 --- a/homeConfigs/hosts/ft/dotfiles/config/sxhkd/sxhkdrc +++ /dev/null @@ -1,170 +0,0 @@ -# -# wm independent hotkeys -# - -# terminal emulator -super + Return - alacritty - -# program launcher -super + d - dmenu_run - -super + shift + d - dmenu_run - -# make sxhkd reload its configuration files: -super + Escape - pkill -USR1 -x sxhkd - -# -# bspwm hotkeys -# - -# quit/restart bspwm -super + alt + {q,r} - bspc {quit,wm -r} - -# close and kill -control + alt + {_,shift + }q - bspc node -{c,k} - -# alternate between the tiled and monocle layout -super + m - bspc desktop -l next - -# send the newest marked node to the newest preselected node -super + y - bspc node newest.marked.local -n newest.!automatic.local - -# swap the current node and the biggest window -super + g - bspc node -s biggest.window - -# -# state/flags -# - -# set the window state -super + {t,shift + t,s,f} - bspc node -t {tiled,pseudo_tiled,floating,fullscreen} - -# set the node flags -super + ctrl + {m,x,y,z} - bspc node -g {marked,locked,sticky,private} - -# -# focus/swap -# - -# focus the node in the given direction -super + {_,shift + }{h,j,k,l} - bspc node -{f,s} {west,south,north,east} - -# focus the node for the given path jump -super + {p,b,comma,period} - bspc node -f @{parent,brother,first,second} - -# focus the next/previous window in the current desktop -super + {_,shift + }c - bspc node -f {next,prev}.local.!hidden.window - -# focus the next/previous desktop in the current monitor -super + bracket{left,right} - bspc desktop -f {prev,next}.local - -# focus the last node/desktop -super + {grave,Tab} - bspc {node,desktop} -f last - -# focus the older or newer node in the focus history -super + {o,i} - bspc wm -h off; \ - bspc node {older,newer} -f; \ - bspc wm -h on - -# focus or send to the given desktop -super + {_,shift + }{1-9,0} - bspc {desktop -f,node -d} '^{1-9,10}' - -# -# preselect -# - -# preselect the direction -super + ctrl + {h,j,k,l} - bspc node -p {west,south,north,east} - -# preselect the ratio -super + ctrl + {1-9} - bspc node -o 0.{1-9} - -# cancel the preselection for the focused node -super + ctrl + space - bspc node -p cancel - -# cancel the preselection for the focused desktop -super + ctrl + shift + space - bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel - -# -# move/resize -# - -# expand a window by moving one of its side outward -super + alt + {h,j,k,l} - bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0} - -# contract a window by moving one of its side inward -super + alt + shift + {h,j,k,l} - bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0} - -# move a floating window -super + {Left,Down,Up,Right} - bspc node -v {-20 0,0 20,0 -20,20 0} - -#Volume control - -XF86AudioLowerVolume - pactl set-sink-volume @DEFAULT_SINK@ -5% - -XF86AudioRaiseVolume - pactl set-sink-volume @DEFAULT_SINK@ +5% - -XF86AudioMute - pactl set-sink-mute @DEFAULT_SINK@ toggle - -XF86MonBrightnessUp - brightness up - -XF86MonBrightnessDown - brightness down - -XF86KbdBrightnessUp - kbd_brightness up - -XF86KbdBrightnessDown - kbd_brightness down - -alt + F7 - brightnessctl s 10- - -alt + F8 - brightnessctl s 10+ - -#music control - -super + shift + o - playerctl play-pause - -super + shift + p - playerctl previous - -super + shift + n - playerctl next - -super + shift + alt + b - polybar-msg cmd hide - -super + shift + b - polybar-msg cmd show diff --git a/homeConfigs/hosts/ft/home.nix b/homeConfigs/hosts/ft/home.nix deleted file mode 100644 index 52b56ac..0000000 --- a/homeConfigs/hosts/ft/home.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, username,homeDir, ... }: - -{ - imports = [ ../modules/nitrogen.nix ]; - - home.packages = with pkgs;[ - neovim - dmenu - brightnessctl - rofi - ]; - - home.file = { - ".config/sxhkd".source = dotfiles/config/sxhkd; - ".config/bspwm/host.sh".source = ./bspwm/host.sh; - }; - programs.firefox.enable = false; -} diff --git a/homeConfigs/hosts/modules/game.nix b/homeConfigs/hosts/modules/game.nix index cd7d303..e69de29 100644 --- a/homeConfigs/hosts/modules/game.nix +++ b/homeConfigs/hosts/modules/game.nix @@ -1,6 +0,0 @@ - -{ config, lib, pkgs, ... }: - -{ - home.packages = with pkgs;[lutris mangohud]; -} diff --git a/homeConfigs/hosts/modules/nitrogen.nix b/homeConfigs/hosts/modules/nitrogen.nix deleted file mode 100644 index fda5788..0000000 --- a/homeConfigs/hosts/modules/nitrogen.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, pkgs, homeDir, ... }: - -let - background = "${homeDir}/.config/nitrogen/wallpaper.png"; -in -{ - home.file.".config/nitrogen/bg-saved.cfg".text = '' - [xin_0] - file=${background} - mode=5 - bgcolor=#000000 - - [xin_1] - file=${background} - mode=5 - bgcolor=#000000 - - [xin_2] - file=${background} - mode=5 - bgcolor=#000000 - - [xin_3] - file=${background} - mode=5 - bgcolor=#000000 - ''; -} diff --git a/homeConfigs/modules/game.nix b/homeConfigs/modules/game.nix new file mode 100644 index 0000000..b81f517 --- /dev/null +++ b/homeConfigs/modules/game.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: + +{ + options.mods.game.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "install packages for games (except steam , it's installed systemwide)"; + }; + + config = lib.mkIf config.mods.game.enable { + home.packages = with pkgs;[ + lutris + mangohud + moonlight-qt + ]; + }; +} diff --git a/homeConfigs/modules/x11/bspwm.nix b/homeConfigs/modules/x11/bspwm.nix index a30ab55..b3c2ce2 100644 --- a/homeConfigs/modules/x11/bspwm.nix +++ b/homeConfigs/modules/x11/bspwm.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/02/10 00:21:11 by tomoron #+# #+# # -# Updated: 2025/02/10 00:30:13 by tomoron ### ########.fr # +# Updated: 2025/02/10 17:34:53 by tomoron ### ########.fr # # # # **************************************************************************** # {lib, config, ... }: @@ -17,7 +17,6 @@ xsession.windowManager.bspwm.extraConfig = '' #/bin/sh 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 diff --git a/homeConfigs/modules/x11/nitrogen.nix b/homeConfigs/modules/x11/nitrogen.nix new file mode 100644 index 0000000..71eea81 --- /dev/null +++ b/homeConfigs/modules/x11/nitrogen.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, homeDir, ... }: + +let + background = "${homeDir}/.config/nitrogen/wallpaper.png"; +in +{ + config = lib.mkIf config.mods.x11.enable { + + home.file.".config/nitrogen/bg-saved.cfg".text = '' + [xin_0] + file=${background} + mode=5 + bgcolor=#000000 + + [xin_1] + file=${background} + mode=5 + bgcolor=#000000 + + [xin_2] + file=${background} + mode=5 + bgcolor=#000000 + + [xin_3] + file=${background} + mode=5 + bgcolor=#000000 + ''; + }; + +} diff --git a/homeConfigs/modules/x11/polybar.nix b/homeConfigs/modules/x11/polybar.nix index caae8db..00ae019 100644 --- a/homeConfigs/modules/x11/polybar.nix +++ b/homeConfigs/modules/x11/polybar.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/02/10 02:51:32 by tomoron #+# #+# # -# Updated: 2025/02/10 03:19:27 by tomoron ### ########.fr # +# Updated: 2025/02/10 17:28:27 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -15,6 +15,7 @@ { config = lib.mkIf config.mods.x11.enable { services.polybar.enable = true; + services.polybar.script = "pgrep polybar >/dev/null || polybar -q main -c \"$HOME/.config/polybar/config.ini\"&"; services.polybar.config = { "global/wm" = { margin-bottom = 0; @@ -102,7 +103,7 @@ "module/network" = { type = "internal/network"; interface = "wlp2s0"; - interval = 1.0; + interval = 1; accumulate-stats = true; unknown-as-up = true; format-connected = ""; @@ -122,7 +123,7 @@ "module/date" = { type = "internal/date"; - interval = 1.0; + interval = 1; time = " %H:%M:%S"; time-alt = " %a, %d %b %Y"; format = "