From 1127041cda7ff8aaadd5321a27d404a00db2088d Mon Sep 17 00:00:00 2001 From: Raghuram Subramani Date: Tue, 12 Mar 2024 21:56:50 +0530 Subject: Revert "dwm" This reverts commit 55542f1ce3f313419ebe6a7fa9a7629898e6ce2e. --- config/dwm.nix | 12 ------- config/rofi/config.rasi | 77 ----------------------------------------- config/rofi/default.nix | 6 ---- config/themes.nix | 1 - config/way-displays/cfg.yaml | 28 +++++++++++++++ config/way-displays/default.nix | 6 ++++ dist/bar.sh | 39 +++++++++++++++++++++ dist/dwl/bar.sh | 39 --------------------- dist/dwl/run.sh | 2 -- dist/dwm/bar.sh | 29 ---------------- dist/dwm/power.sh | 12 ------- dist/run.sh | 2 ++ machines/x/configuration.nix | 19 ---------- machines/x/home.nix | 6 ++-- modules/compromyse.nix | 2 +- modules/login.nix | 6 +++- 16 files changed, 85 insertions(+), 201 deletions(-) delete mode 100644 config/dwm.nix delete mode 100644 config/rofi/config.rasi delete mode 100644 config/rofi/default.nix create mode 100644 config/way-displays/cfg.yaml create mode 100644 config/way-displays/default.nix create mode 100755 dist/bar.sh delete mode 100755 dist/dwl/bar.sh delete mode 100755 dist/dwl/run.sh delete mode 100755 dist/dwm/bar.sh delete mode 100755 dist/dwm/power.sh create mode 100755 dist/run.sh diff --git a/config/dwm.nix b/config/dwm.nix deleted file mode 100644 index 89a1408..0000000 --- a/config/dwm.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, home, fetchFromGitHub, ... }: - -{ - home.packages = with pkgs; [ - feh - picom - wmname - xss-lock - xsecurelock - networkmanagerapplet - ]; -} diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi deleted file mode 100644 index 0233f7b..0000000 --- a/config/rofi/config.rasi +++ /dev/null @@ -1,77 +0,0 @@ -configuration { - display-drun: "?"; - drun-display-format: "{name}"; - font: "UbuntuMono Nerd Font Medium 10"; - modi: "run,drun"; -} - -@theme "/dev/null" - -* { - bg: #131417; - bg-alt: #1e1f26; - - fg: #d3d7f2; - fg-alt: #787c99; - - background-color: @bg; - - border: 0; - margin: 0; - padding: 0; - spacing: 0; -} - -window { - width: 30%; -} - -element { - padding: 8 0; - text-color: @fg-alt; -} - -element selected { - text-color: @fg; -} - -element-text { - text-color: inherit; - vertical-align: 0.5; -} - -element-icon { - size: 14; - padding: 0 10 0 0; -} - -entry { - background-color: @bg-alt; - padding: 12; - text-color: @fg; -} - -inputbar { - children: [prompt, entry]; -} - -listview { - padding: 8 12; - background-color: @bg; - columns: 1; - lines: 8; -} - -mainbox { - background-color: @bg; - children: [inputbar, listview]; -} - -prompt { - background-color: @bg-alt; - enabled: true; - padding: 12 0 0 12; - text-color: @fg; -} - -/* vim: ft=sass */ diff --git a/config/rofi/default.nix b/config/rofi/default.nix deleted file mode 100644 index e515249..0000000 --- a/config/rofi/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, config, ... }: - -{ - home.packages = [ pkgs.rofi ]; - home.file.".config/rofi/config.rasi".source = ./config.rasi; -} diff --git a/config/themes.nix b/config/themes.nix index b368a9e..4bea0e9 100644 --- a/config/themes.nix +++ b/config/themes.nix @@ -3,7 +3,6 @@ { home.pointerCursor = { gtk.enable = true; - x11.enable = true; package = pkgs.bibata-cursors; name = "Bibata-Modern-Classic"; size = 16; diff --git a/config/way-displays/cfg.yaml b/config/way-displays/cfg.yaml new file mode 100644 index 0000000..74e247b --- /dev/null +++ b/config/way-displays/cfg.yaml @@ -0,0 +1,28 @@ +# Arrange displays in a ROW (default, left to right) or a COLUMN (top to bottom) +ARRANGE: COLUMN + +# Align ROWs at the TOP (default), MIDDLE or BOTTOM +# Align COLUMNs at the LEFT (default), MIDDLE or RIGHT +ALIGN: MIDDLE + +# The default ORDER is simply the order in which the displays are discovered. +# Define your own. +ORDER: + - 'HDMI-A-1' + - 'eDP-1' + +SCALING: FALSE + +MODE: + - NAME_DESC: HDMI-A-1 + MAX: TRUE + + - NAME_DESC: eDP-1 + MAX: TRUE + +# Laptop displays usually start with eDP e.g. eDP-1. This may be overridden if +# your laptop is different. +LAPTOP_DISPLAY_PREFIX: 'eDP-1' + +# One of: ERROR, WARNING, INFO (default), DEBUG +LOG_THRESHOLD: INFO diff --git a/config/way-displays/default.nix b/config/way-displays/default.nix new file mode 100644 index 0000000..b57f601 --- /dev/null +++ b/config/way-displays/default.nix @@ -0,0 +1,6 @@ +{ pkgs, config, ... }: + +{ + home.packages = [ pkgs.way-displays ]; + home.file.".config/way-displays/cfg.yaml".source = ./cfg.yaml; +} diff --git a/dist/bar.sh b/dist/bar.sh new file mode 100755 index 0000000..2b23972 --- /dev/null +++ b/dist/bar.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +wifi() { + iwgetid -r +} + +battery() { + c=$(cat /sys/class/power_supply/BAT1/capacity) + + if [[ $c > 85 ]]; then + echo " $c" + elif [[ $c > 70 ]]; then + echo " $c" + elif [[ $c > 50 ]]; then + echo " $c" + elif [[ $c > 30 ]]; then + echo " $c" + else + echo " $c" + fi +} + +charging() { + if [[ "$(cat /sys/class/power_supply/BAT1/status)" == "Charging" ]]; then + echo "+" + fi +} + +calendar() { + date +'%a, %d %b %Y |  %H:%M' +} + +volume() { + pamixer --get-volume +} + +while [[ true ]]; do + dwlb -status all "| ^lm(alacritty -e nmtui-connect) $(wifi)^lm() |  $(volume)% | $(battery)%$(charging) |  $(calendar) | λ" + sleep 1 +done diff --git a/dist/dwl/bar.sh b/dist/dwl/bar.sh deleted file mode 100755 index 2b23972..0000000 --- a/dist/dwl/bar.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -wifi() { - iwgetid -r -} - -battery() { - c=$(cat /sys/class/power_supply/BAT1/capacity) - - if [[ $c > 85 ]]; then - echo " $c" - elif [[ $c > 70 ]]; then - echo " $c" - elif [[ $c > 50 ]]; then - echo " $c" - elif [[ $c > 30 ]]; then - echo " $c" - else - echo " $c" - fi -} - -charging() { - if [[ "$(cat /sys/class/power_supply/BAT1/status)" == "Charging" ]]; then - echo "+" - fi -} - -calendar() { - date +'%a, %d %b %Y |  %H:%M' -} - -volume() { - pamixer --get-volume -} - -while [[ true ]]; do - dwlb -status all "| ^lm(alacritty -e nmtui-connect) $(wifi)^lm() |  $(volume)% | $(battery)%$(charging) |  $(calendar) | λ" - sleep 1 -done diff --git a/dist/dwl/run.sh b/dist/dwl/run.sh deleted file mode 100755 index dc13e69..0000000 --- a/dist/dwl/run.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -alacritty --title float -o 'window.dimensions = { columns = 80, lines = 40 }' -e sway-launcher-desktop diff --git a/dist/dwm/bar.sh b/dist/dwm/bar.sh deleted file mode 100755 index dbc76e5..0000000 --- a/dist/dwm/bar.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -battery() { - capacity="$(cat /sys/class/power_supply/BAT1/capacity)" - case "$(cat /sys/class/power_supply/BAT1/status)" in - Charging) printf " $capacity +";; - Discharging) printf " $capacity -";; - Full) printf " $capacity";; - esac -} - -wlan() { - case "$(cat /sys/class/net/wl*/operstate 2>/dev/null)" in - up) echo "󰤨 $(iwgetid -r)";; - down) printf "󰤭 Disconnected";; - esac -} - -clock() { - printf "󱑆 $(date '+%H:%M')" -} - -user() { - printf "$(whoami)" -} - -while(true) do - xsetroot -name "| $(battery) | $(wlan) | $(clock) | $(user) " && sleep 2 -done diff --git a/dist/dwm/power.sh b/dist/dwm/power.sh deleted file mode 100755 index 318c7cf..0000000 --- a/dist/dwm/power.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -chosen=$(printf " Power Off\n Restart\n Suspend\n Hibernate\n󰗼 Log Out\n Lock" | rofi -dmenu -i -p "Choice:") - -case "$chosen" in - " Power Off") poweroff ;; - " Restart") reboot ;; - " Suspend") systemctl suspend-then-hibernate ;; - " Hibernate") systemctl hibernate ;; - "󰗼 Log Out") killall dwm ;; - " Lock") betterlockscreen -l ;; - *) exit 1 ;; -esac diff --git a/dist/run.sh b/dist/run.sh new file mode 100755 index 0000000..dc13e69 --- /dev/null +++ b/dist/run.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +alacritty --title float -o 'window.dimensions = { columns = 80, lines = 40 }' -e sway-launcher-desktop diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix index 46aa51d..f3e60e4 100644 --- a/machines/x/configuration.nix +++ b/machines/x/configuration.nix @@ -42,25 +42,6 @@ home-manager.users.compromyse = import ./home.nix; - environment.systemPackages = with pkgs; [ - xorg.xorgserver - xorg.xf86inputevdev - xorg.xf86inputsynaptics - xorg.xf86inputlibinput - ]; - - services.xserver.enable = true; - services.xserver.displayManager.startx.enable = true; - services.xserver.windowManager.dwm.enable = true; - services.xserver.windowManager.dwm.package = pkgs.dwm.overrideAttrs { - src = pkgs.fetchFromGitHub { - owner = "compromyse"; - repo = "dwm"; - rev = "master"; - hash = "sha256-bYj9u0EBfpTcpJHzeaCp3mm6tSy9dz40y+X15R0WbUs="; - }; - }; - networking.extraHosts = '' 127.0.0.1 download.labsmartlis.local diff --git a/machines/x/home.nix b/machines/x/home.nix index c46067e..c0ac523 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -35,6 +35,7 @@ in { pamixer wbg + wl-clipboard sway-launcher-desktop @@ -50,8 +51,9 @@ in { "git" "nvim" "alacritty" - "dwm.nix" - "rofi" + "dwl.nix" + "way-displays" + "swaylock" "dunst" ]); diff --git a/modules/compromyse.nix b/modules/compromyse.nix index 89443f4..f822b46 100644 --- a/modules/compromyse.nix +++ b/modules/compromyse.nix @@ -5,6 +5,6 @@ initialPassword = "changeme"; isNormalUser = true; # openssh.authorizedKeys.keys = []; - extraGroups = [ "wheel" "video" "storage" "input" "plugdev" "tty" "libvirtd" "docker" ]; + extraGroups = [ "wheel" "video" "storage" "input" "plugdev" "libvirtd" "docker" ]; }; } diff --git a/modules/login.nix b/modules/login.nix index 37e78a4..79ac35f 100644 --- a/modules/login.nix +++ b/modules/login.nix @@ -10,7 +10,7 @@ enable = true; settings = { default_session = { - command = "tuigreet --time --remember --cmd \"dwm\""; + command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; user = "greeter"; }; }; @@ -32,6 +32,10 @@ security.polkit.enable = true; + security.pam.services.swaylock.text = '' + auth include login + ''; + services.xserver.libinput.enable = true; programs.gnupg.agent = { -- cgit v1.2.3