diff options
Diffstat (limited to 'home-manager')
| -rw-r--r-- | home-manager/YATwm/default.nix | 13 | ||||
| -rw-r--r-- | home-manager/home.nix | 26 | ||||
| -rw-r--r-- | home-manager/i3/config | 2 | ||||
| -rw-r--r-- | home-manager/polybar/config.ini | 33 | ||||
| -rwxr-xr-x | home-manager/polybar/launch.sh | 4 |
5 files changed, 45 insertions, 33 deletions
diff --git a/home-manager/YATwm/default.nix b/home-manager/YATwm/default.nix index a7d650d..6c5e5f3 100644 --- a/home-manager/YATwm/default.nix +++ b/home-manager/YATwm/default.nix @@ -26,7 +26,7 @@ package = inputs.YATwm.packages.x86_64-linux.YATwm; useEmacsBinds = true; quitKey = "C-s-g"; - swapMods = true; + swapMods = false; keybinds = let left = "h"; right = "l"; @@ -51,8 +51,8 @@ "s-d" = "bashSpawn rofi -i -show drun -disable-history"; "s-D" = "bashSpawn prime-run rofi -i -show drun -disable-history"; "s-g" = "bashSpawn ~/bin/rofi-passmenu"; - "s-RET" = "spawn alacritty"; - "s-r k" = "spawn kitty"; + "s-RET" = "bashSpawn kitty"; + # "s-r k" = "spawn kitty"; "s-c" = "spawn firefox"; "s-S--" = "bashSpawn emacsclient -c"; "s-S" = "spawn flameshot gui"; @@ -60,6 +60,10 @@ "s-X" = "bashSpawn loginctl lock-session && systemctl suspend"; "s-Q" = "kill"; + # Sound + "s-[" = "spawn playerctl -p firefox play-pause"; + "s-]" = "spawn playerctl -p spotify play-pause"; + # Workspaces "s-1" = "changeWS 1"; "s-S-1" = "wToWS 1"; @@ -81,6 +85,7 @@ "s-S-9" = "wToWS 9"; "s-0" = "changeWS 10"; "s-S-0" = "wToWS 10"; + # Special workspaces "s-p s" = "changeWS 11"; "s-S-p s" = "wToWS 11"; @@ -99,7 +104,7 @@ {name = "S"; monitorPriorities = [1];} ]; startup = [ - {command = ".config/polybar/launch.sh"; once = false;} + {command = "~/.config/polybar/launch.sh"; once = false;} {command = "picom --legacy-backends -fD 3"; once = false;} {command = "xss-lock --transfer-sleep-lock -- i3lock -eti ~/Documents/lockscreen.png --nofork"; bash = false;} {command = "nitrogen --restore";} diff --git a/home-manager/home.nix b/home-manager/home.nix index 8c524aa..fe27af0 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -8,6 +8,7 @@ ./YATwm ./kitty inputs.spicetify-nix.homeManagerModules.default + inputs.nixcord.homeModules.nixcord #inputs.stylix.homeManagerModules.stylix ]; @@ -19,7 +20,7 @@ # The home.packages option allows you to install Nix packages into your # environment. - nixpkgs.config.allowUnfree = true; + # nixpkgs.config.allowUnfree = true; home.packages = with pkgs; [ feh pass @@ -33,7 +34,9 @@ discord # (discord.override { # withOpenASAR = true; + # withVencord = true; # }) + # vesktop mumble gimp bottom @@ -53,15 +56,6 @@ lunar-client libnotify xclip - (openttd-jgrpp.overrideAttrs (oldAttrs: rec { - version = "0.63.3"; - src = fetchFromGitHub { - owner = "JGRennison"; - repo = "OpenTTD-patches"; - rev = "jgrpp-${version}"; - hash = "sha256-853LbApHqQn+ucb7xjFDfohB0/T1h11o4voBgvgbpSI="; - }; - })) (python3.withPackages (ps: with ps; [ python-lsp-server ])) @@ -73,8 +67,11 @@ inputs.polymc.packages.${system}.default jre8 inputs.zen-browser.packages."${system}".default + piper + qbittorrent + adom ]; - + nix = { #package = pkgs.nix; settings.experimental-features = [ "nix-command" "flakes" ]; @@ -110,8 +107,14 @@ programs.firefox.enable = true; + # programs.nixcord = { + # enable = true; + # }; + + stylix.targets.spicetify.enable = false; stylix.targets.firefox.profileNames = [ "default"]; + # stylix.targets.nixcord.enable = true; programs.spicetify = let @@ -132,5 +135,6 @@ theme = spicePkgs.themes.nightlight; }; + xsession.windowManager.command = lib.mkForce "$@"; } diff --git a/home-manager/i3/config b/home-manager/i3/config index dafa928..acfd0d0 100644 --- a/home-manager/i3/config +++ b/home-manager/i3/config @@ -86,7 +86,7 @@ bindsym $mod+Shift+p exec --no-startup-id "workspaces.sh move" bindsym $mod+Control+$left workspace prev bindsym $mod+Control+Left workspace prev -set $i3lock-cmd i3lock -eti ~/Documents/lockscreen.png +#set $i3lock-cmd i3lock -eti ~/Documents/lockscreen.png bindsym $mod+Shift+s exec --no-startup-id flameshot gui diff --git a/home-manager/polybar/config.ini b/home-manager/polybar/config.ini index ada0268..b7cf83e 100644 --- a/home-manager/polybar/config.ini +++ b/home-manager/polybar/config.ini @@ -27,7 +27,7 @@ disabled = #515772 active = #eeffff inactive = #515772 -[bar/status] +[section/bar-defaults] width = 100% height = 19pt radius = 10 @@ -55,29 +55,34 @@ separator-foreground = ${colors.disabled} font-0 = Cousine Nerd Font;1 -modules-left = xworkspaces -modules-right = pipewire xkeyboard memory cpu battery date tray -; modules-center = xwindow - cursor-click = pointer cursor-scroll = ns-resize enable-ipc = true -; For center tray - also make sure to change the launch.sh -tray-position = ${env:TRAY:} - ; wm-restack = generic ; wm-restack = bspwm wm-restack = generic override-redirect = false +[bar/mainbar] +inherit = section/bar-defaults +modules-left = xworkspaces +modules-right = pipewire xkeyboard memory cpu battery date tray +modules-center = xwindow + +[bar/extrabar] +inherit = section/bar-defaults +modules-left = xworkspaces +modules-right = pipewire xkeyboard memory cpu battery date +modules-center = xwindow [module/xworkspaces] -pin-workspaces = true type = internal/xworkspaces +pin-workspaces = true + label-active = %name% label-active-foreground = ${colors.active} label-active-padding = 1 @@ -91,7 +96,7 @@ label-urgent-foreground = ${colors.inactive} label-urgent-background = ${colors.alert} label-urgent-padding = 1 -label-empty = +label-empty = label-empty-foreground = ${colors.inactive} label-empty-padding = 0 @@ -158,11 +163,9 @@ date-alt = %H:%M:%S %d-%m-%Y label = %date% label-foreground = ${colors.primary} -; Using polybar-git instead -; [module/tray] -; type = internal/tray -; format = ${env:TRAY:} -; tray-spacing = 5 +[module/tray] +type = internal/tray +tray-spacing = 5 [module/xwindow] type = internal/xwindow diff --git a/home-manager/polybar/launch.sh b/home-manager/polybar/launch.sh index 00514be..41d5f3d 100755 --- a/home-manager/polybar/launch.sh +++ b/home-manager/polybar/launch.sh @@ -11,9 +11,9 @@ echo "---" | tee -a /tmp/polybarstatus.log for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do if [ $(xrandr | grep $m | grep primary | wc -l) -eq 1 ]; then - MONITOR=$m TRAY="center" polybar status | tee -a /tmp/polybarstatus.log & disown + MONITOR=$m polybar mainbar | tee -a /tmp/mainpolybar.log & disown else - MONITOR=$m TRAY="" polybar status | tee -a /tmp/polybarstatus.log & disown + MONITOR=$m polybar extrabar | tee -a /tmp/extrapolybar.log & disown fi done |