This commit is contained in:
2024-09-16 11:03:23 +01:00
parent 02c474d771
commit 7be7be7262
12 changed files with 629 additions and 331 deletions
+57 -43
View File
@@ -8,15 +8,11 @@
}:
{
imports = with inputs; [
# hypridle.homeManagerModules.default
# hyprlock.homeManagerModules.default
# hyprpaper.homeManagerModules.default
];
home.packages = with pkgs; [
hyprpicker
hyprlock
hypridle
hyprpaper
];
wayland.windowManager.hyprland = {
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
@@ -29,7 +25,7 @@
];
};
plugins = [
# inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
#inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
];
settings = {
monitor = [
@@ -40,7 +36,7 @@
exec-once = [
"wl-clipboard-history -t"
"wl-paste -p --watch wl-copy -p ''"
"swww init"
# "ags"
];
env = [
"WLR_NO_HARDWARE_CURSORS,1"
@@ -49,9 +45,10 @@
"XDG_CURRENT_DESKTOP,Hyprland"
"XDG_SESSION_TYPE,wayland"
"XDG_SESSION_DESKTOP,Hyprland"
"GTK_THEME,${config.gtk.theme.name}"
"QT_QPA_PLATFORM,xcb;Hyprland"
# "XCURSOR_THEME,${config.gtk.cursorTheme.name}"
# "XCURSOR_SIZE,24"
"XCURSOR_THEME,${config.gtk.cursorTheme.name}"
"XCURSOR_SIZE,24"
];
input = {
kb_layout = "us";
@@ -130,6 +127,7 @@
gestures = {
workspace_swipe = true;
workspace_swipe_forever = true;
};
windowrule = [
@@ -178,7 +176,7 @@
bind = [
# "$mainMod, grave, hyprexpo:expo, toggle" # can be: toggle, off/disable or on/enable
"$altMod, Return, exec, ghostty"
"$mainMod, Return, exec, ghostty" # for apps that yoink alt- binds
"$mainMod, Return, exec, GDK_BACKEND=x11 ghostty" # Until NixOS Fixes EGL Drivers
"$altMod SHIFT, Return, exec, alacritty"
"$mainMod SHIFT, D, exec, discord --enable-blink-features=MiddleClickAutoscroll"
"$mainMod SHIFT, E, exec, emacsclient -c -a 'emacs'"
@@ -352,7 +350,7 @@
};
background = [
{
path = "/home/liamm/pictures/desert.png";
path = "/home/liamm/pictures/.wallpapers/bloody_snow.jpg";
blur_passes = 2;
blur_size = 8;
}
@@ -417,39 +415,55 @@
};
};
services.hypridle = {
enable = true;
settings = {
general = {
lock_cmd = "${pkgs.procps}/bin/pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock"; # avoid starting multiple sessions
before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session"; # lock before suspend.
after_sleep_cmd = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; # to avoid having to hit key twice to turn on display
services = {
hyprpaper = {
enable = true;
settings = {
ipc = "on";
splash = false;
preload = [
"~/pictures/desert.png"
"~/pictures/.wallpapers/bloody_snow.jpg"
];
wallpaper = [
"eDP-1,~/pictures/.wallpapers/bloody_snow.jpg"
];
};
};
hypridle = {
enable = true;
settings = {
general = {
lock_cmd = "${pkgs.procps}/bin/pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock"; # avoid starting multiple sessions
before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session"; # lock before suspend.
after_sleep_cmd = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; # to avoid having to hit key twice to turn on display
};
listeners = [
{
timeout = 120;
on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -r"; # monitor backlight restor.
}
{
timeout = 120;
on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -sd rgb:kbd_backlight set 0"; # turn off keyboard backlight.
on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -rd rgb:kbd_backlight"; # turn on keyboard backlight.
}
{
timeout = 180;
on-timeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock screen when timeout has passed
}
{
timeout = 300;
on-timeout = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off"; # screen off when timeout has passed
on-resume = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; # screen on when activity is detected after timeout has fired.
}
{
timeout = 300;
on-timeout = "${pkgs.systemd}/bin/systemctl suspend"; # suspend pc
}
];
};
listeners = [
{
timeout = 120;
on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -r"; # monitor backlight restor.
}
{
timeout = 120;
on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -sd rgb:kbd_backlight set 0"; # turn off keyboard backlight.
on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -rd rgb:kbd_backlight"; # turn on keyboard backlight.
}
{
timeout = 180;
on-timeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock screen when timeout has passed
}
{
timeout = 300;
on-timeout = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off"; # screen off when timeout has passed
on-resume = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; # screen on when activity is detected after timeout has fired.
}
{
timeout = 300;
on-timeout = "${pkgs.systemd}/bin/systemctl suspend"; # suspend pc
}
];
};
};
}
+109
View File
@@ -0,0 +1,109 @@
const { query } = await Service.import("applications")
const WINDOW_NAME = "applauncher"
/** @param {import('resource:///com/github/Aylur/ags/service/applications.js').Application} app */
const AppItem = app => Widget.Button({
on_clicked: () => {
App.closeWindow(WINDOW_NAME)
app.launch()
},
attribute: { app },
child: Widget.Box({
children: [
Widget.Icon({
icon: app.icon_name || "",
size: 42,
}),
Widget.Label({
class_name: "title",
label: app.name,
xalign: 0,
vpack: "center",
truncate: "end",
}),
],
}),
})
const Applauncher = ({ width = 500, height = 500, spacing = 12 }) => {
// list of application buttons
let applications = query("").map(AppItem)
// container holding the buttons
const list = Widget.Box({
vertical: true,
children: applications,
spacing,
})
// repopulate the box, so the most frequent apps are on top of the list
function repopulate() {
applications = query("").map(AppItem)
list.children = applications
}
// search entry
const entry = Widget.Entry({
hexpand: true,
css: `margin-bottom: ${spacing}px;`,
// to launch the first item on Enter
on_accept: () => {
// make sure we only consider visible (searched for) applications
const results = applications.filter((item) => item.visible);
if (results[0]) {
App.toggleWindow(WINDOW_NAME)
results[0].attribute.app.launch()
}
},
// filter out the list
on_change: ({ text }) => applications.forEach(item => {
item.visible = item.attribute.app.match(text ?? "")
}),
})
return Widget.Box({
vertical: true,
css: `margin: ${spacing * 2}px;`,
children: [
entry,
// wrap the list in a scrollable
Widget.Scrollable({
hscroll: "never",
css: `min-width: ${width}px;`
+ `min-height: ${height}px;`,
child: list,
}),
],
setup: self => self.hook(App, (_, windowName, visible) => {
if (windowName !== WINDOW_NAME)
return
// when the applauncher shows up
if (visible) {
repopulate()
entry.text = ""
entry.grab_focus()
}
}),
})
}
// there needs to be only one instance
export function applauncher() {
return Widget.Window({
name: WINDOW_NAME,
setup: self => self.keybind("Escape", () => {
App.closeWindow(WINDOW_NAME)
}),
visible: false,
keymode: "exclusive",
child: Applauncher({
width: 500,
height: 500,
spacing: 12,
}),
})
}
+236
View File
@@ -0,0 +1,236 @@
const hyprland = await Service.import("hyprland")
const notifications = await Service.import("notifications")
const mpris = await Service.import("mpris")
const audio = await Service.import("audio")
import { applauncher } from "./applauncher.js"
const battery = await Service.import("battery")
const systemtray = await Service.import("systemtray")
const date = Variable("", {
poll: [1000, 'date "+%H:%M:%S %b %e."'],
})
// widgets can be only assigned as a child in one container
// so to make a reuseable widget, make it a function
// then you can simply instantiate one by calling it
function Workspaces() {
const activeId = hyprland.active.workspace.bind("id")
const workspaces = hyprland.bind("workspaces")
.as(ws => ws.map(({ id }) => Widget.Button({
on_clicked: () => hyprland.messageAsync(`dispatch workspace ${id}`),
child: Widget.Label(`${id}`),
class_name: activeId.as(i => `${i === id ? "focused" : ""}`),
})))
return Widget.Box({
class_name: "workspaces",
children: workspaces,
})
}
function ClientTitle() {
return Widget.Label({
class_name: "client-title",
label: hyprland.active.client.bind("title"),
})
}
function Clock() {
return Widget.Label({
class_name: "clock",
label: date.bind(),
})
}
// we don't need dunst or any other notification daemon
// because the Notifications module is a notification daemon itself
function Notification() {
const popups = notifications.bind("popups")
return Widget.Box({
class_name: "notification",
visible: popups.as(p => p.length > 0),
children: [
Widget.Icon({
icon: "preferences-system-notifications-symbolic",
}),
Widget.Label({
label: popups.as(p => p[0]?.summary || ""),
}),
],
})
}
function Media() {
const label = Utils.watch("", mpris, "player-changed", () => {
if (mpris.players[0]) {
const { track_artists, track_title } = mpris.players[0]
return `${track_artists.join(", ")} - ${track_title}`
} else {
return "Nothing is playing"
}
})
return Widget.Button({
class_name: "media",
on_primary_click: () => mpris.getPlayer("")?.playPause(),
on_scroll_up: () => mpris.getPlayer("")?.next(),
on_scroll_down: () => mpris.getPlayer("")?.previous(),
child: Widget.Label({ label }),
})
}
function Volume() {
const icons = {
101: "overamplified",
67: "high",
34: "medium",
1: "low",
0: "muted",
}
function getIcon() {
const icon = audio.speaker.is_muted ? 0 : [101, 67, 34, 1, 0].find(
threshold => threshold <= audio.speaker.volume * 100)
return `audio-volume-${icons[icon]}-symbolic`
}
const icon = Widget.Icon({
icon: Utils.watch(getIcon(), audio.speaker, getIcon),
})
const slider = Widget.Slider({
hexpand: true,
draw_value: false,
on_change: ({ value }) => audio.speaker.volume = value,
setup: self => self.hook(audio.speaker, () => {
self.value = audio.speaker.volume || 0
}),
})
const vol = ` ${audio.speaker.volume}%`;
const scroller = Widget.EventBox({
onScrollUp: () => { audio.speaker.volume = audio.speaker.volume + 10 },
onScrollDown: () => { audio.speaker.volume = audio.speaker.volume + 10 },
});
return Widget.Box({
class_name: "volume",
css: "min-width: 180px",
children: [
icon,
//scroller,
slider,
//Widget.Label({ label: vol }),
],
})
}
function BatteryLabel() {
const icon = battery.bind("percent").as(p =>
`battery-level-${Math.floor(p / 10) * 10}-symbolic`)
//let bat_lvl = battery.bind('percent').as(p => p > 0 ? p / 100 : 0);
let bat_lvl = battery.percent;
let str = ` ${bat_lvl}%`;
return Widget.Box({
class_name: "battery",
visible: battery.bind("available"),
children: [
Widget.Icon({ icon }),
Widget.Label({ label: str }),
],
})
}
function SysTray() {
const items = systemtray.bind("items")
.as(items => items.map(item => Widget.Button({
child: Widget.Icon({ icon: item.bind("icon") }),
on_primary_click: (_, event) => item.activate(event),
on_secondary_click: (_, event) => item.openMenu(event),
tooltip_markup: item.bind("tooltip_markup"),
})))
return Widget.Box({
children: items,
})
}
function Wofi() {
return Widget.Button({
on_clicked: () => applauncher(),
child: Widget.Label(""),
});
}
// layout of the bar
function Left() {
const applauncher_button = Widget.Button({
on_clicked: () => applauncher,
child: Widget.Label("Wofi"),
});
return Widget.Box({
spacing: 8,
children: [
Workspaces(),
ClientTitle(),
Wofi(),
],
})
}
function Center() {
return Widget.Box({
spacing: 8,
children: [
Media(),
Notification(),
],
})
}
function Right() {
return Widget.Box({
hpack: "end",
spacing: 8,
children: [
Volume(),
BatteryLabel(),
Clock(),
SysTray(),
],
})
}
function Bar(monitor = 0) {
return Widget.Window({
name: `bar-${monitor}`, // name has to be unique
class_name: "bar",
monitor,
anchor: ["top", "left", "right"],
exclusivity: "exclusive",
child: Widget.CenterBox({
start_widget: Left(),
center_widget: Center(),
end_widget: Right(),
}),
})
}
App.config({
style: "./style.css",
windows: [
Bar(0),
],
})
export { }
+41
View File
@@ -0,0 +1,41 @@
window.bar {
background-color: @theme_bg_color;
color: @theme_fg_color;
backdrop-filter: blur(10px);
}
button {
min-width: 0;
padding-top: 0;
padding-bottom: 0;
background-color: transparent;
}
button:active {
background-color: @theme_selected_bg_color;
}
button:hover {
border-bottom: 3px solid @theme_fg_color;
}
label {
font-weight: bold;
}
.workspaces button.focused {
border-bottom: 3px solid @theme_selected_bg_color;
}
.client-title {
color: @theme_selected_bg_color;
}
.notification {
color: yellow;
}
levelbar block,
highlight {
min-height: 10px;
}
+3 -1
View File
@@ -5,7 +5,7 @@
enable = true;
settings = {
logo = {
source = "~/pictures/smol-penguin.png";
source = "~/pictures/lil-penguin.png";
type = "kitty-direct";
width = 18;
height = 9;
@@ -47,6 +47,8 @@
"vulkan"
"disk"
"battery"
"break"
"colors"
];
};
};
+4 -31
View File
@@ -31,7 +31,6 @@
- [[#shells-and-terminals][SHELLS AND TERMINALS]]
- [[#eshell][Eshell]]
- [[#vterm][Vterm]]
- [[#vterm-toggle][Vterm-Toggle]]
- [[#sudo-edit][SUDO EDIT]]
- [[#theme][THEME]]
- [[#transparency][TRANSPARENCY]]
@@ -188,7 +187,6 @@
(lm/leader-keys
"t" '(:ignore t :wk "Toggle")
"t l" '(display-line-numbers-mode :wk "Toggle line numbers")
"t v" '(vterm-toggle :wk "Toggle Vterm")
"t i" '(org-toggle-inline-images :wk "Toggle inline images")
"t t" '(visual-line-mode :wk "Toggle truncated lines"))
@@ -224,6 +222,10 @@
"w J" '(evil-window-move-very-bottom :wk "Move split to bottom")
"w K" '(evil-window-move-very-top :wk "Move split to top")
"w L" '(evil-window-move-far-right :wk "Move split to right")
"w >" '(evil-window-increase-width :wk "Increase window width")
"w ." '(evil-window-increase-width :wk "Increase window width")
"w <" '(evil-window-decrease-width :wk "Increase window width")
"w ," '(evil-window-decrease-width :wk "Increase window width")
"w c" '(evil-window-delete :wk "Close window")
"w o" '(delete-other-windows :wk "Delete other windows")
"w =" '(balance-windows :wk "Balance windows")
@@ -295,15 +297,11 @@
(setq dashboard-set-file-icons t)
(setq dashboard-banner-logo-title "Welcome to Emacs!")
(setq dashboard-startup-banner 'logo) ;; default logo
;; (setq dashboard-startup-banner "~/pictures/vsmol-penguin.png")
(setq dashboard-center-content t)
(setq dashboard-items '((recents . 5)
(agenda . 5)
(bookmarks . 3)
;; (registers . 3)
(projects . 3)))
;; (dashboard-modify-heading-icons '((recents . "file-text")
;; (bookmarks . "book")))
:config
(dashboard-setup-startup-hook))
@@ -601,31 +599,6 @@ Vterm is a terminal emulator within Emacs. The 'shell-file-name' setting sets t
vterm-max-scrollback 5000))
#+end_src
** Vterm-Toggle
Vterm-Toggle toggles between vterm buffer and whatever you're editing
#+begin_src emacs-lisp
(use-package vterm-toggle
:after vterm
:config
(setq vterm-toggle-fullscreen-p nil)
(setq vterm-toggle-scope 'project)
(add-to-list 'display-buffer-alist
'((lambda (buffer-or-name _)
(let ((buffer (get-buffer buffer-or-name)))
(with-current-buffer buffer
(or (equal major-mode 'vterm-mode)
(string-prefix-p vterm-buffer-name (buffer-name buffer))))))
(display-buffer-reuse-window display-buffer-at-bottom)
;;(display-buffer-reuse-window display-buffer-in-direction)
;;display-buffer-in-direction/direction/dedicated is added in emacs27
;;(direction . bottom)
;;(dedicated . t) ;dedicated is supported in emacs27
(reusable-frames . visible)
(window-height . 0.3))))
#+end_src
* SUDO EDIT
Enable editing of privileged files
+1 -2
View File
@@ -12,7 +12,6 @@ keybind = ctrl+shift+n=new_window
# window stuff
background-opacity=0.9
#background-opacity=1
unfocused-split-opacity = 0.9
confirm-close-surface = false
window-theme = dark
@@ -22,7 +21,7 @@ window-decoration = false
gtk-wide-tabs = true
# macos specific
macos-non-native-fullscreen = true
#macos-non-native-fullscreen = true
# font
font-size = 12
+5 -29
View File
@@ -13,7 +13,7 @@
"spacing": 0,
"gtk-layer-shell": true,
"modules-left": [
//"custom/notification",
"custom/notification",
"custom/kernel",
// "custom/updates",
"clock",
@@ -49,44 +49,27 @@
"interval": "once"
},
// "custom/updates": {
// // maybe add check to not attempt run when offline
// "exec": "( checkupdates; paru -Qua ) | wc -l",
// "interval": 7200,
// "format": "<big>󰏖</big>\n{}",
// "on-click": "( checkupdates; paru -Qua ) | wc -l",
// },
"clock": {
"interval": 1,
"format": "<big> </big> \n{:%d/%m\n<big> 󰥔</big>\n%R}",
"format": "<big> </big>\n{:%d/%m\n<big> 󰥔 </big>\n %R}",
"tooltip": true,
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
"tooltip-format": "<big>{:%Y %B}</big> <tt><small>{calendar}</small></tt>"
},
"disk": {
"interval": 30,
"path": "/home",
"format": "<big> </big>\n {path}:\n {percentage_used}%",
"format": "<big> </big>\n {path}\n {percentage_used}%",
"alt-format": " {path}:{used}\/{total}",
"tooltip-format": " {path}:{used}\/{total}",
},
"keyboard-state": {
"capslock": true,
"format": "CAPS\n {icon}",
"format": "CAPS\n {icon}",
"format-icons": {"locked": "", "unlocked": ""}
},
//"keyboard-state#Num": {
// "numlock": true,
// "format": "#lk: {icon}",
// "format-icons": {"locked": "", "unlocked": ""}
//},
"modules-center": [
//"hyprland/workspaces",
"wlr/taskbar"
//"river/tags"
//"hyprland/submap",
//"hyprland/window"
],
"river/tags": {
"on-click": "activate",
@@ -143,22 +126,15 @@
},
"hyprland/window": {
"format": "{icon}",
//"format": " <span font_desc='Iosevka Raven 12'>{:.40}</span> ",
"separate-outputs": false
},
"modules-right": [
"tray",
"custom/wofi",
// "cpu",
// "memory",
// "backlight",
"pulseaudio#microphone",
"pulseaudio#audio",
//"bluetooth",
"backlight",
"network",
//"network#wlan0",
//"network#enp46s0",
"battery"
],
"tray": {