diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index 3b9ba88..40e0c33 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -8,7 +8,7 @@ }: { imports = [ ./ewwbar.nix - ./mako.nix + # ./mako.nix ./swaylock.nix # TODO: figure out how to import this for this module _and_ for the sway module? ./linux-desktop.nix @@ -45,7 +45,7 @@ exec-once = [ "hyprpaper" - "mako" + # "mako" "swayosd-server" "eww daemon && eww open bar$EWW_BAR_MON" "firefox" diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix index 41d3778..70234e2 100644 --- a/modules/home-manager/sway.nix +++ b/modules/home-manager/sway.nix @@ -8,7 +8,7 @@ }: { imports = [ ./waybar.nix - ./mako.nix + # ./mako.nix ./swaylock.nix ./linux-desktop.nix ]; diff --git a/modules/home-manager/wezterm/config.lua b/modules/home-manager/wezterm/config.lua index 94b5a43..7767b57 100644 --- a/modules/home-manager/wezterm/config.lua +++ b/modules/home-manager/wezterm/config.lua @@ -1,11 +1,11 @@ -local wezterm = require'wezterm' +local wezterm = require 'wezterm' local config = {} if wezterm.config_builder then config = wezterm.config_builder() end -config.font = wezterm.font_with_fallback{ - { family = "IosevkaLyteTerm", weight = 'Medium', italic = false }, +config.font = wezterm.font_with_fallback { + { family = "IosevkaLyteTerm", weight = 'Medium', italic = false }, { family = 'Symbols Nerd Font Mono', weight = 'Regular', italic = false }, 'Noto Color Emoji', } @@ -31,7 +31,7 @@ local function tab_title(tab_info) end -- 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) return ' ' .. string.sub(title, 0, max_width - 2) .. ' ' end) @@ -48,57 +48,57 @@ config.keys = { { key = 'Insert', mods = 'SHIFT', - action = wezterm.action.PasteFrom'Clipboard' + action = wezterm.action.PasteFrom 'Clipboard' }, { key = 'v', mods = 'CTRL|SHIFT', - action = wezterm.action.PasteFrom'PrimarySelection' + action = wezterm.action.PasteFrom 'PrimarySelection' }, { key = 't', mods = 'CTRL|SHIFT', - action = wezterm.action.SpawnTab'CurrentPaneDomain' + action = wezterm.action.SpawnTab 'CurrentPaneDomain' }, { key = 'h', mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Left' + action = wezterm.action.ActivatePaneDirection 'Left' }, { key = 'l', mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Right' + action = wezterm.action.ActivatePaneDirection 'Right' }, { key = 'k', mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Up' + action = wezterm.action.ActivatePaneDirection 'Up' }, { key = 'j', mods = 'CTRL', - action = wezterm.action.ActivatePaneDirection'Down' + action = wezterm.action.ActivatePaneDirection 'Down' }, { key = 'j', mods = 'CTRL|SHIFT', - action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'} + action = wezterm.action.SplitVertical { domain = 'CurrentPaneDomain' } }, { key = 'l', mods = 'CTRL|SHIFT', - action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'} + action = wezterm.action.SplitHorizontal { domain = 'CurrentPaneDomain' } }, { key = 'k', mods = 'CTRL|SHIFT', - action = wezterm.action.SplitVertical{args={'top'},domain='CurrentPaneDomain'} + action = wezterm.action.SplitVertical { args = { 'top' }, domain = 'CurrentPaneDomain' } }, { key = 'h', mods = 'CTRL|SHIFT', - action = wezterm.action.SplitHorizontal{args={'right'},domain='CurrentPaneDomain'} + action = wezterm.action.SplitHorizontal { args = { 'right' }, domain = 'CurrentPaneDomain' } }, { key = 'p', @@ -113,15 +113,15 @@ config.keys = { { key = 'r', mods = 'CTRL|SHIFT|ALT', - action = wezterm.action.RotatePanes'Clockwise' + action = wezterm.action.RotatePanes 'Clockwise' }, } -- config.unix_domains = { - -- { - -- name = 'unix', - -- local_echo_threshold_ms = 10, - -- }, +-- { +-- name = 'unix', +-- local_echo_threshold_ms = 10, +-- }, -- } -- config.default_gui_startup_args = { 'connect', 'unix' } diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index eb7a77e..dd9b9ce 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -61,7 +61,7 @@ libinput libinput-gestures libnotify - mako + # mako # lutris # nil # nixpkgs-fmt diff --git a/nixos/dragon.nix b/nixos/dragon.nix index c8642fa..788f874 100644 --- a/nixos/dragon.nix +++ b/nixos/dragon.nix @@ -22,7 +22,7 @@ kde-plasma postgres wifi - hyprland + # hyprland printing # melee steam @@ -62,6 +62,8 @@ hyprland ]; + services.mako.enable = lib.mkForce false; # don't use mako when using plasma + # ssbm = { # slippi-launcher = { # 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.kernelModules = ["kvm-amd"]; - hardware.bluetooth.enable = true; + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + }; powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; networking = {