diff options
| -rw-r--r-- | config/sway/config | 46 | ||||
| -rwxr-xr-x | dist/bar.sh | 10 | ||||
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | machines/x/home.nix | 4 | ||||
| -rw-r--r-- | modules/login.nix | 6 | ||||
| -rw-r--r-- | packages/dwl.nix | 2 | ||||
| -rw-r--r-- | packages/dwlb.nix | 2 |
7 files changed, 36 insertions, 64 deletions
diff --git a/config/sway/config b/config/sway/config index f9dfa5b..35415b9 100644 --- a/config/sway/config +++ b/config/sway/config @@ -1,19 +1,14 @@ -### Variables -# # Logo key. Use Mod1 for Alt. set $mod Mod4 -# Home row direction keys, like vim set $left h set $down j set $up k set $right l -# Your preferred terminal emulator set $term alacritty -# Your preferred application launcher set $menu /config/dist/run.sh +set $vm /config/dist/vm.sh ### Output configuration -# output * bg /config/dist/wallpaper.png fill ### Idle configuration @@ -34,14 +29,10 @@ input "1739:52865:DLL0C55:00_06CB:CE81_Touchpad" { # You can get the names of your inputs by running: swaymsg -t get_inputs ### Key bindings -# Start a terminal bindsym $mod+Shift+Return exec $term - -# Kill focused window bindsym $mod+Shift+q kill - -# Start your launcher bindsym $mod+space exec $menu +bindsym $mod+v exec $vm # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -50,15 +41,10 @@ bindsym $mod+space exec $menu # mouse button for dragging. floating_modifier $mod normal -# Reload the configuration file bindsym $mod+Shift+c reload - -# Exit sway (logs you out of your Wayland session) bindsym $mod+Shift+b exec swaymsg exit -# + # Moving around: -# -# Move your focus around bindsym $mod+$left focus left bindsym $mod+$down focus down bindsym $mod+$up focus up @@ -69,10 +55,8 @@ bindsym $mod+Shift+$left move left bindsym $mod+Shift+$down move down bindsym $mod+Shift+$up move up bindsym $mod+Shift+$right move right -# + # Workspaces: -# -# Switch to workspace bindsym $mod+1 workspace number 1 bindsym $mod+2 workspace number 2 bindsym $mod+3 workspace number 3 @@ -94,20 +78,13 @@ bindsym $mod+Shift+7 move container to workspace number 7 bindsym $mod+Shift+8 move container to workspace number 8 bindsym $mod+Shift+9 move container to workspace number 9 bindsym $mod+Shift+0 move container to workspace number 10 -# + # Layout stuff: -# -# Switch the current container between different layout styles bindsym $mod+w layout tabbed - -# Make the current focus fullscreen bindsym $mod+f fullscreen - -# Toggle the current focus between tiling and floating mode bindsym $mod+Shift+space floating toggle -# + # Scratchpad: -# # Sway has a "scratchpad", which is a bag of holding for windows. # You can send windows there and get them back later. @@ -117,9 +94,8 @@ bindsym $mod+Shift+minus move scratchpad # Show the next scratchpad window or hide the focused scratchpad window. # If there are multiple scratchpad windows, this command cycles through them. bindsym $mod+minus scratchpad show -# + # Resizing containers: -# mode "resize" { # left will shrink the containers width # right will grow the containers width @@ -135,10 +111,8 @@ mode "resize" { bindsym Escape mode "default" } bindsym $mod+r mode "resize" -# + # Utilities: -# -# Special keys to adjust volume via PulseAudio bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% @@ -149,12 +123,10 @@ bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ # Special key to take a screenshot with grim bindsym Print exec grim -g "$(slurp)" - | wl-copy -# # Status Bar: -# # Read `man 5 sway-bar` for more information about this section. bar { - position top + position bottom # When the status_command prints a new line to stdout, swaybar updates. # The default just shows the current date and time. diff --git a/dist/bar.sh b/dist/bar.sh index d1cd835..156fe44 100755 --- a/dist/bar.sh +++ b/dist/bar.sh @@ -33,9 +33,9 @@ volume() { pamixer --get-volume } -while [[ true ]]; do - dwlb -status all "| ^lm(alacritty -e nmtui-connect) $(wifi)^lm() | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" - sleep 1 -done +# while [[ true ]]; do +# dwlb -status all "| ^lm(alacritty -e nmtui-connect) $(wifi)^lm() | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" +# sleep 1 +# done -# echo "| $(wifi) | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" +echo "| $(wifi) | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1752113600, - "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1734412921, - "narHash": "sha256-JeMqc7lLowKn6klrCcOkcOg38yNqF7MPbN4Elh6Xvq0=", + "lastModified": 1753279958, + "narHash": "sha256-EJ1udnwKYgWeAJzncAccbLPtbSWiuIANryXTGI9nY6w=", "owner": "vinceliuice", "repo": "grub2-themes", - "rev": "f6ab2438e124f60a340a526543e498e5e33b3c53", + "rev": "6c26f99622cb1c705b3fe2dbe1eb88521096b25a", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1752286566, - "narHash": "sha256-A4nftqiNz2bNihz0bKY94Hq/6ydR6UQOcGioeL7iymY=", + "lastModified": 1753567913, + "narHash": "sha256-eYrqSRI1/mrnVGCGYO+zkKHUszwJQodq/qDHh+mzvkI=", "owner": "nix-community", "repo": "home-manager", - "rev": "392ddb642abec771d63688c49fa7bcbb9d2a5717", + "rev": "2b73c2fcca690b6eca4f520179e54ae760f25d4e", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752291601, - "narHash": "sha256-BeSWLMcsvau1iD2bPHuXYEL1eRQV8x4OanN2rVaCOfg=", + "lastModified": 1753585664, + "narHash": "sha256-kqQrn4RgckPYoI5ybYfKqAo8VFT5+9fDnGxvEXIfDhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12cb0d4a136cba28db44235f749df06f92b643ff", + "rev": "e960a8fb5b96caafd1fe8e825811b8616feabaa4", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { diff --git a/machines/x/home.nix b/machines/x/home.nix index 9332249..b533076 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -57,9 +57,9 @@ # "qtile" # "plasma" - "labwc" + # "labwc" # "sway" - # "dwl.nix" + "dwl.nix" "themes.nix" "waybar" "way-displays" diff --git a/modules/login.nix b/modules/login.nix index 0917b7f..1751f2a 100644 --- a/modules/login.nix +++ b/modules/login.nix @@ -10,9 +10,9 @@ enable = true; settings = { default_session = { - # command = "tuigreet --time --remember --cmd \"sway\""; - command = "tuigreet --time --remember --cmd labwc"; - # command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; + # command = "tuigreet --time --remember --cmd sway"; + # command = "tuigreet --time --remember --cmd labwc"; + command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; user = "greeter"; }; }; diff --git a/packages/dwl.nix b/packages/dwl.nix index 8e6e68b..f41bce8 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwl"; rev = "compromyse"; - hash = "sha256-XY57sxbS24qZ+oKXfCLcbE3EqGkVKNQqx/1mELI6FWs="; + hash = "sha256-+/8C4vj3TKVQN4IpG1kqONwte41p57oYWrwAlqgiUWM="; }; nativeBuildInputs = [ diff --git a/packages/dwlb.nix b/packages/dwlb.nix index 9d5e43d..61adf63 100644 --- a/packages/dwlb.nix +++ b/packages/dwlb.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwlb"; rev = "compromyse"; - hash = "sha256-te2RB/KB2CtvIo7JOANUkEnn+EQuhvc5+uFSCWPbN7A="; + hash = "sha256-rDaw6V1Evey0Sy2rpm6IL3ElA8h2QPjDwxAc4wOLqnE="; }; nativeBuildInputs = [ |