From 5dd9bd3377860c24afd4e21bcbbc4a86235913b8 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Tue, 28 Nov 2023 16:46:57 +0100 Subject: [PATCH] . --- flake.lock | 44 ++++---- flake.nix | 6 +- home.nix | 8 ++ swayfx/config.in | 274 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 307 insertions(+), 25 deletions(-) create mode 100644 swayfx/config.in diff --git a/flake.lock b/flake.lock index 75c3486..6ce6ed8 100644 --- a/flake.lock +++ b/flake.lock @@ -27,16 +27,16 @@ ] }, "locked": { - "lastModified": 1701071203, - "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -50,16 +50,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1701023633, - "narHash": "sha256-lX/PsZrKEtdk/cUIET/UYhQKPJRkNq2hlbLH6VQSpWc=", + "lastModified": 1699726486, + "narHash": "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "99ca26d4eb84e0071264713902e5b287fcab392e", + "rev": "9afdd61adeaf413afbe853dbc5fdf6853c8bde21", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "main", + "ref": "v0.32.3", "repo": "Hyprland", "type": "github" } @@ -122,11 +122,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -138,16 +138,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701058557, + "narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "070b5cf9f70bc7ef2dfd739a1f7d6c563fe64bd1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -234,18 +234,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1700734054, - "narHash": "sha256-SBu1y01WjCSrcCKvgfCDDckrZjU/OmCJT8Xc+hPow7E=", + "lastModified": 1699292815, + "narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=", "owner": "wlroots", "repo": "wlroots", - "rev": "2eb225236eb72f27beec921e9f37ddf58e874fba", + "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "2eb225236eb72f27beec921e9f37ddf58e874fba", + "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", "type": "gitlab" } }, @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1700508250, - "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", + "lastModified": 1697981233, + "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", + "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f278dd2..58fc147 100644 --- a/flake.nix +++ b/flake.nix @@ -18,13 +18,13 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { - url = "github:hyprwm/Hyprland/main"; + url = "github:hyprwm/Hyprland/v0.32.3"; }; split-monitor-workspaces = { url = "github:Duckonaut/split-monitor-workspaces"; diff --git a/home.nix b/home.nix index f5d6838..4b37716 100644 --- a/home.nix +++ b/home.nix @@ -73,12 +73,14 @@ args@{ config, pkgs, hyprland, split-monitor-workspaces, flatpaks, ... }: sqlite stow swappy + swayfx sysstat telegram-desktop tofi ungoogled-chromium unzip usbutils + vlc wlr-randr zig zls @@ -109,6 +111,11 @@ args@{ config, pkgs, hyprland, split-monitor-workspaces, flatpaks, ... }: size = 32; }; + home.file.".config/sway/config" = { + enable = true; + text = builtins.readFile /opt/nixconfig/swayfx/config.in; + }; + accounts = { # calendar = { # basePath = "${config.home.homeDirectory}/calendars"; @@ -458,6 +465,7 @@ args@{ config, pkgs, hyprland, split-monitor-workspaces, flatpaks, ... }: terminal = "${pkgs.kitty}/bin/kitty"; width = 100; fields = "filename,name,generic,exec"; + show-actions = true; filter-desktop = false; layer = "overlay"; }; diff --git a/swayfx/config.in b/swayfx/config.in new file mode 100644 index 0000000..86635fe --- /dev/null +++ b/swayfx/config.in @@ -0,0 +1,274 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +### 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 kitty +# Your preferred application launcher +# Note: pass the final command to swaymsg so that the resulting window can be opened +# on the original workspace that the command was run on. +#set $menu fuzzel | xargs swaymsg exec -- + +### Appearance + +# borders +hide_edge_borders --i3 smart +default_border pixel 2 + +# window gaps +smart_gaps inverse_outer +gaps inner 15 +gaps left 700 +gaps right 700 + +bindsym $mod+g exec swaymsg gaps outer set 0 +bindsym $mod+i exec swaymsg "gaps left 700; gaps right 700" + +# window corner radius in px +corner_radius 10 + +# Window background blur +blur on +blur_xray off +blur_passes 2 +blur_radius 5 + +shadows on +shadows_on_csd on +shadow_blur_radius 20 +shadow_color #0000007F + +# inactive window fade amount. 0.0 = no dimming, 1.0 = fully dimmed +default_dim_inactive 0.0 +dim_inactive_colors.unfocused #000000FF +dim_inactive_colors.urgent #900000FF + +# Move minimized windows into Scratchpad (enable|disable) +scratchpad_minimize disable + +### Output configuration +# +# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +#output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs + +### Idle configuration +# +# Example configuration: +# +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ +# before-sleep 'swaylock -f -c 000000' +# +# This will lock your screen after 300 seconds of inactivity, then turn off +# your displays after another 300 seconds, and turn your screens back on when +# resumed. It will also lock your screen before your computer goes to sleep. + +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +input * { + xkb_layout "de" + xkb_options "caps:swapescape" +} + +### Key bindings +# +# Basics: +# + # Start a terminal + bindsym $mod+q exec $term + + # Kill focused window + bindsym $mod+c kill + + # Start your launcher + bindsym $mod+r exec swaymsg "focus parent; split h; exec fuzzel" | xargs swaymsg exec -- + bindsym $mod+Shift+r exec swaymsg "focus parent; split v; exec fuzzel" | xargs swaymsg exec -- + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # 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+m exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' + bindsym $mod+m exec wlogout +# +# Moving around: +# +# Move your focus around +bindsym $mod+$left focus left +bindsym $mod+$down focus down +bindsym $mod+$up focus up +bindsym $mod+$right focus right +# Or use $mod+[up|down|left|right] +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# Move the focused window with the same, but add Shift +bindsym $mod+Shift+$left move left +bindsym $mod+Shift+$down move down +bindsym $mod+Shift+$up move up +bindsym $mod+Shift+$right move right +# Ditto, with arrow keys +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 + bindsym $mod+4 workspace number 4 + bindsym $mod+5 workspace number 5 + bindsym $mod+6 workspace number 6 + bindsym $mod+7 workspace number 7 + bindsym $mod+8 workspace number 8 + bindsym $mod+9 workspace number 9 + bindsym $mod+0 workspace number 10 + # Move focused container to workspace + bindsym $mod+Shift+1 move container to workspace number 1 + bindsym $mod+Shift+2 move container to workspace number 2 + bindsym $mod+Shift+3 move container to workspace number 3 + bindsym $mod+Shift+4 move container to workspace number 4 + bindsym $mod+Shift+5 move container to workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6 + 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 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. +# +# Layout stuff: +# +# You can "split" the current object of your focus with +# $mod+b or $mod+v, for horizontal and vertical splits +# respectively. +bindsym $mod+b splith +bindsym $mod+v splitv + +# Switch the current container between different layout styles +bindsym $mod+s layout toggle stacking default +bindsym $mod+t layout toggle tabbed default +bindsym $mod+e layout toggle split + +# Untangle the mess +bindsym $mod+u split none + +# Make the current focus fullscreen +bindsym $mod+f fullscreen + +# Toggle the current focus between tiling and floating mode +bindsym $mod+Shift+space floating toggle + +# Swap focus between the tiling area and the floating area +bindsym $mod+space focus mode_toggle + +# Move focus to the parent container +bindsym $mod+a focus parent +# +# Scratchpad: +# +# Sway has a "scratchpad", which is a bag of holding for windows. +# You can send windows there and get them back later. + +# Move the currently focused window to the scratchpad +bindsym $mod+Shift+b 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 Alt+Shift+Return scratchpad show +# +# Resizing containers: +# +mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10px + bindsym $down resize grow height 10px + bindsym $up resize shrink height 10px + bindsym $right resize grow width 10px + + # Ditto, with arrow keys + bindsym Left resize shrink width 10px + bindsym Down resize grow height 10px + bindsym Up resize shrink height 10px + bindsym Right resize grow width 10px + + # Return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" +} +#bindsym $mod+r mode "resize" + +# Program-Specific Layouts + +for_window [class="Firefox"] layout tabbed +for_window [class="Emacs"] layout default +for_window [app_id="kitty"] layout tabbed + +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +#bar { +# position top +# +# # When the status_command prints a new line to stdout, swaybar updates. +# # The default just shows the current date and time. +# status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done +# +# colors { +# statusline #ffffff +# background #323232 +# inactive_workspace #32323200 #32323200 #5c5c5c +# } +#} + +# Autostarts +exec waybar +exec swaymsg "exec kitty; move scratchpad" + +include @sysconfdir@/sway/config.d/*