liam/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates

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