diff --git a/hosts/home/home_common.nix b/hosts/home/home_common.nix index bf31df3..3f3e0b8 100644 --- a/hosts/home/home_common.nix +++ b/hosts/home/home_common.nix @@ -13,6 +13,7 @@ userName = "k"; userEmail = "markers711@gmail.com"; }; + tmux = {enable = true;}; starship.enable = true; zsh = { enable = true; diff --git a/hosts/home/sway.nix b/hosts/home/sway.nix new file mode 100644 index 0000000..8846bcd --- /dev/null +++ b/hosts/home/sway.nix @@ -0,0 +1,45 @@ +{ config, pkgs, inputs, ... }: + +{ + imports = [./waybar.nix]; + + wayland.windowManager.sway = { + enable = true; + config = { + modifier = "Mod4"; + floating.border = 0; + window.border = 1; + window.titlebar = false; + terminal = "${pkgs.foot}/bin/foot"; + menu = "${pkgs.rofi}/bin/rofi -show drun -modi drun"; + bars = [{ "command" = "${pkgs.waybar}/bin/waybar"; }]; + gaps = { + inner = 10; + outer = 5; + }; + }; + }; + + home.sessionVariables = { + MOZ_ENABLE_WAYLAND = "1"; + MOZ_USE_XINPUT2 = "1"; + XDG_SESSION_TYPE = "wayland"; + SDL_VIDEODRIVER = "wayland"; + QT_QPA_PLATFORM = "wayland"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + _JAVA_AWT_WM_NONREPARENTING = 1; + }; + services = { + mako = { enable = true; }; + swayidle = { enable = true; }; + }; + + home.packages = with pkgs; [ rofi alacritty waybar swaylock ]; + programs = { + rofi = { enable = true; }; + mako = { enable = true; }; + alacritty = {enable = true; }; + foot = {enable = true; }; + }; +} + diff --git a/hosts/home/waybar.nix b/hosts/home/waybar.nix new file mode 100644 index 0000000..a92a5ff --- /dev/null +++ b/hosts/home/waybar.nix @@ -0,0 +1,78 @@ +{ config, pkgs, ... }: +{ + programs.waybar = { + enable = true; + systemd.enable = true; + settings = { + mainBar = { + layer = "bottom"; + position = "bottom"; + output = [ + "eDP-1" + ]; + + modules-left = ["sway/workspaces" "sway/mode"]; + modules-center = ["clock"]; + modules-right = ["pulseaudio" "network" "battery"]; + + cpu = { + interval = 15; + format = " {}%"; + max-length = 15; + }; + + memory = { + interval = 30; + format = " {}%"; + max-length = 15; + }; + + "pulseaudio" = { + format = "{volume}% {icon}"; + format-bluetooth = "{volume}% {icon}"; + format-muted = ""; + format-icons = { + headphone = ""; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = ["" ""]; + }; + scroll-step = 1; + on-click = "pavucontrol"; + }; + + backlight = { + tooltip = false; + format = " {}%"; + interval = 1; + on-scroll-up = "brightnessctl s 1515"; + on-scroll-down = "brightnessctl s 1"; + }; + + network = { + format = "{ifname}"; + format-wifi = "{essid} ({signalStrength}%) "; + format-ethernet = "{ipaddr}/{cidr} 󰊗"; + format-disconnected = "󰤮"; + tooltip-format = "{ifname} via {gwaddr} 󰊗"; + tooltip-format-wifi = "{essid} ({signalStrength}%) "; + tooltip-format-ethernet = "{ifname} "; + tooltip-format-disconnected = "Disconnected"; + max-length = 50; + }; + + battery = { + format = "{capacity}% {icon}"; + "format-icons" = ["" "" "" "" ""]; + }; + + clock = { + "format-alt" = "{:%a, %d. %b %H:%M}"; + }; + }; + }; + }; +} diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index b3632e9..78e19bf 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -56,13 +56,16 @@ stylix = { enable = true; + autoEnable = true; polarity = "light"; image = ./wallpaper.png; base16Scheme = "${pkgs.base16-schemes}/share/themes/brushtrees.yaml"; opacity = { terminal = .85; popups = .75; + desktop = .75; }; + cursor = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 5052165..0826315 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -4,9 +4,9 @@ imports = [ ../home/home_common.nix ../home/gnome.nix + ../home/sway.nix ]; - stylix.enable = true; nixpkgs.config.allowUnfree = true; @@ -46,4 +46,9 @@ defaultEditor = true; }; }; + stylix = { + enable = true; + autoEnable = true; + }; + }