stuff
This commit is contained in:
Sebastian Moser
@@ -8,12 +8,14 @@
|
||||
# - win + D command
|
||||
# - kernel output for luks pwd on all displays
|
||||
|
||||
{ lib, pkgs, nur, unstable, ... }:
|
||||
{ lib, pkgs, nur, unstable, inputs, ... }:
|
||||
let
|
||||
|
||||
newerUnstableSrc = builtins.getFlake "nixpkgs/d0fc30899600b9b3466ddb260fd83deb486c32f1";
|
||||
newerUnstable = import newerUnstableSrc.outPath {};
|
||||
|
||||
mySway = newerUnstable.sway.override {
|
||||
mySway = newerUnstable.sway;
|
||||
myOtherSway = newerUnstable.sway.override {
|
||||
sway-unwrapped = (newerUnstable.sway-unwrapped.overrideAttrs (prev: {
|
||||
/*
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@@ -31,13 +33,15 @@ let
|
||||
};
|
||||
})).override {
|
||||
wlroots = newerUnstable.wlroots.overrideAttrs (prev: {
|
||||
nativeBuildInputs = prev.nativeBuildInputs ++ [ pkgs.cmake pkgs.libdrm pkgs.pkg-config pkgs.wayland ];
|
||||
buildInputs = prev.nativeBuildInputs ++ [ pkgs.cmake pkgs.libdrm pkgs.pkg-config pkgs.wayland ];
|
||||
version = "master";
|
||||
src = pkgs.fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = "master";
|
||||
sha256 = "sha256-2FK6FGRpgf/YYqwJST0LVA/pnNRSUDrfrrp6mSwA0Fk=";
|
||||
rev = "2c64b30a6750d5e585c00c4c116f415bac33d18f";
|
||||
sha256 = "sha256-Hxf3xVJddSlSHytYJNNq7f2oQdiSXp0tmK1FepRpqaA=";
|
||||
};
|
||||
|
||||
});
|
||||
@@ -45,6 +49,10 @@ let
|
||||
};
|
||||
in {
|
||||
|
||||
# aparently also needed for wayland... or not idk
|
||||
services.xserver.xkb.layout = "de";
|
||||
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = rec {
|
||||
@@ -123,42 +131,17 @@ in {
|
||||
services.blueman.enable = true;
|
||||
hardware.bluetooth.enable = true;
|
||||
|
||||
# fix bluetooth-3-0-keyboard not reporting left and right cmd seperately (and remapping the other things the way i want them)
|
||||
services.udev.extraHwdb = ''
|
||||
evdev:input:b0005v05AC*
|
||||
KEYBOARD_KEY_700e3=leftctrl
|
||||
KEYBOARD_KEY_700e7=rightalt
|
||||
KEYBOARD_KEY_700e2=leftmeta
|
||||
KEYBOARD_KEY_700e0=leftalt
|
||||
'';
|
||||
|
||||
services.keyd = {
|
||||
enable = true;
|
||||
/*
|
||||
keyboards.bluetooth-3-0-keyboard = {
|
||||
ids = [ "05ac:0255:f22563e9" ];
|
||||
settings.main = {
|
||||
leftalt = "meta";
|
||||
leftcontrol = "leftalt";
|
||||
};
|
||||
};
|
||||
*/
|
||||
#keyboards.default.ids = [ "-05ac:0255" ]; completely disables my rebinding...... hmmmm
|
||||
keyboards.default.settings = {
|
||||
main = {
|
||||
leftalt = "leftcontrol";
|
||||
leftcontrol = "leftalt";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# flameshot where clipboard works with wayland
|
||||
# i am not even using flameshot anymore....
|
||||
/*
|
||||
(flameshot.overrideAttrs (prev: {
|
||||
nativeBuildInputs = prev.nativeBuildInputs or [] ++ [ libsForQt5.kguiaddons ];
|
||||
cmakeFlags = prev.nativeBuildInputs or [] ++ [ "-DUSE_WAYLAND_CLIPBOARD=true" "-DUSE_WAYLAND_GRIM=ON" ];
|
||||
patches = prev.patches or [] ++ [ ../overlays/patches/flameshot-wayland.patch ];
|
||||
}))
|
||||
*/
|
||||
|
||||
hyprpicker
|
||||
satty
|
||||
@@ -187,7 +170,7 @@ in {
|
||||
|
||||
xdg-desktop-portal
|
||||
wlr-randr
|
||||
rofi-wayland
|
||||
rofi
|
||||
wev
|
||||
wl-clipboard
|
||||
zoxide
|
||||
@@ -275,27 +258,35 @@ in {
|
||||
output * scale 1 bg #121212 solid_color
|
||||
|
||||
#################### from nwg-display
|
||||
# Generated by nwg-displays on 2025-09-18 at 21:21:58. Do not edit manually.
|
||||
# Generated by nwg-displays on 2025-10-20 at 18:16:29. Do not edit manually.
|
||||
|
||||
output "eDP-1" {
|
||||
mode 1920x1080@60.001Hz
|
||||
pos 0 1888
|
||||
transform normal
|
||||
scale 1.0
|
||||
scale_filter nearest
|
||||
adaptive_sync off
|
||||
dpms on
|
||||
}
|
||||
output "DP-1" {
|
||||
mode 3840x2160@59.997Hz
|
||||
pos 1920 0
|
||||
transform normal
|
||||
scale 1.0
|
||||
scale_filter nearest
|
||||
adaptive_sync off
|
||||
dpms on
|
||||
}
|
||||
output "DP-2" disable
|
||||
output "DP-1" {
|
||||
mode 3840x2160@59.997Hz
|
||||
pos 3840 0
|
||||
transform normal
|
||||
scale 1.0
|
||||
scale_filter nearest
|
||||
adaptive_sync off
|
||||
dpms on
|
||||
}
|
||||
output "eDP-1" {
|
||||
mode 1920x1080@60.001Hz
|
||||
pos 1920 1080
|
||||
transform normal
|
||||
scale 1.0
|
||||
scale_filter nearest
|
||||
adaptive_sync off
|
||||
dpms on
|
||||
}
|
||||
output "HDMI-A-1" {
|
||||
mode 1920x1080@60.0Hz
|
||||
pos 0 1080
|
||||
transform normal
|
||||
scale 1.0
|
||||
scale_filter nearest
|
||||
adaptive_sync off
|
||||
dpms on
|
||||
}
|
||||
#################### end from nwg-display
|
||||
|
||||
set $disp2 "DP-1"
|
||||
@@ -329,6 +320,10 @@ in {
|
||||
pointer_accel -0.5
|
||||
}
|
||||
|
||||
# the lan-mouse input
|
||||
#input 0:0:wlr_virtual_pointer_v1 {
|
||||
#}
|
||||
|
||||
### Border colors and looks
|
||||
client.focused #ff4060 #222222 #ff4060 #ff4060 #ff4060
|
||||
client.focused_inactive #222222 #222222 #ff4060 #222222 #222222
|
||||
@@ -342,6 +337,7 @@ in {
|
||||
|
||||
#exec "/usr/bin/env bash ${./..}/scripts/idlescript" # Manages suspending and locking
|
||||
exec ${pkgs.bash}/bin/bash ${./..}/scripts/batteryscript.sh # Sends battery notifications when necessary
|
||||
exec tmux # create a tmux session in which one can run commands that need WAYLAND_DISPLAY set
|
||||
exec nm-applet # Networkmanager applet
|
||||
exec blueman-applet # Bluetoothmanager applet
|
||||
exec blueman-tray # Bluetoothmanager tray icon
|
||||
@@ -463,6 +459,7 @@ in {
|
||||
# the sticky workspaces, that are the same in all workrooms
|
||||
|
||||
bindsym $mod+1 workspace number 1
|
||||
bindsym $mod+4 workspace number 4
|
||||
bindsym $mod+7 workspace number 7
|
||||
bindsym $mod+8 workspace number 8
|
||||
bindsym $mod+9 workspace number 9
|
||||
@@ -470,6 +467,7 @@ in {
|
||||
|
||||
|
||||
bindsym $mod+Shift+1 move container to workspace number 1
|
||||
bindsym $mod+Shift+4 move container to workspace number 4
|
||||
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
|
||||
@@ -478,6 +476,7 @@ in {
|
||||
# default display outputs for workspaces with fallback to disp1
|
||||
workspace 1 output $disp2 $disp1
|
||||
workspace 6 output $disp2 $disp1
|
||||
workspace 4 output $disp2 $disp1
|
||||
workspace 8 output $disp2 $disp1
|
||||
workspace 9 output $disp2 $disp1
|
||||
workspace 7 output eDP-1
|
||||
@@ -493,14 +492,12 @@ in {
|
||||
# nav to workspaces in workrooms
|
||||
bindsym $mod+2 set $$workspace 2; workspace $$workroom$$workspace
|
||||
bindsym $mod+3 set $$workspace 3; workspace $$workroom$$workspace
|
||||
bindsym $mod+4 set $$workspace 4; workspace $$workroom$$workspace
|
||||
bindsym $mod+5 set $$workspace 5; workspace $$workroom$$workspace
|
||||
bindsym $mod+6 set $$workspace 6; workspace $$workroom$$workspace
|
||||
|
||||
# move windows to workspaces in workrooms
|
||||
bindsym $mod+Shift+2 set $$tmp-workspace 2; move container to workspace $$workroom$$tmp-workspace
|
||||
bindsym $mod+Shift+3 set $$tmp-workspace 3; move container to workspace $$workroom$$tmp-workspace
|
||||
bindsym $mod+Shift+4 set $$tmp-workspace 4; move container to workspace $$workroom$$tmp-workspace
|
||||
bindsym $mod+Shift+5 set $$tmp-workspace 5; move container to workspace $$workroom$$tmp-workspace
|
||||
bindsym $mod+Shift+6 set $$tmp-workspace 6; move container to workspace $$workroom$$tmp-workspace
|
||||
|
||||
|
||||
Reference in New Issue
Block a user