No mako just plasma notifications

This commit is contained in:
Daniel Flanagan 2024-04-05 11:39:35 -05:00
parent 3607c2ffb6
commit fc54c447a8
5 changed files with 31 additions and 26 deletions

View file

@ -8,7 +8,7 @@
}: { }: {
imports = [ imports = [
./ewwbar.nix ./ewwbar.nix
./mako.nix # ./mako.nix
./swaylock.nix ./swaylock.nix
# TODO: figure out how to import this for this module _and_ for the sway module? # TODO: figure out how to import this for this module _and_ for the sway module?
./linux-desktop.nix ./linux-desktop.nix
@ -45,7 +45,7 @@
exec-once = [ exec-once = [
"hyprpaper" "hyprpaper"
"mako" # "mako"
"swayosd-server" "swayosd-server"
"eww daemon && eww open bar$EWW_BAR_MON" "eww daemon && eww open bar$EWW_BAR_MON"
"firefox" "firefox"

View file

@ -8,7 +8,7 @@
}: { }: {
imports = [ imports = [
./waybar.nix ./waybar.nix
./mako.nix # ./mako.nix
./swaylock.nix ./swaylock.nix
./linux-desktop.nix ./linux-desktop.nix
]; ];

View file

@ -1,10 +1,10 @@
local wezterm = require'wezterm' local wezterm = require 'wezterm'
local config = {} local config = {}
if wezterm.config_builder then if wezterm.config_builder then
config = wezterm.config_builder() config = wezterm.config_builder()
end end
config.font = wezterm.font_with_fallback{ config.font = wezterm.font_with_fallback {
{ family = "IosevkaLyteTerm", weight = 'Medium', italic = false }, { family = "IosevkaLyteTerm", weight = 'Medium', italic = false },
{ family = 'Symbols Nerd Font Mono', weight = 'Regular', italic = false }, { family = 'Symbols Nerd Font Mono', weight = 'Regular', italic = false },
'Noto Color Emoji', 'Noto Color Emoji',
@ -31,7 +31,7 @@ local function tab_title(tab_info)
end end
-- wezterm.on('format-tab-title', function (tab, tabs, panes, config, hover, max_width) -- wezterm.on('format-tab-title', function (tab, tabs, panes, config, hover, max_width)
wezterm.on('format-tab-title', function (tab, _, _, _, _, max_width) wezterm.on('format-tab-title', function(tab, _, _, _, _, max_width)
local title = tab_title(tab) local title = tab_title(tab)
return ' ' .. string.sub(title, 0, max_width - 2) .. ' ' return ' ' .. string.sub(title, 0, max_width - 2) .. ' '
end) end)
@ -48,57 +48,57 @@ config.keys = {
{ {
key = 'Insert', key = 'Insert',
mods = 'SHIFT', mods = 'SHIFT',
action = wezterm.action.PasteFrom'Clipboard' action = wezterm.action.PasteFrom 'Clipboard'
}, },
{ {
key = 'v', key = 'v',
mods = 'CTRL|SHIFT', mods = 'CTRL|SHIFT',
action = wezterm.action.PasteFrom'PrimarySelection' action = wezterm.action.PasteFrom 'PrimarySelection'
}, },
{ {
key = 't', key = 't',
mods = 'CTRL|SHIFT', mods = 'CTRL|SHIFT',
action = wezterm.action.SpawnTab'CurrentPaneDomain' action = wezterm.action.SpawnTab 'CurrentPaneDomain'
}, },
{ {
key = 'h', key = 'h',
mods = 'CTRL', mods = 'CTRL',
action = wezterm.action.ActivatePaneDirection'Left' action = wezterm.action.ActivatePaneDirection 'Left'
}, },
{ {
key = 'l', key = 'l',
mods = 'CTRL', mods = 'CTRL',
action = wezterm.action.ActivatePaneDirection'Right' action = wezterm.action.ActivatePaneDirection 'Right'
}, },
{ {
key = 'k', key = 'k',
mods = 'CTRL', mods = 'CTRL',
action = wezterm.action.ActivatePaneDirection'Up' action = wezterm.action.ActivatePaneDirection 'Up'
}, },
{ {
key = 'j', key = 'j',
mods = 'CTRL', mods = 'CTRL',
action = wezterm.action.ActivatePaneDirection'Down' action = wezterm.action.ActivatePaneDirection 'Down'
}, },
{ {
key = 'j', key = 'j',
mods = 'CTRL|SHIFT', mods = 'CTRL|SHIFT',
action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} action = wezterm.action.SplitVertical { domain = 'CurrentPaneDomain' }
}, },
{ {
key = 'l', key = 'l',
mods = 'CTRL|SHIFT', mods = 'CTRL|SHIFT',
action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'} action = wezterm.action.SplitHorizontal { domain = 'CurrentPaneDomain' }
}, },
{ {
key = 'k', key = 'k',
mods = 'CTRL|SHIFT', mods = 'CTRL|SHIFT',
action = wezterm.action.SplitVertical{args={'top'},domain='CurrentPaneDomain'} action = wezterm.action.SplitVertical { args = { 'top' }, domain = 'CurrentPaneDomain' }
}, },
{ {
key = 'h', key = 'h',
mods = 'CTRL|SHIFT', mods = 'CTRL|SHIFT',
action = wezterm.action.SplitHorizontal{args={'right'},domain='CurrentPaneDomain'} action = wezterm.action.SplitHorizontal { args = { 'right' }, domain = 'CurrentPaneDomain' }
}, },
{ {
key = 'p', key = 'p',
@ -113,15 +113,15 @@ config.keys = {
{ {
key = 'r', key = 'r',
mods = 'CTRL|SHIFT|ALT', mods = 'CTRL|SHIFT|ALT',
action = wezterm.action.RotatePanes'Clockwise' action = wezterm.action.RotatePanes 'Clockwise'
}, },
} }
-- config.unix_domains = { -- config.unix_domains = {
-- { -- {
-- name = 'unix', -- name = 'unix',
-- local_echo_threshold_ms = 10, -- local_echo_threshold_ms = 10,
-- }, -- },
-- } -- }
-- config.default_gui_startup_args = { 'connect', 'unix' } -- config.default_gui_startup_args = { 'connect', 'unix' }

View file

@ -61,7 +61,7 @@
libinput libinput
libinput-gestures libinput-gestures
libnotify libnotify
mako # mako
# lutris # lutris
# nil # nil
# nixpkgs-fmt # nixpkgs-fmt

View file

@ -22,7 +22,7 @@
kde-plasma kde-plasma
postgres postgres
wifi wifi
hyprland # hyprland
printing printing
# melee # melee
steam steam
@ -62,6 +62,8 @@
hyprland hyprland
]; ];
services.mako.enable = lib.mkForce false; # don't use mako when using plasma
# ssbm = { # ssbm = {
# slippi-launcher = { # slippi-launcher = {
# isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso"; # isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso";
@ -137,7 +139,10 @@
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "ahci"]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "ahci"];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = ["kvm-amd"];
hardware.bluetooth.enable = true; hardware.bluetooth = {
enable = true;
powerOnBoot = true;
};
powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
networking = { networking = {