Compare commits
No commits in common. "7f162f934c49c7138749eb648c600f34167c175f" and "81b1d99ff557f64b44f118ab76d6de4009bc326b" have entirely different histories.
7f162f934c
...
81b1d99ff5
2 changed files with 134 additions and 142 deletions
36
flake.lock
36
flake.lock
|
|
@ -174,11 +174,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729847607,
|
"lastModified": 1729735549,
|
||||||
"narHash": "sha256-a5CwSoNGyQAyg13i+WfvVREUouoBKYeqsAZAnxfqeuQ=",
|
"narHash": "sha256-qOUGh+hC6w9POe04HTjwcKJccjmKsGfmlWEL32NTlr0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "8585c0d7f7b5efa704112bbfc6310cebacb94e69",
|
"rev": "4887992a11388734b4900f3d16892999b54849ff",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -437,11 +437,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729848063,
|
"lastModified": 1729551526,
|
||||||
"narHash": "sha256-1uGIPOSJq4IzoDvgfOF6A3sw5it1WX3ZdYl2+jCkjv8=",
|
"narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "c77c3bb23390a9ba91860e721edde54856fc5f7a",
|
"rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -461,11 +461,11 @@
|
||||||
"spectrum": "spectrum"
|
"spectrum": "spectrum"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729726792,
|
"lastModified": 1729646324,
|
||||||
"narHash": "sha256-ndjFy5kfhn9MoOOSzGnZ7f2FwRUUY1EJYwXGxK8DzsQ=",
|
"narHash": "sha256-tQOYDfaoetPZSi56dej5zCsSsxPhmV+vWxuW3vWeg60=",
|
||||||
"owner": "astro",
|
"owner": "astro",
|
||||||
"repo": "microvm.nix",
|
"repo": "microvm.nix",
|
||||||
"rev": "ef42cfface9940b9ce9614307670b60cdbda33f6",
|
"rev": "21c36d162ba8127377ce7dee234bdc99b9af0dde",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -580,11 +580,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729691686,
|
"lastModified": 1729449015,
|
||||||
"narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
|
"narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
|
"rev": "89172919243df199fe237ba0f776c3e3e3d72367",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -710,11 +710,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729823394,
|
"lastModified": 1729736953,
|
||||||
"narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=",
|
"narHash": "sha256-Rb6JUop7NRklg0uzcre+A+Ebrn/ZiQPkm4QdKg6/3pw=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f",
|
"rev": "29b1275740d9283467b8117499ec8cbb35250584",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -731,11 +731,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_3"
|
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729775275,
|
"lastModified": 1729695320,
|
||||||
"narHash": "sha256-J2vtHq9sw1wWm0aTMXpEEAzsVCUMZDTEe5kiBYccpLE=",
|
"narHash": "sha256-Fm4cGAlaDwekQvYX0e6t0VjT6YJs3fRXtkyuE4/NzzU=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "78a0e634fc8981d6b564f08b6715c69a755c4c7d",
|
"rev": "d089e742fb79259b9c4dd9f18e9de1dd4fa3c1ec",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,165 +1,157 @@
|
||||||
{
|
{ config, lib, ... }:
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.eboskma.programs.hyprland;
|
cfg = config.eboskma.programs.hyprland;
|
||||||
terminal = "${pkgs.foot}/bin/footclient";
|
|
||||||
dmenu = "${pkgs.rofi}/bin/rofi -show drun -no-lazy-grab";
|
|
||||||
menu = "${pkgs.rofi}/bin/rofi -show run -no-lazy-grab";
|
|
||||||
rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ../sway/powermenu.sh);
|
|
||||||
powerMenu = "${rofiPower}/bin/rofi-power";
|
|
||||||
swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${../../../wallpapers/river-2560.png} --scaling fill";
|
|
||||||
in
|
in
|
||||||
|
# terminal = "${pkgs.foot}/bin/footclient";
|
||||||
|
# dmenu = "${pkgs.rofi}/bin/rofi -show drun -no-lazy-grab";
|
||||||
|
# menu = "${pkgs.rofi}/bin/rofi -show run -no-lazy-grab";
|
||||||
|
# rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ../sway/powermenu.sh);
|
||||||
|
# powerMenu = "${rofiPower}/bin/rofi-power";
|
||||||
|
# swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${../../../wallpapers/river-2560.png} --scaling fill";
|
||||||
{
|
{
|
||||||
options.eboskma.programs.hyprland = {
|
options.eboskma.programs.hyprland = {
|
||||||
enable = mkEnableOption "Hyprland";
|
enable = mkEnableOption "Hyprland";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
wayland.windowManager.hyprland = {
|
# wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
|
|
||||||
settings = {
|
# extraConfig = ''
|
||||||
monitor = "DP-2,2560x1440@165,0x0,1";
|
# monitor = DP-2,2560x1440@165,0x0,1
|
||||||
|
|
||||||
general = {
|
# general {
|
||||||
gaps_out = 10;
|
# gaps_out = 10
|
||||||
};
|
# }
|
||||||
|
|
||||||
decoration = {
|
# decoration {
|
||||||
rounding = 5;
|
# rounding = 5
|
||||||
inactive_opacity = 0.9;
|
# inactive_opacity = 0.9
|
||||||
dim_inactive = true;
|
# dim_inactive = true
|
||||||
dim_strength = 0.5;
|
# dim_strength = 0.5
|
||||||
};
|
# }
|
||||||
|
|
||||||
animations = [
|
# animations {
|
||||||
"workspaces,1,3,default"
|
# animation = workspaces,1,3,default
|
||||||
"windows,1,3,default"
|
# animation = windows,1,3,default
|
||||||
"windowsOut,1,3,default"
|
# animation = windowsOut,1,3,default
|
||||||
];
|
# }
|
||||||
|
|
||||||
input = {
|
# input {
|
||||||
kb_layout = "us";
|
# kb_layout = us
|
||||||
kb_options = "lv3:ralt_switch,eurosign:5";
|
# kb_options = lv3:ralt_switch,eurosign:5
|
||||||
natural_scroll = true;
|
# natural_scroll = true
|
||||||
};
|
# }
|
||||||
|
|
||||||
misc = {
|
# misc {
|
||||||
no_vfr = false;
|
# no_vfr = false
|
||||||
focus_on_activate = false;
|
# focus_on_activate = false
|
||||||
};
|
# }
|
||||||
|
|
||||||
binds = {
|
# binds {
|
||||||
workspace_back_and_forth = true;
|
# workspace_back_and_forth = true
|
||||||
};
|
# }
|
||||||
|
|
||||||
"$mod" = "SUPER";
|
# $mod = SUPER
|
||||||
|
|
||||||
bind =
|
# bind = $mod,Return,exec,${terminal}
|
||||||
[
|
# bind = $mod_SHIFT,Q,killactive
|
||||||
"$mod,Return,exec,${terminal}"
|
# bind = $mod,S,exec,${dmenu}
|
||||||
"$mod_SHIFT,Q,killactive"
|
# bind = $mod_SHIFT,S,exec,${menu}
|
||||||
"$mod,S,exec,${dmenu}"
|
|
||||||
"$mod_SHIFT,S,exec,${menu}"
|
|
||||||
|
|
||||||
"$mod,N,movefocus,l"
|
# bind = $mod,N,movefocus,l
|
||||||
"$mod,E,movefocus,d"
|
# bind = $mod,E,movefocus,d
|
||||||
"$mod,I,movefocus,u"
|
# bind = $mod,I,movefocus,u
|
||||||
"$mod,O,movefocus,r"
|
# bind = $mod,O,movefocus,r
|
||||||
|
|
||||||
"$mod_SHIFT,N,movewindow,l"
|
# bind = $mod_SHIFT,N,movewindow,l
|
||||||
"$mod_SHIFT,E,movewindow,d"
|
# bind = $mod_SHIFT,E,movewindow,d
|
||||||
"$mod_SHIFT,O,movewindow,r"
|
# bind = $mod_SHIFT,O,movewindow,r
|
||||||
"$mod_SHIFT,I,movewindow,u"
|
# bind = $mod_SHIFT,I,movewindow,u
|
||||||
|
|
||||||
"$mod_SHIFT,Space,togglefloating,active"
|
# bind = $mod_SHIFT,Space,togglefloating,active
|
||||||
|
|
||||||
"$mod,T,fullscreen,0"
|
# bind = $mod,T,fullscreen,0
|
||||||
"$mod_SHIFT,T,fullscreen,1"
|
# bind = $mod_SHIFT,T,fullscreen,1
|
||||||
|
|
||||||
"$mod,1,workspace,1"
|
# bind = $mod,1,workspace,1
|
||||||
"$mod,2,workspace,2"
|
# bind = $mod,2,workspace,2
|
||||||
"$mod,3,workspace,3"
|
# bind = $mod,3,workspace,3
|
||||||
"$mod,4,workspace,4"
|
# bind = $mod,4,workspace,4
|
||||||
"$mod,5,workspace,5"
|
# bind = $mod,5,workspace,5
|
||||||
"$mod,6,workspace,6"
|
# bind = $mod,6,workspace,6
|
||||||
"$mod,7,workspace,7"
|
# bind = $mod,7,workspace,7
|
||||||
"$mod,8,workspace,8"
|
# bind = $mod,8,workspace,8
|
||||||
"$mod,9,workspace,9"
|
# bind = $mod,9,workspace,9
|
||||||
"$mod,0,workspace,10"
|
# bind = $mod,0,workspace,10
|
||||||
|
|
||||||
"$mod_SHIFT,1,movetoworkspacesilent,1"
|
# bind = $mod_SHIFT,1,movetoworkspacesilent,1
|
||||||
"$mod_SHIFT,2,movetoworkspacesilent,2"
|
# bind = $mod_SHIFT,2,movetoworkspacesilent,2
|
||||||
"$mod_SHIFT,3,movetoworkspacesilent,3"
|
# bind = $mod_SHIFT,3,movetoworkspacesilent,3
|
||||||
"$mod_SHIFT,4,movetoworkspacesilent,4"
|
# bind = $mod_SHIFT,4,movetoworkspacesilent,4
|
||||||
"$mod_SHIFT,5,movetoworkspacesilent,5"
|
# bind = $mod_SHIFT,5,movetoworkspacesilent,5
|
||||||
"$mod_SHIFT,6,movetoworkspacesilent,6"
|
# bind = $mod_SHIFT,6,movetoworkspacesilent,6
|
||||||
"$mod_SHIFT,7,movetoworkspacesilent,7"
|
# bind = $mod_SHIFT,7,movetoworkspacesilent,7
|
||||||
"$mod_SHIFT,8,movetoworkspacesilent,8"
|
# bind = $mod_SHIFT,8,movetoworkspacesilent,8
|
||||||
"$mod_SHIFT,9,movetoworkspacesilent,9"
|
# bind = $mod_SHIFT,9,movetoworkspacesilent,9
|
||||||
"$mod_SHIFT,0,movetoworkspacesilent,10"
|
# bind = $mod_SHIFT,0,movetoworkspacesilent,10
|
||||||
|
|
||||||
"$mod_SHIFT,Minus,movetoworkspacesilent,special"
|
# bind = $mod_SHIFT,Minus,movetoworkspacesilent,special
|
||||||
"$mod,Minus,togglespecialworkspace"
|
# bind = $mod,Minus,togglespecialworkspace
|
||||||
|
|
||||||
"$mod_SHIFT,C,exec,${config.wayland.windowManager.hyprland.package}/bin/hyprctl reload"
|
# bind = $mod_SHIFT,C,exec,${config.wayland.windowManager.hyprland.package}/bin/hyprctl reload
|
||||||
|
|
||||||
"$mod_SHIFT,F,exec,${powerMenu}"
|
# bind = $mod_SHIFT,F,exec,${powerMenu}
|
||||||
"$mod,L,exec,${swaylockcmd}"
|
# bind = $mod,L,exec,${swaylockcmd}
|
||||||
|
|
||||||
"$mod_SHIFT,K,pin"
|
# bind = $mod_SHIFT,K,pin
|
||||||
|
|
||||||
"$mod,Print,exec,${pkgs.grim}/bin/grim"
|
# bind = $mod,Print,exec,${pkgs.grim}/bin/grim
|
||||||
"$mod_SHIFT,Print,exec,${pkgs.grim}/bin/grim | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png -f"
|
# bind = $mod_SHIFT,Print,exec,${pkgs.grim}/bin/grim | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png -f
|
||||||
|
|
||||||
",XF86AudioRaiseVolume,exec,${pkgs.pamedia}/bin/pamedia up"
|
# bind = ,XF86AudioRaiseVolume,exec,${pkgs.pamedia}/bin/pamedia up
|
||||||
",XF86AudioLowerVolume,exec,${pkgs.pamedia}/bin/pamedia down"
|
# bind = ,XF86AudioLowerVolume,exec,${pkgs.pamedia}/bin/pamedia down
|
||||||
",XF86AudioMute,exec,${pkgs.pamedia}/bin/pamedia mute"
|
# bind = ,XF86AudioMute,exec,${pkgs.pamedia}/bin/pamedia mute
|
||||||
",XF86Calculator,exec,${pkgs.gnome-calculator}/bin/gnome-calculator"
|
# bind = ,XF86Calculator,exec,${pkgs.gnome-calculator}/bin/gnome-calculator
|
||||||
|
|
||||||
"$mod,D,exec,${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw"
|
# bind = $mod,D,exec,${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw
|
||||||
|
|
||||||
"$mod,W,togglegroup"
|
# bind = $mod,W,togglegroup
|
||||||
"$mod,N,changegroupactive,b"
|
# bind = $mod,N,changegroupactive,b
|
||||||
"$mod,O,changegroupactive,f"
|
# bind = $mod,O,changegroupactive,f
|
||||||
]
|
|
||||||
++ (lib.optional config.eboskma.programs.emacs.enable "$mod,C,exec,${config.eboskma.programs.emacs.package}/bin/emacsclient -c");
|
|
||||||
|
|
||||||
bindm = [
|
# bindm = $mod,mouse:272,movewindow
|
||||||
"$mod,mouse:272,movewindow"
|
# bindm = $mod,mouse:273,resizewindow
|
||||||
"$mod,mouse:273,resizewindow"
|
|
||||||
];
|
|
||||||
|
|
||||||
exec = [ "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator" ];
|
# windowrulev2 = workspace 1,class:^(firefox)$
|
||||||
|
# windowrulev2 = workspace 2,class:^(foot)$
|
||||||
|
# windowrulev2 = workspace 3,class:^(emacs)$
|
||||||
|
|
||||||
exec-once = [
|
# exec = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
|
||||||
"${pkgs.swaybg}/bin/swaybg -i ${../../../wallpapers/river-2560.png} -m fill"
|
|
||||||
"${config.wayland.windowManager.hyprland.package}/bin/hyprctl setcursor Nordzy-cursors 24"
|
|
||||||
"${pkgs.systemd}/bin/systemctl --user start swaync"
|
|
||||||
"${pkgs.systemd}/bin/systemctl --user start fcitx5-daemon"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.user.services.hypridle = {
|
# exec-once = ${pkgs.swaybg}/bin/swaybg -i ${../../../wallpapers/river-2560.png} -m fill
|
||||||
Unit = {
|
# exec-once = ${config.wayland.windowManager.hyprland.package}/bin/hyprctl setcursor Nordzy-cursors 24
|
||||||
Description = "Idle manager for Wayland (Hyprland)";
|
# exec-once = ${pkgs.systemd}/bin/systemctl --user start swaync
|
||||||
Documentation = "man:swayidle(1)";
|
# exec-once = ${pkgs.systemd}/bin/systemctl --user start fcitx5-daemon
|
||||||
PartOf = "graphical-session.target";
|
# '' +
|
||||||
};
|
# (lib.optionalString config.eboskma.programs.emacs.enable "bind = $mod,C,exec,${config.eboskma.programs.emacs.package}/bin/emacsclient -c");
|
||||||
|
# };
|
||||||
|
|
||||||
Service = {
|
# systemd.user.services.hypridle = {
|
||||||
ExecStart = "${pkgs.swayidle}/bin/swayidle -w timeout 900 '${swaylockcmd}' timeout 1200 '${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off' resume '${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on'";
|
# Unit = {
|
||||||
};
|
# Description = "Idle manager for Wayland (Hyprland)";
|
||||||
|
# Documentation = "man:swayidle(1)";
|
||||||
|
# PartOf = "graphical-session.target";
|
||||||
|
# };
|
||||||
|
|
||||||
Install = {
|
# Service = {
|
||||||
WantedBy = [ "hyprland-session.target" ];
|
# ExecStart = "${pkgs.swayidle}/bin/swayidle -w timeout 900 '${swaylockcmd}' timeout 1200 '${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off' resume '${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on'";
|
||||||
};
|
# };
|
||||||
};
|
|
||||||
|
# Install = {
|
||||||
|
# WantedBy = [ "hyprland-session.target" ];
|
||||||
|
# };
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue