Skip to content

Commit 496c071

Browse files
committed
flake, emacs, hyprland: update
1 parent 46f5a1e commit 496c071

11 files changed

Lines changed: 183 additions & 108 deletions

File tree

flake.lock

Lines changed: 40 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
inputs = {
77
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
8-
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-24.11";
8+
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-25.05";
99
nurpkgs = {
1010
url = "github:nix-community/NUR";
1111
inputs.nixpkgs.follows = "nixpkgs";

home/hosts/frost/hyprland.nix

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,14 @@
7272
vfr = 1;
7373
};
7474

75+
windowrule = [
76+
"idleinhibit fullscreen, class:^(*)$"
77+
"idleinhibit fullscreen, title:^(*)$"
78+
"idleinhibit fullscreen, fullscreen:1"
79+
"idleinhibit focus, title:(.*)(- Youtube)"
80+
"idleinhibit focus, title:(.*)(- Stremio)"
81+
];
82+
7583
"$mod" = "SUPER";
7684

7785
bind = [
@@ -80,17 +88,18 @@
8088
"$mod_SHIFT, M, exec, wlogout"
8189
"$mod, D, exec, foot yazi"
8290
"$mod, F, togglefloating"
91+
"$mod_SHIFT, F, fullscreen"
8392
"$mod_SHIFT, return, exec, fuzzel --show-actions"
8493
"$mod, V, exec, sh -c 'cliphist list | fuzzel --dmenu | cliphist decode | wl-copy'"
8594
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+"
8695
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-"
8796
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
88-
"$mod, XF86AudioRaiseVolume, exec, hyprctl hyprsunset gamma -10"
89-
"$mod, XF86AudioLowerVolume, exec, hyprctl hyprsunset gamma +10"
97+
"$mod, XF86AudioRaiseVolume, exec, hyprctl hyprsunset gamma +10"
98+
"$mod, XF86AudioLowerVolume, exec, hyprctl hyprsunset gamma -10"
9099
"$mod, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
91100
"$mod, p, exec, grimblast copysave area"
92-
"$mod, `, togglespecialworkspace, scratch"
93-
"$mod_SHIFT, `, movetoworkspace, special:scratch"
101+
"$mod, 0, togglespecialworkspace, scratch"
102+
"$mod_SHIFT, 0, movetoworkspace, special:scratch"
94103
"$mod, h, movefocus, l"
95104
"$mod, l, movefocus, r"
96105
"$mod, k, movefocus, u"

home/modules/bash/default.nix

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,24 @@ in {
4040
add_newline = true;
4141
};
4242
};
43+
readline = {
44+
enable = true;
45+
variables = {
46+
editing-mode = "vi";
47+
vi-cmd-mode-string = ''\001\e[38;5;111m\002 \001\e[0m\002'';
48+
vi-ins-mode-string = ''\001\e[38;5;108m\002 \001\e[0m\002'';
49+
mark-symlinked-directories = true;
50+
menu-complete-display-prefix = true;
51+
print-completions-horizontally = true;
52+
show-mode-in-prompt = true;
53+
show-all-if-ambiguous = true;
54+
completion-ignore-case = true;
55+
colored-completion-prefix = true;
56+
completion-map-case = true;
57+
colored-stats = true;
58+
bell-style = "none";
59+
};
60+
};
4361
bash = {
4462
enable = mkDefault true;
4563
enableCompletion = mkDefault true;

home/modules/emacs/default.nix

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,13 @@
88
inherit (lib) mkEnableOption mkIf;
99
cfg = config.custom.programs.emacs;
1010

11-
EmacsRuntimeDeps = (with pkgs; [
12-
prettierd
13-
nixd
14-
vscode-langservers-extracted
15-
typst
16-
tinymist
17-
]);
18-
19-
mkTreeSitterGrammers = epkgs: with epkgs; [
20-
tree-sitter
21-
(treesit-grammars.with-grammars (g: with g; [
22-
tree-sitter-bash tree-sitter-c tree-sitter-c-sharp tree-sitter-clojure tree-sitter-cmake tree-sitter-comment tree-sitter-commonlisp tree-sitter-cpp tree-sitter-css tree-sitter-dockerfile tree-sitter-elisp tree-sitter-elm tree-sitter-fennel tree-sitter-haskell tree-sitter-html tree-sitter-http tree-sitter-hyprlang tree-sitter-java tree-sitter-javascript tree-sitter-jsdoc tree-sitter-json tree-sitter-json5 tree-sitter-kotlin tree-sitter-lua tree-sitter-make tree-sitter-markdown tree-sitter-markdown-inline tree-sitter-nix tree-sitter-python tree-sitter-query tree-sitter-regex tree-sitter-rust tree-sitter-scheme tree-sitter-scss tree-sitter-sql tree-sitter-toml tree-sitter-tsx tree-sitter-typescript tree-sitter-typst tree-sitter-vim tree-sitter-yaml tree-sitter-zig
23-
]))
24-
];
25-
26-
# myEmacs = (with pkgs; (emacsPackagesFor emacs-git-pgtk)).emacsWithPackages
27-
# (epkgs:
28-
# (EmacsModes epkgs)
29-
# ++ (EmacsTreeSitterGrammers epkgs)
30-
# ++ EmacsRuntimeDeps);
31-
myEmacs = pkgs.emacsWithPackagesFromUsePackage {
32-
config = ./init.el;
33-
defaultInitFile = true;
34-
alwaysEnsure = true;
35-
package = pkgs.emacs-git-pgtk;
36-
extraEmacsPackages = epkgs: (mkTreeSitterGrammers epkgs) ++ EmacsRuntimeDeps;
37-
};
3811
in {
3912
options.custom.programs.emacs = {enable = mkEnableOption "programs.emacs";};
4013

4114
config = mkIf cfg.enable {
4215
programs.emacs = {
4316
enable = true;
44-
package = myEmacs;
17+
package = pkgs.customPackages.emacats;
4518
};
4619

4720
services.emacs = {

home/modules/hypridle/default.nix

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,44 @@ in {
1414

1515
config = mkIf cfg.enable {
1616
services = {
17+
hyprsunset = {
18+
enable = mkDefault true;
19+
transitions = mkDefault {
20+
sunrise = {
21+
calendar = "*-*-* 06:00:00";
22+
requests = [
23+
[ "temperature" "6500" ]
24+
[ "gamma 100" ]
25+
];
26+
};
27+
sunset = {
28+
calendar = "*-*-* 19:00:00";
29+
requests = [
30+
[ "temperature" "5000" ]
31+
[ "gamma 80" ]
32+
];
33+
};
34+
};
35+
};
1736
hypridle = {
1837
enable = mkDefault true;
1938
settings = {
2039
general = {
2140
after_sleep_cmd = mkDefault "hyprctl dispatch dpms on";
22-
ignore_dbus_inhibit = mkDefault false;
2341
lock_cmd = mkDefault "hyprlock";
2442
};
2543

26-
listener = mkDefault [
44+
listener = [
45+
{
46+
timeout = 600;
47+
on-timeout = "hyprctl hyprsunset gamma 50";
48+
on-resume = "hyprctl hyprsunset gamma 100";
49+
}
50+
{
51+
timeout = 800;
52+
on-timeout = "hyprctl hyprsunset gamma 30";
53+
on-resume = "hyprctl hyprsunset gamma 100";
54+
}
2755
{
2856
timeout = 900;
2957
on-timeout = "hyprlock";

0 commit comments

Comments
 (0)