diff --git a/hosts/default/home.nix b/hosts/default/home.nix index fa27e58..da7d9b6 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -82,6 +82,7 @@ xclip xdg-user-dirs zip + zoom-us ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index af1adbb..17fc7da 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -13,7 +13,10 @@ hyprlock hypridle hyprpaper + hyprland-protocols + # hyprpolkit -- not in nixpkgs yet ]; + wayland.windowManager.hyprland = { package = inputs.hyprland.packages.${pkgs.system}.hyprland; enable = true; @@ -25,7 +28,7 @@ ]; }; plugins = [ - #inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo + inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo ]; settings = { monitor = [ @@ -74,8 +77,8 @@ gaps_in = 2; gaps_out = 4; border_size = 2; - "col.active_border" = "rgba(00ffb2ff) rgba(00ff66ff) 90deg"; - "col.inactive_border" = "rgba(595959ff)"; + "col.active_border" = "rgba(881798FF)"; + "col.inactive_border" = "rgba(471520FF)"; layout = "dwindle"; }; @@ -174,7 +177,8 @@ "$lock" = "hyprlock"; bind = [ - # "$mainMod, grave, hyprexpo:expo, toggle" # can be: toggle, off/disable or on/enable + # Program binds + "$mainMod, grave, hyprexpo:expo, toggle" # can be: toggle, off/disable or on/enable "$altMod, Return, exec, ghostty" "$mainMod, Return, exec, GDK_BACKEND=x11 ghostty" # Until NixOS Fixes EGL Drivers "$altMod SHIFT, Return, exec, alacritty" @@ -184,7 +188,14 @@ "$mainMod, SPACE, exec, pkill wofi || wofi" "$mainMod, E, exec, nautilus" "$mainMod, S, exec, spotify" - "$mainMod, P, pseudo," # dwindle + "$mainMod, P, exec, hyprpicker -a -f hex" + + # Screenshot + ", Print, exec, $screenshotarea" + "SHIFT, Print, exec, grimblast --notify --cursor copy output" + + # WM management binds + "$mainMod SHIFT, P, pseudo," # dwindle "$mainMod, C, killactive," "$mainMod control, Q, exec, $lock" "$mainMod, F4, exit," @@ -192,9 +203,6 @@ "$mainMod SHIFT, S, togglesplit," # dwindle "$mainMod, F, fullscreen," - # Screenshot - ", Print, exec, $screenshotarea" - "SHIFT, Print, exec, grimblast --notify --cursor copy output" "$mainMod, H, movefocus, l" "$mainMod, L, movefocus, r" @@ -327,17 +335,18 @@ bind=, escape,submap,reset submap = reset + + plugin { + hyprexpo { + columns = 3 + gapSize = 4 + workspace_method = "center current" + enable_gesture = true + gesture_distance = 300 + gesture_negative = true + } + } ''; -# plugin { -# hyprexpo { -# columns = 3 -# gapSize = 4 -# workspace_method = "center current" -# enable_gesture = true -# gesture_distance = 300 -# gesture_negative = true -# } -# } }; lib.inputMethod.fcitx5.waylandFrontend = true; programs.hyprlock = { @@ -422,11 +431,10 @@ ipc = "on"; splash = false; preload = [ - "~/pictures/desert.png" - "~/pictures/.wallpapers/bloody_snow.jpg" + "~/pictures/.wallpapers/skyline-view.png" ]; wallpaper = [ - "eDP-1,~/pictures/.wallpapers/bloody_snow.jpg" + "eDP-1,~/pictures/.wallpapers/skyline-view.png" ]; }; }; diff --git a/modules/home-manager/fastfetch.nix b/modules/home-manager/fastfetch.nix index 086d088..2d302bd 100644 --- a/modules/home-manager/fastfetch.nix +++ b/modules/home-manager/fastfetch.nix @@ -10,6 +10,10 @@ # type = "kitty"; width = 18; height = 9; + color = { + "1" = "white"; + "2" = "magenta"; + }; padding = { top = 2; left = 1; @@ -18,12 +22,16 @@ }; display = { separator = " -> "; + color = { + keys = "magenta"; + }; }; modules = [ "title" { type = "custom"; format = "────────── Env ──────────"; + color = "magenta"; } { type = "os"; diff --git a/modules/old_configs/ghostty/config b/modules/old_configs/ghostty/config index 22409e6..a15c3a7 100644 --- a/modules/old_configs/ghostty/config +++ b/modules/old_configs/ghostty/config @@ -11,8 +11,7 @@ keybind = ctrl+shift+tab=previous_tab keybind = ctrl+shift+n=new_window # window stuff -background-opacity=0.9 -unfocused-split-opacity = 0.9 +background-opacity=0.8 confirm-close-surface = false window-theme = dark window-decoration = false @@ -24,37 +23,39 @@ gtk-wide-tabs = true #macos-non-native-fullscreen = true # font -font-size = 12 +font-size = 14 # cursor and mouse cursor-style = block cursor-color = #ffffff mouse-hide-while-typing = true +theme = Bright Lights + # Colors can be changed by setting the 16 colors of `palette`, which each color # being defined as regular and bold. # # black -palette = 0=#0c0c0c -palette = 8=#767676 -# red -palette = 1=#c50f1f -palette = 9=#e74856 -# green -palette = 2=#13a10e -palette = 10=#16c60c -# yellow -palette = 3=#c19c00 -palette = 11=#f9f1a5 -# blue -palette = 4=#0037da -palette = 12=#3b78ff -# purple -palette = 5=#881798 -palette = 13=#b4009e -# aqua -palette = 6=#3a96dd -palette = 14=#61d6d6 -# white -palette = 7=#cccccc -palette = 15=#f2f2f2 +# palette = 0=#0c0c0c +# palette = 8=#767676 +# # red +# palette = 1=#c50f1f +# palette = 9=#e74856 +# # green +# palette = 2=#13a10e +# palette = 10=#16c60c +# # yellow +# palette = 3=#c19c00 +# palette = 11=#f9f1a5 +# # blue +# palette = 4=#0037da +# palette = 12=#3b78ff +# # purple +# palette = 5=#881798 +# palette = 13=#b4009e +# # aqua +# palette = 6=#3a96dd +# palette = 14=#61d6d6 +# # white +# palette = 7=#cccccc +# palette = 15=#f2f2f2 diff --git a/modules/old_configs/nvim/after/plugin/lsp.lua b/modules/old_configs/nvim/after/plugin/lsp.lua index 9493643..80222af 100644 --- a/modules/old_configs/nvim/after/plugin/lsp.lua +++ b/modules/old_configs/nvim/after/plugin/lsp.lua @@ -93,7 +93,9 @@ require('mason-lspconfig').setup({ }, }) end, - zls = lsp_zero.noop, + zls = function() + lspconfig.zls.setup({}) + end, lua_ls = function() lspconfig.lua_ls.setup({ on_init = function(client) diff --git a/modules/old_configs/nvim/lua/liamm/remap.lua b/modules/old_configs/nvim/lua/liamm/remap.lua index afb51bc..e563e07 100644 --- a/modules/old_configs/nvim/lua/liamm/remap.lua +++ b/modules/old_configs/nvim/lua/liamm/remap.lua @@ -28,40 +28,40 @@ vim.keymap.set("n", "bg", "") -- `build.sh` script binds -- non-interactive binds -vim.keymap.set("n", "bb" , "./build.sh ") -vim.keymap.set("n", "br" , "./build.sh run ") -vim.keymap.set("n", "bRb" , "./build.sh release ") -vim.keymap.set("n", "bRr" , "./build.sh release run ") -vim.keymap.set("n", "bRr" , "./build.sh release run ") +vim.keymap.set("n", "bb" , ":!./build.sh ") +vim.keymap.set("n", "br" , ":!./build.sh run ") +vim.keymap.set("n", "bRb" , ":!./build.sh release ") +vim.keymap.set("n", "bRr" , ":!./build.sh release run ") +vim.keymap.set("n", "bRr" , ":!./build.sh release run ") -- interactive binds -vim.keymap.set("n", "bo" , "./build.sh ") -- allow for adding extra flags/options -vim.keymap.set("n", "bor" , "./build.sh run") -- allow for adding extra flags/options -vim.keymap.set("n", "bRo" , "./build.sh release ") -vim.keymap.set("n", "bRor", "./build.sh release run ") +vim.keymap.set("n", "bo" , ":!./build.sh ") -- allow for adding extra flags/options +vim.keymap.set("n", "bor" , ":!./build.sh run") -- allow for adding extra flags/options +vim.keymap.set("n", "bRo" , ":!./build.sh release ") +vim.keymap.set("n", "bRor", ":!./build.sh release run ") -- `build.zig` script binds -- non-interactive binds -vim.keymap.set("n", "zbb" , "zig build ") -vim.keymap.set("n", "zbr" , "zig build run ") -vim.keymap.set("n", "zbt" , "zig build test ") -vim.keymap.set("n", "zbR" , "zig build -Doptimize=ReleaseSafe ") -vim.keymap.set("n", "zbRs" , "zig build -Doptimize=ReleaseSmall ") -vim.keymap.set("n", "zbRf" , "zig build -Doptimize=ReleaseFast ") -vim.keymap.set("n", "zbRr" , "zig build run -Doptimize=ReleaseSafe ") -vim.keymap.set("n", "zbRsr", "zig build run -Doptimize=ReleaseSmall ") -vim.keymap.set("n", "zbRfr", "zig build run -Doptimize=ReleaseFast ") +vim.keymap.set("n", "zbb" , ":!zig build ") +vim.keymap.set("n", "zbr" , ":!zig build run ") +vim.keymap.set("n", "zbt" , ":!zig build test ") +vim.keymap.set("n", "zbR" , ":!zig build -Doptimize=ReleaseSafe ") +vim.keymap.set("n", "zbRs" , ":!zig build -Doptimize=ReleaseSmall ") +vim.keymap.set("n", "zbRf" , ":!zig build -Doptimize=ReleaseFast ") +vim.keymap.set("n", "zbRr" , ":!zig build run -Doptimize=ReleaseSafe ") +vim.keymap.set("n", "zbRsr", ":!zig build run -Doptimize=ReleaseSmall ") +vim.keymap.set("n", "zbRfr", ":!zig build run -Doptimize=ReleaseFast ") -- interactive binds -vim.keymap.set("n", "zbob" , "zig build ") -vim.keymap.set("n", "zbor" , "zig build run ") -vim.keymap.set("n", "zbot" , "zig build test ") -vim.keymap.set("n", "zboR" , "zig build -Doptimize=ReleaseSafe ") -vim.keymap.set("n", "zboRs" , "zig build -Doptimize=ReleaseSmall ") -vim.keymap.set("n", "zboRf" , "zig build -Doptimize=ReleaseFast ") -vim.keymap.set("n", "zboRr" , "zig build run -Doptimize=ReleaseSafe ") -vim.keymap.set("n", "zboRsr", "zig build run -Doptimize=ReleaseSmall ") -vim.keymap.set("n", "zboRfr", "zig build run -Doptimize=ReleaseFast ") +vim.keymap.set("n", "zbob" , ":!zig build ") +vim.keymap.set("n", "zbor" , ":!zig build run ") +vim.keymap.set("n", "zbot" , ":!zig build test ") +vim.keymap.set("n", "zboR" , ":!zig build -Doptimize=ReleaseSafe ") +vim.keymap.set("n", "zboRs" , ":!zig build -Doptimize=ReleaseSmall ") +vim.keymap.set("n", "zboRf" , ":!zig build -Doptimize=ReleaseFast ") +vim.keymap.set("n", "zboRr" , ":!zig build run -Doptimize=ReleaseSafe ") +vim.keymap.set("n", "zboRsr", ":!zig build run -Doptimize=ReleaseSmall ") +vim.keymap.set("n", "zboRfr", ":!zig build run -Doptimize=ReleaseFast ") -- emacs-inspired binds diff --git a/modules/old_configs/waybar/style.css b/modules/old_configs/waybar/style.css index e187d67..959730a 100644 --- a/modules/old_configs/waybar/style.css +++ b/modules/old_configs/waybar/style.css @@ -3,11 +3,12 @@ @define-color text #BECBCB; @define-color lightgray #686868; @define-color darkgray #353535; -@define-color red #F38BA8; +@define-color red #C50F1F; @define-color blue #00FFB2; @define-color lightgreen #a6e3a1; @define-color magenta #f5c2e7; @define-color archbtw #1793d1; +@define-color purple #881798; @define-color black-transparent-1 rgba(0, 0, 0, 0.1); @define-color black-transparent-2 rgba(0, 0, 0, 0.2); @@ -40,7 +41,7 @@ window#waybar { background-color: @black-transparent-8; color: @text; border-radius: 7px; - border: 2px solid @blue; + border: 2px solid @purple; /* border: 1px solid rgba(0, 0, 0, 0.0); */ } diff --git a/modules/old_configs/wofi/style.css b/modules/old_configs/wofi/style.css index e3fd244..3749ec1 100644 --- a/modules/old_configs/wofi/style.css +++ b/modules/old_configs/wofi/style.css @@ -1,3 +1,5 @@ +@define-color purple #881798; + * { transition: 0.2s; color: #aaaaaa; @@ -9,7 +11,8 @@ /* background-position: 50% 30%;*/ background-size: auto 200%; border: 2.0px solid; - border-color: #00ffb2; + border-color: @purple; + border-color: @darkpurple; border-radius: 10px; }