hyprlan canges, added i3wm
This commit is contained in:
parent
626212480f
commit
ae11df6b2e
9 changed files with 64 additions and 10 deletions
|
@ -23,10 +23,10 @@
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
# boot.kernelModules = [ "v4l2loopback" ];
|
# boot.kernelModules = [ "v4l2loopback" ];
|
||||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
boot.kernelPackages = pkgs.linuxPackages_xanmod_stable;
|
||||||
# boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
|
# boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
|
||||||
# services.picom.enable = true;
|
# services.picom.enable = true;
|
||||||
services.emacs.enable = true;
|
# services.emacs.enable = true;
|
||||||
modules = {
|
modules = {
|
||||||
other = {
|
other = {
|
||||||
system = {
|
system = {
|
||||||
|
@ -40,6 +40,9 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
wms = {
|
wms = {
|
||||||
|
x = {
|
||||||
|
i3.enable = false;
|
||||||
|
};
|
||||||
wayland = {
|
wayland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
hyprland.enable = true;
|
hyprland.enable = true;
|
||||||
|
|
|
@ -115,7 +115,6 @@ in {
|
||||||
misc = {
|
misc = {
|
||||||
drm.enable = true;
|
drm.enable = true;
|
||||||
disableWebgl = true;
|
disableWebgl = true;
|
||||||
startPageURL = "file://${builtins.readFile ./chevron/index.html}";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -24,7 +24,7 @@ in {
|
||||||
fish.enable = true;
|
fish.enable = true;
|
||||||
dunst.enable = false;
|
dunst.enable = false;
|
||||||
emacs.enable = true;
|
emacs.enable = true;
|
||||||
firefox.enable = true;
|
firefox.enable = false;
|
||||||
kitty.enable = true;
|
kitty.enable = true;
|
||||||
lazygit.enable = true;
|
lazygit.enable = true;
|
||||||
rofi.enable = true;
|
rofi.enable = true;
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
_: {imports = [./wayland];}
|
_: {imports = [./wayland ./x];}
|
||||||
|
|
|
@ -59,7 +59,7 @@ in {
|
||||||
"HDMI-A-2,1920x1080,1920x0,1"
|
"HDMI-A-2,1920x1080,1920x0,1"
|
||||||
"HDMI-A-1,1920x1080,3840x0,1"
|
"HDMI-A-1,1920x1080,3840x0,1"
|
||||||
# Had the shadow monitor bug, so had to disable all unknown monitors.
|
# Had the shadow monitor bug, so had to disable all unknown monitors.
|
||||||
# "Unknown-1,disable"
|
"Unknown-1,disable"
|
||||||
];
|
];
|
||||||
# Workspace config
|
# Workspace config
|
||||||
workspace = [
|
workspace = [
|
||||||
|
@ -155,7 +155,7 @@ in {
|
||||||
];
|
];
|
||||||
# Hyprland anomations, using the above bezier curves
|
# Hyprland anomations, using the above bezier curves
|
||||||
animations = {
|
animations = {
|
||||||
enabled = true;
|
enabled = false;
|
||||||
animation = [
|
animation = [
|
||||||
"windows, 1, 4, dupa, popin"
|
"windows, 1, 4, dupa, popin"
|
||||||
"windowsOut, 1, 4, dupa, slide"
|
"windowsOut, 1, 4, dupa, slide"
|
||||||
|
@ -222,6 +222,12 @@ in {
|
||||||
"$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
|
"$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
|
||||||
"$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
|
"$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
|
||||||
"$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
|
"$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
|
||||||
|
|
||||||
|
# Move Windows
|
||||||
|
"$mainMod SHIFT, H, movewindow, left"
|
||||||
|
"$mainMod SHIFT, J, movewindow, down"
|
||||||
|
"$mainMod SHIFT, K, movewindow, up"
|
||||||
|
"$mainMod SHIFT, L, movewindow, right"
|
||||||
# Screenshotting
|
# Screenshotting
|
||||||
"$mainMod, S, exec, ${pkgs.grimblast}/bin/grimblast copy area"
|
"$mainMod, S, exec, ${pkgs.grimblast}/bin/grimblast copy area"
|
||||||
# File manager
|
# File manager
|
||||||
|
@ -300,7 +306,7 @@ in {
|
||||||
# and run it all again
|
# and run it all again
|
||||||
"[workspace special:btop;silent;tile] ${foot}/bin/foot ${pkgs.btop}/bin/btop"
|
"[workspace special:btop;silent;tile] ${foot}/bin/foot ${pkgs.btop}/bin/btop"
|
||||||
|
|
||||||
"[workspace special:pipewire silent;tile] ${pkgs.helvum}/bin/helvum"
|
# "[workspace special:pipewire silent;tile] ${pkgs.helvum}/bin/helvum"
|
||||||
"[workspace special:pipewire;silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol"
|
"[workspace special:pipewire;silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol"
|
||||||
# "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"
|
# "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"
|
||||||
];
|
];
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
_: {
|
||||||
|
imports = [./i3];
|
||||||
|
}
|
3
modules/wms/x/i3/default.nix
Normal file
3
modules/wms/x/i3/default.nix
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
_: {
|
||||||
|
imports = [./i3.nix];
|
||||||
|
}
|
40
modules/wms/x/i3/i3.nix
Normal file
40
modules/wms/x/i3/i3.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
username = config.modules.other.system.username;
|
||||||
|
cfg = config.modules.wms.x.i3;
|
||||||
|
in {
|
||||||
|
options.modules.wms.x.i3.enable = lib.mkEnableOption "i3";
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
xdg.portal = {
|
||||||
|
enable = true;
|
||||||
|
extraPortals = [
|
||||||
|
pkgs.xdg-desktop-portal-gtk
|
||||||
|
];
|
||||||
|
config.common.default = "*";
|
||||||
|
};
|
||||||
|
services = {
|
||||||
|
xserver = {
|
||||||
|
enable = true;
|
||||||
|
xkb.layout = "de";
|
||||||
|
desktopManager.xterm.enable = false;
|
||||||
|
windowManager.i3.enable = true;
|
||||||
|
displayManager = {
|
||||||
|
lightdm.enable = true;
|
||||||
|
defaultSession = "none+i3";
|
||||||
|
setupCommands = "${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
home-manager.users.${username} = {
|
||||||
|
xsession.windowManager.i3 = {
|
||||||
|
# enable = false;
|
||||||
|
# package = pkgs.i3-gaps;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -7,7 +7,7 @@
|
||||||
services.xserver.videoDrivers = ["nvidia"];
|
services.xserver.videoDrivers = ["nvidia"];
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# package = pkgs-unstable.mesa.drivers;
|
package = pkgs.mesa.drivers;
|
||||||
driSupport = true;
|
driSupport = true;
|
||||||
driSupport32Bit = true;
|
driSupport32Bit = true;
|
||||||
};
|
};
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
powerManagement.enable = false;
|
powerManagement.enable = false;
|
||||||
powerManagement.finegrained = false;
|
powerManagement.finegrained = false;
|
||||||
nvidiaSettings = false;
|
nvidiaSettings = false;
|
||||||
#package = config.boot.kernelPackages.nvidiaPackages.beta;
|
# package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
|
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
|
||||||
version = "555.42.02";
|
version = "555.42.02";
|
||||||
sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
|
sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue