feat: remove all wayland config
This commit is contained in:
parent
21bab323e9
commit
e82b89fcd2
GPG key ID:
3786770EDBC2B481
9 changed files with 12 additions and 361 deletions
122
flake.lock
122
flake.lock
|
|
@ -108,51 +108,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hyprland": {
|
|
||||||
"inputs": {
|
|
||||||
"hyprland-protocols": "hyprland-protocols",
|
|
||||||
"nixpkgs": "nixpkgs",
|
|
||||||
"wlroots": "wlroots",
|
|
||||||
"xdph": "xdph"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1677012422,
|
|
||||||
"narHash": "sha256-8FiSyHE3lscZKts1W+U6DSyxdvxKzeql2RQ9qln7Ra4=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "Hyprland",
|
|
||||||
"rev": "66e3679ba3dd1412f47e08c52872b7583deff291",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "Hyprland",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hyprland-protocols": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"hyprland",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1671839510,
|
|
||||||
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprland-protocols",
|
|
||||||
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprland-protocols",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nekowinston-nur": {
|
"nekowinston-nur": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1676351500,
|
"lastModified": 1676351500,
|
||||||
|
|
@ -170,16 +128,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1675273418,
|
"lastModified": 1675940568,
|
||||||
"narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=",
|
"narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db",
|
"rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixpkgs-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -233,22 +191,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1675940568,
|
|
||||||
"narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1676895851,
|
"lastModified": 1676895851,
|
||||||
"narHash": "sha256-xdhBKw2el790G+88tZYpRWlP9VjQC9OLR5Jx84VPe08=",
|
"narHash": "sha256-xdhBKw2el790G+88tZYpRWlP9VjQC9OLR5Jx84VPe08=",
|
||||||
|
|
@ -264,7 +206,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1671271357,
|
"lastModified": 1671271357,
|
||||||
"narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
|
"narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
|
||||||
|
|
@ -280,7 +222,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1676549890,
|
"lastModified": 1676549890,
|
||||||
"narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=",
|
"narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=",
|
||||||
|
|
@ -316,7 +258,7 @@
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
"gitignore": "gitignore",
|
"gitignore": "gitignore",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -338,9 +280,8 @@
|
||||||
"darwin": "darwin",
|
"darwin": "darwin",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"hyprland": "hyprland",
|
|
||||||
"nekowinston-nur": "nekowinston-nur",
|
"nekowinston-nur": "nekowinston-nur",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"pre-commit-hooks": "pre-commit-hooks",
|
"pre-commit-hooks": "pre-commit-hooks",
|
||||||
|
|
@ -349,7 +290,7 @@
|
||||||
},
|
},
|
||||||
"sops": {
|
"sops": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -380,49 +321,6 @@
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"wlroots": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"host": "gitlab.freedesktop.org",
|
|
||||||
"lastModified": 1675374853,
|
|
||||||
"narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=",
|
|
||||||
"owner": "wlroots",
|
|
||||||
"repo": "wlroots",
|
|
||||||
"rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58",
|
|
||||||
"type": "gitlab"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"host": "gitlab.freedesktop.org",
|
|
||||||
"owner": "wlroots",
|
|
||||||
"repo": "wlroots",
|
|
||||||
"type": "gitlab"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"xdph": {
|
|
||||||
"inputs": {
|
|
||||||
"hyprland-protocols": [
|
|
||||||
"hyprland",
|
|
||||||
"hyprland-protocols"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"hyprland",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1673116118,
|
|
||||||
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
|
||||||
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,6 @@
|
||||||
# dev
|
# dev
|
||||||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
|
|
@ -30,7 +28,6 @@
|
||||||
darwin,
|
darwin,
|
||||||
flake-utils,
|
flake-utils,
|
||||||
home-manager,
|
home-manager,
|
||||||
hyprland,
|
|
||||||
nekowinston-nur,
|
nekowinston-nur,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-unstable,
|
nixpkgs-unstable,
|
||||||
|
|
@ -64,14 +61,12 @@
|
||||||
config = {
|
config = {
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
overlays
|
overlays
|
||||||
hyprland.outputs.overlays.default
|
|
||||||
];
|
];
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
sharedModules = [
|
sharedModules = [
|
||||||
sops.homeManagerModules.sops
|
sops.homeManagerModules.sops
|
||||||
hyprland.homeManagerModules.default
|
|
||||||
];
|
];
|
||||||
users.winston.imports = [./home];
|
users.winston.imports = [./home];
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
|
|
@ -102,8 +97,6 @@
|
||||||
backupFileExtension = "backup";
|
backupFileExtension = "backup";
|
||||||
sharedModules = [
|
sharedModules = [
|
||||||
sops.homeManagerModules.sops
|
sops.homeManagerModules.sops
|
||||||
# TODO: remove hyprland from darwin, I just need this to work right now
|
|
||||||
hyprland.homeManagerModules.default
|
|
||||||
];
|
];
|
||||||
users.winston.imports = [./home];
|
users.winston.imports = [./home];
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ in {
|
||||||
hyper = "Mod4+Mod1+Shift+Ctrl";
|
hyper = "Mod4+Mod1+Shift+Ctrl";
|
||||||
|
|
||||||
gopass = lib.getExe pkgs.gopass;
|
gopass = lib.getExe pkgs.gopass;
|
||||||
rofi = lib.getExe pkgs.rofi-wayland;
|
rofi = lib.getExe config.programs.rofi.package;
|
||||||
thunar = lib.getExe pkgs.xfce.thunar;
|
thunar = lib.getExe pkgs.xfce.thunar;
|
||||||
xargs = "${lib.getExe pkgs.findutils}/bin/xargs";
|
xargs = "${lib.getExe pkgs.findutils}/bin/xargs";
|
||||||
xdotool = lib.getExe pkgs.xdotool;
|
xdotool = lib.getExe pkgs.xdotool;
|
||||||
|
|
@ -266,7 +266,7 @@ in {
|
||||||
"${modMove}+9" = "move container to workspace $ws9; workspace $ws9";
|
"${modMove}+9" = "move container to workspace $ws9; workspace $ws9";
|
||||||
"${modMove}+0" = "move container to workspace $ws10; workspace $ws10";
|
"${modMove}+0" = "move container to workspace $ws10; workspace $ws10";
|
||||||
# rofi instead of drun
|
# rofi instead of drun
|
||||||
"${mod}+space" = "exec --no-startup-id ${lib.getExe pkgs.rofi-wayland} -show drun -dpi $dpi";
|
"${mod}+space" = "exec --no-startup-id ${lib.getExe config.programs.rofi.package} -show drun -dpi $dpi";
|
||||||
# 1password
|
# 1password
|
||||||
"${mod}+Shift+space" = "exec ${lib.getExe pkgs._1password-gui} --quick-access";
|
"${mod}+Shift+space" = "exec ${lib.getExe pkgs._1password-gui} --quick-access";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@ in {
|
||||||
|
|
||||||
programs.rofi = lib.mkIf isLinux {
|
programs.rofi = lib.mkIf isLinux {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.rofi-wayland;
|
|
||||||
font = "Berkeley Mono 14";
|
font = "Berkeley Mono 14";
|
||||||
extraConfig.icon-theme = "Papirus-Dark";
|
extraConfig.icon-theme = "Papirus-Dark";
|
||||||
terminal = "${lib.getExe pkgs.wezterm}";
|
terminal = "${lib.getExe pkgs.wezterm}";
|
||||||
|
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
// vim:ft=jsonc
|
|
||||||
{
|
|
||||||
"layer": "top",
|
|
||||||
"position": "top",
|
|
||||||
"height": 32,
|
|
||||||
"spacing": 4,
|
|
||||||
"modules-left": ["wlr/workspaces"],
|
|
||||||
"modules-center": [
|
|
||||||
"hyprland/window"
|
|
||||||
],
|
|
||||||
"modules-right": [
|
|
||||||
"tray",
|
|
||||||
"idle_inhibitor",
|
|
||||||
"pulseaudio",
|
|
||||||
"clock"
|
|
||||||
],
|
|
||||||
"wlr/workspaces": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"on-click": "activate",
|
|
||||||
"format-icons": {
|
|
||||||
"1": "Ⅰ",
|
|
||||||
"2": "Ⅱ",
|
|
||||||
"3": "Ⅲ",
|
|
||||||
"4": "Ⅳ",
|
|
||||||
"5": "Ⅴ",
|
|
||||||
"6": "Ⅵ",
|
|
||||||
"7": "Ⅶ",
|
|
||||||
"8": "Ⅷ",
|
|
||||||
"9": "Ⅸ",
|
|
||||||
"10": "Ⅹ"
|
|
||||||
},
|
|
||||||
"sort-by-number": true
|
|
||||||
},
|
|
||||||
"idle_inhibitor": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"format-icons": {
|
|
||||||
"activated": "",
|
|
||||||
"deactivated": "鈴"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tray": {
|
|
||||||
"spacing": 10
|
|
||||||
},
|
|
||||||
"pulseaudio": {
|
|
||||||
"format": "{icon} {volume}%",
|
|
||||||
"format-icons": {
|
|
||||||
"default": ["", "", ""]
|
|
||||||
},
|
|
||||||
"on-click": "pavucontrol"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
* {
|
|
||||||
font-family: Symbols Nerd Font, Berkeley Mono;
|
|
||||||
font-size: 16px;
|
|
||||||
color: #cdd6f4;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar {
|
|
||||||
background-color: #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
padding: 0 5px;
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button:hover {
|
|
||||||
background: #313244;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.active {
|
|
||||||
color: #f5c2e7;
|
|
||||||
background: #585b70;
|
|
||||||
box-shadow: inset 0 -3px #f5c2e7;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.urgent {
|
|
||||||
background-color: #f38ba8;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock,
|
|
||||||
#network,
|
|
||||||
#pulseaudio,
|
|
||||||
#tray,
|
|
||||||
#idle_inhibitor {
|
|
||||||
padding: 0 10px;
|
|
||||||
}
|
|
||||||
|
|
@ -1,149 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
flakePath,
|
|
||||||
inputs,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
|
||||||
nvidiaPrefix = "GDM_BACKEND=nvidia-drm LIBVA_DRIVER_NAME=nvidia __GLX_VENDOR_LIBRARY_NAME=nvidia WLR_NO_HARDWARE_CURSORS=1";
|
|
||||||
waylandPrefix = "XDG_SESSION_TYPE=wayland NIXOS_OZONE_WL=1";
|
|
||||||
waybarLauncher = pkgs.writeShellScriptBin "waybar-launcher" (let
|
|
||||||
killall = lib.getExe pkgs.killall;
|
|
||||||
inotifywait = pkgs.inotify-tools + "/bin/inotifywait";
|
|
||||||
in ''
|
|
||||||
#!/bin/sh
|
|
||||||
trap "${killall} .waybar-wrapped" EXIT
|
|
||||||
while true; do
|
|
||||||
waybar &
|
|
||||||
${inotifywait} -e create,modify "$HOME/.config/waybar/config" "$HOME/.config/waybar/style.css"
|
|
||||||
${killall} .waybar-wrapped
|
|
||||||
done
|
|
||||||
'');
|
|
||||||
in {
|
|
||||||
home.shellAliases = lib.mkIf isLinux {
|
|
||||||
"Hyprland" = "${nvidiaPrefix} ${waylandPrefix} Hyprland";
|
|
||||||
"sway" = "${nvidiaPrefix} ${waylandPrefix} sway";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.waybar = lib.mkIf isLinux {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.waybar-hyprland;
|
|
||||||
};
|
|
||||||
|
|
||||||
wayland = lib.mkIf isLinux {
|
|
||||||
windowManager = {
|
|
||||||
sway = {
|
|
||||||
enable = true;
|
|
||||||
extraOptions = ["--unsupported-gpu"];
|
|
||||||
config = {
|
|
||||||
modifier = "Mod4";
|
|
||||||
keybindings = let
|
|
||||||
modifier = config.wayland.windowManager.sway.config.modifier;
|
|
||||||
in
|
|
||||||
lib.mkOptionDefault {
|
|
||||||
"${modifier}+Shift+Return" = "exec ${lib.getExe pkgs.wezterm}-gui";
|
|
||||||
"${modifier}+Shift+q" = "kill";
|
|
||||||
"${modifier}+space" = "exec ${lib.getExe pkgs.rofi-wayland} -show drun";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
hyprland = {
|
|
||||||
enable = true;
|
|
||||||
nvidiaPatches = true;
|
|
||||||
xwayland = {
|
|
||||||
enable = true;
|
|
||||||
hidpi = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
xdg = lib.mkIf isLinux {
|
|
||||||
configFile."waybar" = {
|
|
||||||
source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/waybar";
|
|
||||||
recursive = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
configFile."hypr/hyprland.conf".text = let
|
|
||||||
playerctl = lib.getExe pkgs.playerctl;
|
|
||||||
wpctl = pkgs.wireplumber + "/bin/wpctl";
|
|
||||||
in ''
|
|
||||||
monitor = ,5120x2160@72,0x0,1.5
|
|
||||||
|
|
||||||
input:follow_mouse = 1
|
|
||||||
|
|
||||||
general {
|
|
||||||
gaps_in = 0
|
|
||||||
gaps_out = 0
|
|
||||||
border_size = 2
|
|
||||||
no_cursor_warps = true
|
|
||||||
col.active_border = 0xfff5c2e7
|
|
||||||
col.inactive_border = 0x80cba6f7
|
|
||||||
}
|
|
||||||
|
|
||||||
decoration {
|
|
||||||
rounding = 0
|
|
||||||
blur = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
animations {
|
|
||||||
enabled = 1
|
|
||||||
animation = workspaces,1,1,default,slide
|
|
||||||
}
|
|
||||||
|
|
||||||
misc {
|
|
||||||
disable_hyprland_logo = true
|
|
||||||
disable_splash_rendering = true
|
|
||||||
}
|
|
||||||
|
|
||||||
bind = SUPER_SHIFT,return,exec,wezterm
|
|
||||||
bind = SUPER_SHIFT,q,killactive,
|
|
||||||
bind = SUPER_SHIFT,M,exit,
|
|
||||||
bind = SUPER_SHIFT,d,togglefloating,
|
|
||||||
bind = SUPER,space,exec,rofi -show drun
|
|
||||||
|
|
||||||
bind = SUPER_CTRL,l,movefocus,l
|
|
||||||
bind = SUPER_CTRL,h,movefocus,r
|
|
||||||
bind = SUPER_CTRL,k,movefocus,u
|
|
||||||
bind = SUPER_CTRL,j,movefocus,d
|
|
||||||
bind = SUPER_SHIFT,h,movewindow,l
|
|
||||||
bind = SUPER_SHIFT,l,movewindow,r
|
|
||||||
bind = SUPER_SHIFT,j,movewindow,u
|
|
||||||
bind = SUPER_SHIFT,k,movewindow,d
|
|
||||||
|
|
||||||
bind = SUPER_CTRL,1,workspace,1
|
|
||||||
bind = SUPER_CTRL,2,workspace,2
|
|
||||||
bind = SUPER_CTRL,3,workspace,3
|
|
||||||
bind = SUPER_CTRL,4,workspace,4
|
|
||||||
bind = SUPER_CTRL,5,workspace,5
|
|
||||||
bind = SUPER_CTRL,6,workspace,6
|
|
||||||
bind = SUPER_CTRL,7,workspace,7
|
|
||||||
bind = SUPER_CTRL,8,workspace,8
|
|
||||||
bind = SUPER_CTRL,9,workspace,9
|
|
||||||
bind = SUPER_CTRL,0,workspace,10
|
|
||||||
|
|
||||||
bind = SUPER_SHIFT,1,movetoworkspace,1
|
|
||||||
bind = SUPER_SHIFT,2,movetoworkspace,2
|
|
||||||
bind = SUPER_SHIFT,3,movetoworkspace,3
|
|
||||||
bind = SUPER_SHIFT,4,movetoworkspace,4
|
|
||||||
bind = SUPER_SHIFT,5,movetoworkspace,5
|
|
||||||
bind = SUPER_SHIFT,6,movetoworkspace,6
|
|
||||||
bind = SUPER_SHIFT,7,movetoworkspace,7
|
|
||||||
bind = SUPER_SHIFT,8,movetoworkspace,8
|
|
||||||
bind = SUPER_SHIFT,9,movetoworkspace,9
|
|
||||||
bind = SUPER_SHIFT,0,movetoworkspace,10
|
|
||||||
|
|
||||||
bindm = SUPER,mouse:272,movewindow
|
|
||||||
bindm = SUPER,mouse:273,resizewindow
|
|
||||||
|
|
||||||
binde = ,XF86AudioRaiseVolume,exec,${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.0
|
|
||||||
binde = ,XF86AudioLowerVolume,exec,${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%- -l 1.0
|
|
||||||
bind = ,XF86AudioMute,exec,${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle
|
|
||||||
bind = ,XF86AudioNext,exec,${playerctl} next
|
|
||||||
bind = ,XF86AudioPrev,exec,${playerctl} previous
|
|
||||||
bind = ,XF86AudioPause,exec,${playerctl} play-pause
|
|
||||||
exec-once = ${waybarLauncher}/bin/waybar-launcher
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -21,7 +21,6 @@ in {
|
||||||
./apps/newsboat.nix
|
./apps/newsboat.nix
|
||||||
./apps/rice.nix
|
./apps/rice.nix
|
||||||
./apps/vscode.nix
|
./apps/vscode.nix
|
||||||
./apps/wayland.nix
|
|
||||||
./apps/wezterm.nix
|
./apps/wezterm.nix
|
||||||
./apps/zsh.nix
|
./apps/zsh.nix
|
||||||
./secrets/sops.nix
|
./secrets/sops.nix
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://catppuccin.cachix.org"
|
"https://catppuccin.cachix.org"
|
||||||
"https://hyprland.cachix.org"
|
|
||||||
"https://mic92.cachix.org"
|
"https://mic92.cachix.org"
|
||||||
"https://nekowinston.cachix.org"
|
"https://nekowinston.cachix.org"
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
|
|
@ -14,7 +13,6 @@
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU="
|
"catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU="
|
||||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
|
||||||
"mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
|
"mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
|
||||||
"nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs="
|
"nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs="
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue