Compare commits
1 commit
ce6fc097d9
...
dadbcec848
| Author | SHA1 | Date | |
|---|---|---|---|
| dadbcec848 |
4 changed files with 115 additions and 152 deletions
32
flake.lock
generated
32
flake.lock
generated
|
|
@ -40,11 +40,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713357303,
|
"lastModified": 1712572393,
|
||||||
"narHash": "sha256-QUTgueEZfzn6aW3LoSa6VXVIBecD1g68TPJONIpqUFk=",
|
"narHash": "sha256-1rh9Avt4prjMhFl4roOxeoA2wrmHQ+4AdETD57Pb6mo=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "c64cce44c860d7c6005871c203a193164adf0f12",
|
"rev": "c5bdfd91071fb06261c90655ac56ab61a09aa38c",
|
||||||
"revCount": 172,
|
"revCount": 169,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.aciceri.dev/aciceri/emacs.git"
|
"url": "https://git.aciceri.dev/aciceri/emacs.git"
|
||||||
},
|
},
|
||||||
|
|
@ -202,11 +202,11 @@
|
||||||
"extra-package-indent-bars": {
|
"extra-package-indent-bars": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713279232,
|
"lastModified": 1710117442,
|
||||||
"narHash": "sha256-usa8xpg2dvXwFcQf8gKSZ+kOy6EGJ+e2mkvGAjEX66o=",
|
"narHash": "sha256-0p3PW2hbzGeUIVkUWow6OWpL3OspbId+yqEPV909g4k=",
|
||||||
"owner": "jdtsmith",
|
"owner": "jdtsmith",
|
||||||
"repo": "indent-bars",
|
"repo": "indent-bars",
|
||||||
"rev": "88261051823961f0fc60c3c76b0cf2bae4ab32e4",
|
"rev": "4583e3e9f507143cd4241131b77fc5e8b1722bbf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -652,11 +652,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713294767,
|
"lastModified": 1713166971,
|
||||||
"narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=",
|
"narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7",
|
"rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1039,11 +1039,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgsUnstable": {
|
"nixpkgsUnstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713248628,
|
"lastModified": 1712963716,
|
||||||
"narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
|
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
|
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1252,11 +1252,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713358435,
|
"lastModified": 1713267893,
|
||||||
"narHash": "sha256-dRS2ZdEc6AePUtoBSx+TE3hEPVz5AA3lMGAWsgHxpEg=",
|
"narHash": "sha256-HMHYHrQRCOVhYSfKbIpa3fLNcTjE6mH2jO2xnSHrTQw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "8023efed4279d77656e4da3520541521acfd68a7",
|
"rev": "0bff3c351235a87ea3e9b1d271cb6abbc6b82216",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
originalConfig = config.wayland.windowManager.hyprland.extraConfig;
|
|
||||||
config = builtins.replaceStrings ["SUPER"] [""] originalConfig;
|
|
||||||
in {
|
|
||||||
systemd.user.services.headless-hyprland = {
|
|
||||||
Unit.Description = "Headless Hyprland";
|
|
||||||
Service = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = ''
|
|
||||||
${lib.getExe config.wayland.windowManager.hyprland.package} --config ${config}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -84,8 +84,6 @@ in {
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
$mod = SUPER
|
|
||||||
|
|
||||||
input {
|
input {
|
||||||
touchpad {
|
touchpad {
|
||||||
disable_while_typing = true # set to true while playing
|
disable_while_typing = true # set to true while playing
|
||||||
|
|
@ -108,65 +106,65 @@ in {
|
||||||
windowrulev2 = workspace 7, class:^(WhatsApp for Linux)$
|
windowrulev2 = workspace 7, class:^(WhatsApp for Linux)$
|
||||||
windowrulev2 = float, title:^(floating)$
|
windowrulev2 = float, title:^(floating)$
|
||||||
|
|
||||||
bind = $mod, b, exec, firefox
|
bind = SUPER, b, exec, firefox
|
||||||
bind = $mod SHIFT, b , exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh mothership.fleet firefox
|
bind = SUPER SHIFT, b , exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh mothership.fleet firefox
|
||||||
bind = $mod SHIFT, RETURN, exec, ${config.programs.wezterm.package}/bin/wezterm ssh mothership.fleet
|
bind = SUPER SHIFT, RETURN, exec, ${config.programs.wezterm.package}/bin/wezterm ssh mothership.fleet
|
||||||
bind = $mod, m, exec, ${config.programs.wezterm.package}/bin/wezterm start -- mosh mothership.fleet
|
bind = SUPER, m, exec, ${config.programs.wezterm.package}/bin/wezterm start -- mosh mothership.fleet
|
||||||
bind = $mod, t, exec, ${config.programs.wezterm.package}/bin/wezterm
|
bind = SUPER, t, exec, ${config.programs.wezterm.package}/bin/wezterm
|
||||||
bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)"
|
bind = SUPER, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)"
|
||||||
bind = $mod, x, exec, emacsclient -c
|
bind = SUPER, x, exec, emacsclient -c
|
||||||
bind = $mod SHIFT, n, exec, emacsclient --eval '(ccr/org-capture "n")' -c -F '((name . "floating"))'
|
bind = SUPER SHIFT, n, exec, emacsclient --eval '(ccr/org-capture "n")' -c -F '((name . "floating"))'
|
||||||
bind = $mod SHIFT, w, exec, emacsclient --eval '(ccr/org-capture "j")' -c -F '((name . "floating"))'
|
bind = SUPER SHIFT, w, exec, emacsclient --eval '(ccr/org-capture "j")' -c -F '((name . "floating"))'
|
||||||
bind = $mod, y, exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh picard.fleet emacsclient -c
|
bind = SUPER, y, exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh picard.fleet emacsclient -c
|
||||||
bind = $mod, d, exec, ${pkgs.fuzzel}/bin/fuzzel --background-color=253559cc --border-radius=5 --border-width=0
|
bind = SUPER, d, exec, ${pkgs.fuzzel}/bin/fuzzel --background-color=253559cc --border-radius=5 --border-width=0
|
||||||
bind = $mod, s, exec, ${screenshotScript}
|
bind = SUPER, s, exec, ${screenshotScript}
|
||||||
bind = , XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +5%
|
bind = , XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +5%
|
||||||
bind = , XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 5%-
|
bind = , XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 5%-
|
||||||
bind = $mod, code:60, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +5%
|
bind = SUPER, code:60, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +5%
|
||||||
bind = $mod, code:59, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 5%-
|
bind = SUPER, code:59, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 5%-
|
||||||
bind = $mod SHIFT, t, exec, ${config.services.swaync.package}/bin/swaync-client -t
|
bind = SUPER SHIFT, t, exec, ${config.services.swaync.package}/bin/swaync-client -t
|
||||||
|
|
||||||
|
|
||||||
bind = $mod SHIFT, q, killactive
|
bind = SUPER SHIFT, q, killactive
|
||||||
bind = $mod SHIFT, f, fullscreen, 0
|
bind = SUPER SHIFT, f, fullscreen, 0
|
||||||
bind = $mod SHIFT, e, exit
|
bind = SUPER SHIFT, e, exit
|
||||||
|
|
||||||
bind = $mod, h, movefocus, l
|
bind = SUPER, h, movefocus, l
|
||||||
bind = $mod, l, movefocus, r
|
bind = SUPER, l, movefocus, r
|
||||||
bind = $mod, k, movefocus, u
|
bind = SUPER, k, movefocus, u
|
||||||
bind = $mod, j, movefocus, d
|
bind = SUPER, j, movefocus, d
|
||||||
|
|
||||||
bind = $mod SHIFT, h, movewindow, l
|
bind = SUPER SHIFT, h, movewindow, l
|
||||||
bind = $mod SHIFT, l, movewindow, r
|
bind = SUPER SHIFT, l, movewindow, r
|
||||||
bind = $mod SHIFT, k, movewindow, u
|
bind = SUPER SHIFT, k, movewindow, u
|
||||||
bind = $mod SHIFT, j ,movewindow, d
|
bind = SUPER SHIFT, j ,movewindow, d
|
||||||
|
|
||||||
bind = $mod, p, movecurrentworkspacetomonitor, r
|
bind = SUPER, p, movecurrentworkspacetomonitor, r
|
||||||
bind = $mod, o, movecurrentworkspacetomonitor, l
|
bind = SUPER, o, movecurrentworkspacetomonitor, l
|
||||||
|
|
||||||
bindm=ALT,mouse:272,movewindow
|
bindm=ALT,mouse:272,movewindow
|
||||||
|
|
||||||
bind = $mod, 1, workspace, 1
|
bind = SUPER, 1, workspace, 1
|
||||||
bind = $mod, 2, workspace, 2
|
bind = SUPER, 2, workspace, 2
|
||||||
bind = $mod, 3, workspace, 3
|
bind = SUPER, 3, workspace, 3
|
||||||
bind = $mod, 4, workspace, 4
|
bind = SUPER, 4, workspace, 4
|
||||||
bind = $mod, 5, workspace, 5
|
bind = SUPER, 5, workspace, 5
|
||||||
bind = $mod, 6, workspace, 6
|
bind = SUPER, 6, workspace, 6
|
||||||
bind = $mod, 7, workspace, 7
|
bind = SUPER, 7, workspace, 7
|
||||||
bind = $mod, 8, workspace, 8
|
bind = SUPER, 8, workspace, 8
|
||||||
bind = $mod, 9, workspace, 9
|
bind = SUPER, 9, workspace, 9
|
||||||
bind = $mod, 0, workspace, 10
|
bind = SUPER, 0, workspace, 10
|
||||||
|
|
||||||
bind = $mod SHIFT, 1, movetoworkspace, 1
|
bind = SUPER SHIFT, 1, movetoworkspace, 1
|
||||||
bind = $mod SHIFT, 2, movetoworkspace, 2
|
bind = SUPER SHIFT, 2, movetoworkspace, 2
|
||||||
bind = $mod SHIFT, 3, movetoworkspace, 3
|
bind = SUPER SHIFT, 3, movetoworkspace, 3
|
||||||
bind = $mod SHIFT, 4, movetoworkspace, 4
|
bind = SUPER SHIFT, 4, movetoworkspace, 4
|
||||||
bind = $mod SHIFT, 5, movetoworkspace, 5
|
bind = SUPER SHIFT, 5, movetoworkspace, 5
|
||||||
bind = $mod SHIFT, 6, movetoworkspace, 6
|
bind = SUPER SHIFT, 6, movetoworkspace, 6
|
||||||
bind = $mod SHIFT, 7, movetoworkspace, 7
|
bind = SUPER SHIFT, 7, movetoworkspace, 7
|
||||||
bind = $mod SHIFT, 8, movetoworkspace, 8
|
bind = SUPER SHIFT, 8, movetoworkspace, 8
|
||||||
bind = $mod SHIFT, 9, movetoworkspace, 9
|
bind = SUPER SHIFT, 9, movetoworkspace, 9
|
||||||
bind = $mod SHIFT, 0, movetoworkspace, 10
|
bind = SUPER SHIFT, 0, movetoworkspace, 10
|
||||||
|
|
||||||
general {
|
general {
|
||||||
gaps_in = 0
|
gaps_in = 0
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,7 @@
|
||||||
{
|
{pkgs, ...}: {
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
hardware.pulseaudio.enable = true;
|
hardware.pulseaudio.enable = true;
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth.enable = true;
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
General = {
|
|
||||||
Name = config.networking.hostName;
|
|
||||||
ControllerMode = "dual";
|
|
||||||
FastConnectable = "true";
|
|
||||||
Experimental = "true";
|
|
||||||
};
|
|
||||||
Policy = {
|
|
||||||
AutoEnable = "true";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.dbus.packages = with pkgs; [blueman];
|
services.dbus.packages = with pkgs; [blueman];
|
||||||
ccr.extraGroups = ["bluetooth"];
|
ccr.extraGroups = ["bluetooth"];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue