diff --git a/home.nix b/home.nix index 1c9681f..222cbc3 100644 --- a/home.nix +++ b/home.nix @@ -47,6 +47,7 @@ neofetch telegram-desktop git-annex + dmenu python3 eza bat @@ -183,8 +184,8 @@ }; keybindings = let - modifier = config.wayland.windowManager.sway.config.modifier; - menu = config.wayland.windowManager.sway.config.menu; + modifier = config.xsession.windowManager.i3.config.modifier; + menu = config.xsession.windowManager.i3.config.menu; in lib.mkOptionDefault { "${modifier}+space" = "exec ${menu}"; "${modifier}+Control+Space" = "focus mode_toggle"; @@ -192,10 +193,10 @@ "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%"; "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle"; "XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle"; - "XF86Launch1" = "exec ~/scripts/sunset.sh"; - "${modifier}+Control+p" = "exec swaylock -f -c ef5ffc"; + # "XF86Launch1" = "exec ~/scripts/sunset.sh"; + # "${modifier}+Control+p" = "exec swaylock -f -c ef5ffc"; }; - menu = "wofi -G | xargs swaymsg exec --"; + menu = "dmenu_run"; modifier = "Mod4"; output = { "*" = { @@ -216,6 +217,85 @@ include ~/.config/sway/device-conf ''; # Let Home Manager install and manage itself. + xsession.windowManager.i3 = { + enable = true; + package = pkgs.i3-rounded; + config = { + bars = [{ + colors = { + activeWorkspace = { + background = "#a15ffc"; + border = "#a15ffc"; + text = "#333333"; + }; + background = "#ef5ffc"; + inactiveWorkspace = { + background = "#ef5ffc"; + border = "#a15ffc"; + text = "#333333"; + }; +# seperator = "#a15fffc"; + statusline = "#333333"; + }; + fonts = { + names = [ "Ubuntu Mono" ]; + size = 13.0; + }; + mode = "dock"; + position = "top"; + }]; + colors.focused = { + border = "#ef5ffc"; + background = "#ef5ffc"; + text = "#333333"; + indicator = "#2e9ef4"; + childBorder = "#ef5ffc"; + }; + defaultWorkspace = "1"; + floating = { + criteria = [ + { + class = "org.keepassxc.KeePassXC"; + } + ]; + }; + gaps = { + inner = 8; + smartBorders = "on"; + smartGaps = true; + }; + keybindings = + let + modifier = config.wayland.windowManager.sway.config.modifier; + menu = config.wayland.windowManager.sway.config.menu; + in lib.mkOptionDefault { + "${modifier}+space" = "exec ${menu}"; + "${modifier}+Control+Space" = "focus mode_toggle"; + "XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%"; + "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%"; + "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle"; + "XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle"; + "XF86Launch1" = "exec ~/scripts/sunset.sh"; + "${modifier}+Control+p" = "exec swaylock -f -c ef5ffc"; + }; + modifier = "Mod4"; + window.titlebar = false; + terminal = "alacritty"; + window.border = 2; + }; + extraConfig = '' + include ~/.config/sway/device-conf + ''; + }; + + + + + + + + + programs.home-manager.enable = true; programs.fish.enable = true; home.shellAliases = {