WIP
This commit is contained in:
parent
d24e46da9e
commit
6e878f2ee3
7 changed files with 116 additions and 17 deletions
|
|
@ -78,9 +78,15 @@
|
|||
|
||||
networking.hostName = "Tibo-NixDesk";
|
||||
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "altgr-intl";
|
||||
services = {
|
||||
xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "altgr-intl";
|
||||
};
|
||||
|
||||
openvpn.servers = {
|
||||
tryHackMeVPN = { config = '' config /root/nixos/openvpn/tryHackMeVPN-tdpeuter.conf ''; };
|
||||
};
|
||||
};
|
||||
|
||||
system.stateVersion = "24.05";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,31 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, pkgs-unstable, system, ... }:
|
||||
|
||||
let
|
||||
cfg = config.sisyphus.desktop.hyprland;
|
||||
|
||||
inherit (pkgs-unstable.hyprlandPlugins.hy3) version;
|
||||
|
||||
# Make hyprland package follow latest release of Hy3
|
||||
hyprland = pkgs-unstable.hyprland.overrideAttrs (old: {
|
||||
version = "0.52.0";
|
||||
src = pkgs-unstable.fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "Hyprland";
|
||||
fetchSubmodules = true;
|
||||
rev = "f56ec180d3a03a5aa978391249ff8f40f949fb73";
|
||||
hash = "sha256-aZCTbfKkxsEinY5V7R0NYuuitKLYc8ig8T91+yDMGJ0=";
|
||||
};
|
||||
});
|
||||
|
||||
hy3 = pkgs-unstable.hyprlandPlugins.hy3.overrideAttrs (old: {
|
||||
version = "hl0.52.0";
|
||||
src = pkgs-unstable.fetchFromGitHub {
|
||||
owner = "outfoxxed";
|
||||
repo = "hy3";
|
||||
rev = "16dae4d8f853b0d3e8434ee9941f9fc0155b8952";
|
||||
hash = "sha256-UeMEUlQsil5DEtF/VQ//41vXJF9ff2xjoYVjhR6dqu4=";
|
||||
};
|
||||
});
|
||||
in {
|
||||
options.sisyphus.desktop.hyprland.enable = lib.mkEnableOption "Hyprland";
|
||||
|
||||
|
|
@ -15,7 +39,7 @@ in {
|
|||
SCRIPT_DIR = ../../../../scripts;
|
||||
};
|
||||
|
||||
systemPackages = with pkgs; [
|
||||
systemPackages = (with pkgs; [
|
||||
brightnessctl
|
||||
dunst
|
||||
libnotify
|
||||
|
|
@ -27,8 +51,6 @@ in {
|
|||
wl-mirror # Mirror an output
|
||||
wdisplays # Tool to configure displays
|
||||
|
||||
hyprlandPlugins.hy3 # i3/sway layout plugin
|
||||
|
||||
swaylock
|
||||
|
||||
glib
|
||||
|
|
@ -39,11 +61,14 @@ in {
|
|||
jq
|
||||
j4-dmenu-desktop
|
||||
rofi
|
||||
]) ++ [
|
||||
hy3 # i3/sway layout plugin
|
||||
];
|
||||
};
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
package = hyprland;
|
||||
xwayland.enable = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,13 @@ in {
|
|||
options.sisyphus.networking.networkmanager.enable = lib.mkEnableOption "NetworkManager";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
networking.networkmanager.enable = true;
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
|
||||
plugins = with pkgs; [
|
||||
networkmanager-openvpn
|
||||
];
|
||||
};
|
||||
|
||||
# Prevent slow boot times
|
||||
systemd.services.NetworkManager-wait-online.enable = false;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
# TODO Do not hardcode this path
|
||||
plugin = /nix/store/afivj8v5kfdsadxs4pa45vh0y65s3ajm-hy3-hl0.49.0/lib/libhy3.so
|
||||
#plugin = /nix/store/afivj8v5kfdsadxs4pa45vh0y65s3ajm-hy3-hl0.49.0/lib/libhy3.so
|
||||
plugin = /nix/store/fvy4gwas10pvww67gxc3da08kn2w3pm7-hy3-0.51.0/lib/libhy3.so
|
||||
|
||||
general:layout = hy3
|
||||
|
||||
|
|
|
|||
|
|
@ -85,9 +85,6 @@ animations {
|
|||
}
|
||||
|
||||
gestures {
|
||||
workspace_swipe = true
|
||||
workspace_swipe_fingers = 3
|
||||
workspace_swipe_min_fingers = false
|
||||
workspace_swipe_distance = 300
|
||||
workspace_swipe_invert = true
|
||||
workspace_swipe_min_speed_to_force = 30
|
||||
|
|
@ -103,6 +100,8 @@ gestures {
|
|||
workspace_swipe_forever = true
|
||||
|
||||
workspace_swipe_use_r = false
|
||||
|
||||
#close_max_timeout = 1000
|
||||
}
|
||||
|
||||
group {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,57 @@
|
|||
# Resizing
|
||||
$mode_resize = Resize
|
||||
bind = $flag, R, submap, $mode_resize
|
||||
submap = $mode_resize
|
||||
|
||||
bind = , $right, resizeactive, 10 0
|
||||
bind = , $up, resizeactive, 0 -10
|
||||
bind = , $left, resizeactive, -10 0
|
||||
bind = , $down, resizeactive, 0 10
|
||||
|
||||
bind = , Right , resizeactive, 10 0
|
||||
bind = , Up, resizeactive, 0 -10
|
||||
bind = , Left, resizeactive, -10 0
|
||||
bind = , Down, resizeactive, 0 10
|
||||
|
||||
bind = Shift, $right, resizeactive, 50 0
|
||||
bind = Shift, $up, resizeactive, 0 -50
|
||||
bind = Shift, $left, resizeactive, -50 0
|
||||
bind = Shift, $down, resizeactive, 0 50
|
||||
|
||||
bind = Shift, Right , resizeactive, 50 0
|
||||
bind = Shift, Up, resizeactive, 0 -50
|
||||
bind = Shift, Left, resizeactive, -50 0
|
||||
bind = Shift, Down, resizeactive, 0 50
|
||||
|
||||
bind = $flag, $right, moveactive, 10 0
|
||||
bind = $flag, $up, moveactive, 0 -10
|
||||
bind = $flag, $left, moveactive, -10 0
|
||||
bind = $flag, $down, moveactive, 0 10
|
||||
|
||||
bind = $flag, Right , moveactive, 10 0
|
||||
bind = $flag, Up, moveactive, 0 -10
|
||||
bind = $flag, Left, moveactive, -10 0
|
||||
bind = $flag, Down, moveactive, 0 10
|
||||
|
||||
bind = $flag+Shift, $right, moveactive, 50 0
|
||||
bind = $flag+Shift, $up, moveactive, 0 -50
|
||||
bind = $flag+Shift, $left, moveactive, -50 0
|
||||
bind = $flag+Shift, $down, moveactive, 0 50
|
||||
|
||||
bind = $flag+Shift, Right , moveactive, 50 0
|
||||
bind = $flag+Shift, Up, moveactive, 0 -50
|
||||
bind = $flag+Shift, Left, moveactive, -50 0
|
||||
bind = $flag+Shift, Down, moveactive, 0 50
|
||||
|
||||
gesture = 3, swipe, move
|
||||
gesture = 4, swipe, resize
|
||||
|
||||
bind = $flag, R, submap, reset
|
||||
bind = , Escape, submap, reset
|
||||
bind = , Return, submap, reset
|
||||
|
||||
submap = reset
|
||||
|
||||
# System actions
|
||||
$mode_system = System (l)ock, (s)leep, (h)ibernate, (r)eboot, (Shift+s)hutdown
|
||||
bind = Ctrl+Alt, Delete, submap, $mode_system
|
||||
|
|
@ -36,3 +90,11 @@ bind = , Return, submap, reset
|
|||
|
||||
submap = reset
|
||||
|
||||
# Ignore (all) keybinds. Useful when working with Virtual Machines.
|
||||
$mode_ignore=Ignore keybinds - Press Control+Alt+Insert to escape.
|
||||
bind = Ctrl+Alt, Insert, submap, $mode_ignore
|
||||
submap = $mode_ignore
|
||||
|
||||
bind = Ctrl+Alt, Insert, submap, reset
|
||||
|
||||
submap = reset
|
||||
|
|
|
|||
|
|
@ -23,18 +23,17 @@
|
|||
],
|
||||
"include": [
|
||||
"~/.config/waybar/modules.json"
|
||||
]
|
||||
],
|
||||
"start_hidden": true
|
||||
},
|
||||
|
||||
/* Toggle this bar, contains all information */
|
||||
{
|
||||
"name": "toggle",
|
||||
"mode": "hide",
|
||||
"ipc": true,
|
||||
"position": "top",
|
||||
"height": 26,
|
||||
/* Show this bar on top of the other one, seemingly replacing it. */
|
||||
"margin": "-26px 0 0 0",
|
||||
/*"margin": "-26px 0 0 0",*/
|
||||
"modules-left": [
|
||||
"custom/meta",
|
||||
"sway/window",
|
||||
|
|
@ -59,6 +58,7 @@
|
|||
],
|
||||
"include": [
|
||||
"~/.config/waybar/modules.json"
|
||||
]
|
||||
],
|
||||
"reload_style_on_change": true
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue