aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: aciceri:dadbcec848428c8a7adf42f96334cdac51ab434a
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test
..
compare: aciceri:ce6fc097d94d3db3bf31ce6c41d31671889600dc
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test

5 commits
dadbcec848 ... ce6fc097d9

Author SHA1 Message Date
Seven of Nine
ce6fc097d9 flake.lock: Update
Some checks failed
/ test (push) Failing after 1m58s
Details 
Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/8cb01a0e717311680e0cbca06a76cbceba6f3ed6' (2024-02-13)
  → 'github:ryantm/agenix/1381a759b205dff7a6818733118d02253340fd5e' (2024-04-02)
• Updated input 'disko':
    'github:nix-community/disko/611c9ea53250f7bb22286b3d26872280a0e608f9' (2024-04-01)
  → 'github:nix-community/disko/d51114dc1bf3cfaba2b6644aabd16ff0c9909af5' (2024-04-15)
• Updated input 'dream2nix':
    'github:nix-community/dream2nix/26a6c3a3405cdb2c2218cdc4e1e2bcf7a07af7ba' (2024-03-29)
  → 'github:nix-community/dream2nix/c5cfd416abe6ced55f9d57810cadff2556df708f' (2024-04-15)
• Updated input 'dream2nix/nixpkgs':
    'github:NixOS/nixpkgs/72c6ed328aa4e5d9151b1a512f6ad83aca7529fa' (2024-03-28)
  → 'github:NixOS/nixpkgs/efe8ce06ca261f370d672def5b1e0be300c726e1' (2024-04-07)
• Updated input 'homeManager':
    'github:nix-community/home-manager/4be0464472675212654dedf3e021bd5f1d58b92f' (2024-04-02)
  → 'github:nix-community/home-manager/fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7' (2024-04-16)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/9a763a7acc4cfbb8603bb0231fec3eda864f81c0' (2024-03-25)
  → 'github:NixOS/nixos-hardware/f58b25254be441cd2a9b4b444ed83f1e51244f1f' (2024-04-12)
• Updated input 'nixpkgsStable':
    'github:NixOS/nixpkgs/219951b495fc2eac67b1456824cc1ec1fd2ee659' (2024-03-28)
  → 'github:NixOS/nixpkgs/53a2c32bc66f5ae41a28d7a9a49d321172af621e' (2024-04-15)
• Updated input 'nixpkgsUnstable':
    'github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089' (2024-03-29)
  → 'github:NixOS/nixpkgs/5672bc9dbf9d88246ddab5ac454e82318d094bb8' (2024-04-16)
• Updated input 'nur':
    'github:nix-community/NUR/91edd2127f8365f9e96b37370dcba75b769305fe' (2024-04-02)
  → 'github:nix-community/NUR/8023efed4279d77656e4da3520541521acfd68a7' (2024-04-17)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/e35aed5fda3cc79f88ed7f1795021e559582093a' (2024-04-02)
  → 'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8' (2024-04-12)
 2024-04-17 13:01:55 +00:00
Andrea Ciceri
be02ace030
Bump ccrEmacs
All checks were successful
/ test (push) Successful in 40s
Details
2024-04-17 14:36:01 +02:00
Andrea Ciceri
fc65aa5403
Bluetooth fix
Some checks failed
/ test (push) Has been cancelled
Details 
Don't know exactly what happened but this fixed it
 2024-04-17 13:45:38 +02:00
Andrea Ciceri
77f117cc5d
Reformatted hyprland's extraConfig string 2024-04-17 13:45:16 +02:00
Andrea Ciceri
25ec5ef86d
[WIP] New headless-hyprlan module 2024-04-17 13:44:56 +02:00
4 changed files with 152 additions and 115 deletions
Show stats Expand all files Collapse all files

32
flake.lock generated
View file

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712572393, "lastModified": 1713357303,
"narHash": "sha256-1rh9Avt4prjMhFl4roOxeoA2wrmHQ+4AdETD57Pb6mo=", "narHash": "sha256-QUTgueEZfzn6aW3LoSa6VXVIBecD1g68TPJONIpqUFk=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "c5bdfd91071fb06261c90655ac56ab61a09aa38c", "rev": "c64cce44c860d7c6005871c203a193164adf0f12",
"revCount": 169, "revCount": 172,
"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": 1710117442, "lastModified": 1713279232,
"narHash": "sha256-0p3PW2hbzGeUIVkUWow6OWpL3OspbId+yqEPV909g4k=", "narHash": "sha256-usa8xpg2dvXwFcQf8gKSZ+kOy6EGJ+e2mkvGAjEX66o=",
"owner": "jdtsmith", "owner": "jdtsmith",
"repo": "indent-bars", "repo": "indent-bars",
"rev": "4583e3e9f507143cd4241131b77fc5e8b1722bbf", "rev": "88261051823961f0fc60c3c76b0cf2bae4ab32e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -652,11 +652,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713166971, "lastModified": 1713294767,
"narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1039,11 +1039,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1713248628,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1252,11 +1252,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1713267893, "lastModified": 1713358435,
"narHash": "sha256-HMHYHrQRCOVhYSfKbIpa3fLNcTjE6mH2jO2xnSHrTQw=", "narHash": "sha256-dRS2ZdEc6AePUtoBSx+TE3hEPVz5AA3lMGAWsgHxpEg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "0bff3c351235a87ea3e9b1d271cb6abbc6b82216", "rev": "8023efed4279d77656e4da3520541521acfd68a7",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
hmModules/headless-hyprland/default.nix Normal file
View file

@ -0,0 +1,18 @@
{
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}
'';
};
};
}

196
hmModules/hyprland/default.nix
View file

@ -84,125 +84,127 @@ in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
input { $mod = SUPER
touchpad {
disable_while_typing = true # set to true while playing
}
}
monitor = HDMI-A-1, 2560x1440, 0x0, 1 # picard input {
monitor = eDP-1, 1920x1080, 0x0, 1 # kirk touchpad {
disable_while_typing = true # set to true while playing
}
}
bindl=,switch:off:Lid Switch,exec,${switchMonitorScript} open monitor = HDMI-A-1, 2560x1440, 0x0, 1 # picard
bindl=,switch:on:Lid Switch,exec,${switchMonitorScript} close monitor = eDP-1, 1920x1080, 0x0, 1 # kirk
exec-once = ${pkgs.hyprpaper}/bin/hyprpaper bindl=,switch:off:Lid Switch,exec,${switchMonitorScript} open
bindl=,switch:on:Lid Switch,exec,${switchMonitorScript} close
windowrulev2 = tile, class:^(Spotify)$ exec-once = ${pkgs.hyprpaper}/bin/hyprpaper
windowrulev2 = workspace 9, class:^(Spotify)$
windowrulev2 = tile, class:^(fluffychat)$
windowrulev2 = workspace 8, class:^(fluffychat)$
windowrulev2 = tile, class:^(WhatsApp for Linux)$
windowrulev2 = workspace 7, class:^(WhatsApp for Linux)$
windowrulev2 = float, title:^(floating)$
bind = SUPER, b, exec, firefox windowrulev2 = tile, class:^(Spotify)$
bind = SUPER SHIFT, b , exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh mothership.fleet firefox windowrulev2 = workspace 9, class:^(Spotify)$
bind = SUPER SHIFT, RETURN, exec, ${config.programs.wezterm.package}/bin/wezterm ssh mothership.fleet windowrulev2 = tile, class:^(fluffychat)$
bind = SUPER, m, exec, ${config.programs.wezterm.package}/bin/wezterm start -- mosh mothership.fleet windowrulev2 = workspace 8, class:^(fluffychat)$
bind = SUPER, t, exec, ${config.programs.wezterm.package}/bin/wezterm windowrulev2 = tile, class:^(WhatsApp for Linux)$
bind = SUPER, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)" windowrulev2 = workspace 7, class:^(WhatsApp for Linux)$
bind = SUPER, x, exec, emacsclient -c windowrulev2 = float, title:^(floating)$
bind = SUPER SHIFT, n, exec, emacsclient --eval '(ccr/org-capture "n")' -c -F '((name . "floating"))'
bind = SUPER SHIFT, w, exec, emacsclient --eval '(ccr/org-capture "j")' -c -F '((name . "floating"))' bind = $mod, b, exec, firefox
bind = SUPER, y, exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh picard.fleet emacsclient -c bind = $mod SHIFT, b , exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh mothership.fleet firefox
bind = SUPER, d, exec, ${pkgs.fuzzel}/bin/fuzzel --background-color=253559cc --border-radius=5 --border-width=0 bind = $mod SHIFT, RETURN, exec, ${config.programs.wezterm.package}/bin/wezterm ssh mothership.fleet
bind = SUPER, s, exec, ${screenshotScript} bind = $mod, m, exec, ${config.programs.wezterm.package}/bin/wezterm start -- mosh mothership.fleet
bind = , XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +5% bind = $mod, t, exec, ${config.programs.wezterm.package}/bin/wezterm
bind = , XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 5%- bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)"
bind = SUPER, code:60, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +5% bind = $mod, x, exec, emacsclient -c
bind = SUPER, code:59, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 5%- bind = $mod SHIFT, n, exec, emacsclient --eval '(ccr/org-capture "n")' -c -F '((name . "floating"))'
bind = SUPER SHIFT, t, exec, ${config.services.swaync.package}/bin/swaync-client -t bind = $mod 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 = $mod, d, exec, ${pkgs.fuzzel}/bin/fuzzel --background-color=253559cc --border-radius=5 --border-width=0
bind = $mod, s, exec, ${screenshotScript}
bind = , XF86MonBrightnessUp, 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 = $mod, 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, q, killactive bind = $mod SHIFT, q, killactive
bind = SUPER SHIFT, f, fullscreen, 0 bind = $mod SHIFT, f, fullscreen, 0
bind = SUPER SHIFT, e, exit bind = $mod SHIFT, e, exit
bind = SUPER, h, movefocus, l bind = $mod, h, movefocus, l
bind = SUPER, l, movefocus, r bind = $mod, l, movefocus, r
bind = SUPER, k, movefocus, u bind = $mod, k, movefocus, u
bind = SUPER, j, movefocus, d bind = $mod, j, movefocus, d
bind = SUPER SHIFT, h, movewindow, l bind = $mod SHIFT, h, movewindow, l
bind = SUPER SHIFT, l, movewindow, r bind = $mod SHIFT, l, movewindow, r
bind = SUPER SHIFT, k, movewindow, u bind = $mod SHIFT, k, movewindow, u
bind = SUPER SHIFT, j ,movewindow, d bind = $mod SHIFT, j ,movewindow, d
bind = SUPER, p, movecurrentworkspacetomonitor, r bind = $mod, p, movecurrentworkspacetomonitor, r
bind = SUPER, o, movecurrentworkspacetomonitor, l bind = $mod, o, movecurrentworkspacetomonitor, l
bindm=ALT,mouse:272,movewindow bindm=ALT,mouse:272,movewindow
bind = SUPER, 1, workspace, 1 bind = $mod, 1, workspace, 1
bind = SUPER, 2, workspace, 2 bind = $mod, 2, workspace, 2
bind = SUPER, 3, workspace, 3 bind = $mod, 3, workspace, 3
bind = SUPER, 4, workspace, 4 bind = $mod, 4, workspace, 4
bind = SUPER, 5, workspace, 5 bind = $mod, 5, workspace, 5
bind = SUPER, 6, workspace, 6 bind = $mod, 6, workspace, 6
bind = SUPER, 7, workspace, 7 bind = $mod, 7, workspace, 7
bind = SUPER, 8, workspace, 8 bind = $mod, 8, workspace, 8
bind = SUPER, 9, workspace, 9 bind = $mod, 9, workspace, 9
bind = SUPER, 0, workspace, 10 bind = $mod, 0, workspace, 10
bind = SUPER SHIFT, 1, movetoworkspace, 1 bind = $mod SHIFT, 1, movetoworkspace, 1
bind = SUPER SHIFT, 2, movetoworkspace, 2 bind = $mod SHIFT, 2, movetoworkspace, 2
bind = SUPER SHIFT, 3, movetoworkspace, 3 bind = $mod SHIFT, 3, movetoworkspace, 3
bind = SUPER SHIFT, 4, movetoworkspace, 4 bind = $mod SHIFT, 4, movetoworkspace, 4
bind = SUPER SHIFT, 5, movetoworkspace, 5 bind = $mod SHIFT, 5, movetoworkspace, 5
bind = SUPER SHIFT, 6, movetoworkspace, 6 bind = $mod SHIFT, 6, movetoworkspace, 6
bind = SUPER SHIFT, 7, movetoworkspace, 7 bind = $mod SHIFT, 7, movetoworkspace, 7
bind = SUPER SHIFT, 8, movetoworkspace, 8 bind = $mod SHIFT, 8, movetoworkspace, 8
bind = SUPER SHIFT, 9, movetoworkspace, 9 bind = $mod SHIFT, 9, movetoworkspace, 9
bind = SUPER SHIFT, 0, movetoworkspace, 10 bind = $mod SHIFT, 0, movetoworkspace, 10
general { general {
gaps_in = 0 gaps_in = 0
gaps_out = 0 gaps_out = 0
border_size = 1 border_size = 1
col.active_border = rgba(AF8D61FF) rgba(CEB153FF) rgba(7B8387FF) 45deg col.active_border = rgba(AF8D61FF) rgba(CEB153FF) rgba(7B8387FF) 45deg
col.inactive_border = rgba(AF8D6166) col.inactive_border = rgba(AF8D6166)
} }
decoration { decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more # See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 2 rounding = 2
# blur = true # blur = true
# blur_size = 8 # blur_size = 8
# blur_passes = 1 # blur_passes = 1
# blur_new_optimizations = true # blur_new_optimizations = true
drop_shadow = true drop_shadow = true
shadow_range = 4 shadow_range = 4
shadow_render_power = 3 shadow_render_power = 3
col.shadow = rgba(a8cfee11) col.shadow = rgba(a8cfee11)
} }
animations { animations {
enabled = true enabled = true
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.05, 0.9, 0.1, 1.05 bezier = myBezier, 0.05, 0.9, 0.1, 1.05
animation = windows, 1, 3, myBezier animation = windows, 1, 3, myBezier
animation = windowsOut, 1, 3, default, popin 80% animation = windowsOut, 1, 3, default, popin 80%
animation = border, 1, 5, default animation = border, 1, 5, default
animation = borderangle, 1, 4, default animation = borderangle, 1, 4, default
animation = fade, 1, 3, default animation = fade, 1, 3, default
animation = workspaces, 1, 3, default animation = workspaces, 1, 3, default
} }
''; '';
}; };
} }

21
modules/bluetooth/default.nix
View file

@ -1,7 +1,24 @@
{pkgs, ...}: { {
pkgs,
config,
...
}: {
services.blueman.enable = true; services.blueman.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth = {
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"];
} }