mirror of
https://github.com/youwen5/nixos.git
synced 2024-11-25 02:03:51 -08:00
Compare commits
11 commits
8d388cb10e
...
e690e4d487
Author | SHA1 | Date | |
---|---|---|---|
e690e4d487 | |||
19dda73c5b | |||
151e8533d6 | |||
176dd36f2d | |||
e15d80af4b | |||
5b219a6829 | |||
027bdc0568 | |||
bb63cc5b0f | |||
6f13527810 | |||
a958fc976e | |||
623eda78a2 |
7 changed files with 58 additions and 31 deletions
29
flake.lock
29
flake.lock
|
@ -70,6 +70,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"cellular-automaton": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1719777869,
|
||||||
|
"narHash": "sha256-nIv7ISRk0+yWd1lGEwAV6u1U7EFQj/T9F8pU6O0Wf0s=",
|
||||||
|
"owner": "Eandrju",
|
||||||
|
"repo": "cellular-automaton.nvim",
|
||||||
|
"rev": "11aea08aa084f9d523b0142c2cd9441b8ede09ed",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Eandrju",
|
||||||
|
"repo": "cellular-automaton.nvim",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -1039,6 +1055,7 @@
|
||||||
},
|
},
|
||||||
"viminal": {
|
"viminal": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"cellular-automaton": "cellular-automaton",
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts_2",
|
||||||
"haskell-tools": "haskell-tools",
|
"haskell-tools": "haskell-tools",
|
||||||
"lsp-progress": "lsp-progress",
|
"lsp-progress": "lsp-progress",
|
||||||
|
@ -1050,11 +1067,11 @@
|
||||||
"satellite": "satellite"
|
"satellite": "satellite"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726615423,
|
"lastModified": 1726653943,
|
||||||
"narHash": "sha256-cX5zX8US0E5Aw1xzFuumTlQTxZSzwqp7kz7i+qFDBIQ=",
|
"narHash": "sha256-YZpbHH96hiNbxx1p/FU8ABxw+gVsY9nBgiloHLCDhYg=",
|
||||||
"owner": "youwen5",
|
"owner": "youwen5",
|
||||||
"repo": "viminal",
|
"repo": "viminal",
|
||||||
"rev": "0fff5154e69feb5bbb0e634e654eb65feee9c5cf",
|
"rev": "570fddee2d5b5b0ed1d13837cc4dbb6cbe567056",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1086,11 +1103,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726001766,
|
"lastModified": 1726634128,
|
||||||
"narHash": "sha256-ADvEWfo0AuHR06ah1nnzOyhsG05/b5QpUc7vFNbiEfM=",
|
"narHash": "sha256-SE7USQHYRh3FN/3NWVLJ7pbEPMrVIs2JeI+nQXLgkXM=",
|
||||||
"owner": "youwen5",
|
"owner": "youwen5",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "06505a088396e2c0b9ad100302502783a6bcdb40",
|
"rev": "830d6cab49d32d14d38f9b0f6ed0b097ebd8bc49",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
KERNEL=="cpu_dma_latency", GROUP="realtime"
|
KERNEL=="cpu_dma_latency", GROUP="realtime"
|
||||||
KERNEL=="macsmc-battery", SUBSYSTEM=="power_supply", ATTR{charge_control_end_threshold}="90", ATTR{charge_control_start_threshold}="80"
|
KERNEL=="macsmc-battery", SUBSYSTEM=="power_supply", ATTR{charge_control_end_threshold}="90", ATTR{charge_control_start_threshold}="85"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
{
|
{
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
inputs.viminal.packages.${pkgs.system}.default
|
inputs.viminal.packages.${pkgs.system}.default
|
||||||
|
inputs.viminal.packages.${pkgs.system}.vimg
|
||||||
];
|
];
|
||||||
|
|
||||||
security.sudo.enable = false;
|
security.sudo.enable = false;
|
||||||
|
|
|
@ -8,11 +8,7 @@
|
||||||
grim
|
grim
|
||||||
slurp
|
slurp
|
||||||
swappy
|
swappy
|
||||||
pavucontrol
|
|
||||||
waypaper
|
|
||||||
swaybg
|
swaybg
|
||||||
pamixer
|
|
||||||
brightnessctl
|
|
||||||
|
|
||||||
bibata-cursors
|
bibata-cursors
|
||||||
libsForQt5.qtstyleplugin-kvantum
|
libsForQt5.qtstyleplugin-kvantum
|
||||||
|
@ -24,7 +20,7 @@
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
exec-once = [ "waypaper --restore" ];
|
exec-once = [ "${pkgs.waypaper}/bin/waypaper --restore" ];
|
||||||
"$mod" = "SUPER";
|
"$mod" = "SUPER";
|
||||||
"$Left" = "H";
|
"$Left" = "H";
|
||||||
"$Right" = "L";
|
"$Right" = "L";
|
||||||
|
@ -41,11 +37,12 @@
|
||||||
# External reserved keys: SUPER + Z and SUPER + X for zen-browser.
|
# External reserved keys: SUPER + Z and SUPER + X for zen-browser.
|
||||||
|
|
||||||
# Application Keybinds
|
# Application Keybinds
|
||||||
"$mod, T, exec, kitty"
|
"$mod, T, exec, ${pkgs.kitty}/bin/kitty"
|
||||||
"$mod, E, exec, dolphin"
|
"$mod, E, exec, ${pkgs.dolphin}/bin/dolphin"
|
||||||
"$mod, R, exec, pavucontrol -t 3" # open pavucontrol on 'outputs' tab
|
"$mod, R, exec, ${pkgs.pavucontrol}/bin/pavucontrol -t 3" # open pavucontrol on 'outputs' tab
|
||||||
"$mod, M, exec, thunderbird"
|
"$mod, M, exec, ${pkgs.thunderbird}/bin/thunderbird"
|
||||||
"$mod, B, exec, waypaper"
|
"$mod, B, exec, ${pkgs.waypaper}/bin/waypaper"
|
||||||
|
"$mod, A, exec, ${pkgs.neovide}/bin/neovide"
|
||||||
|
|
||||||
# Window actions
|
# Window actions
|
||||||
"$mod, Q, killactive"
|
"$mod, Q, killactive"
|
||||||
|
@ -113,10 +110,10 @@
|
||||||
"$mod, I, exec, hyprlock"
|
"$mod, I, exec, hyprlock"
|
||||||
|
|
||||||
# Media controls
|
# Media controls
|
||||||
",XF86AudioMute, exec, pamixer -t"
|
",XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -t"
|
||||||
",XF86AudioPlay, exec, playerctl play-pause"
|
",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
|
||||||
",XF86AudioNext, exec, playerctl next"
|
",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next"
|
||||||
",XF86AudioRewind, exec, playerctl previous"
|
",XF86AudioRewind, exec, ${pkgs.playerctl}/bin/playerctl previous"
|
||||||
]
|
]
|
||||||
++ (
|
++ (
|
||||||
if pkgs.system != "aarch64-linux" then [ "$mod, F, exec, zen" ] else [ "$mod, F, exec, floorp" ]
|
if pkgs.system != "aarch64-linux" then [ "$mod, F, exec, zen" ] else [ "$mod, F, exec, floorp" ]
|
||||||
|
@ -126,10 +123,10 @@
|
||||||
"$mod, mouse:273, resizewindow"
|
"$mod, mouse:273, resizewindow"
|
||||||
];
|
];
|
||||||
bindel = [
|
bindel = [
|
||||||
",XF86MonBrightnessDown, exec, brightnessctl set 5%-"
|
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"
|
||||||
",XF86MonBrightnessUp, exec, brightnessctl set 5%+"
|
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%+"
|
||||||
",XF86AudioRaiseVolume, exec, pamixer -i 5"
|
",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5"
|
||||||
",XF86AudioLowerVolume, exec, pamixer -d 5"
|
",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5"
|
||||||
];
|
];
|
||||||
binde = [
|
binde = [
|
||||||
# Resize windows
|
# Resize windows
|
||||||
|
@ -154,6 +151,7 @@
|
||||||
"opacity 0.80 0.80,class:^(code-url-handler)$"
|
"opacity 0.80 0.80,class:^(code-url-handler)$"
|
||||||
"opacity 0.80 0.80,class:^(code-insiders-url-handler)$"
|
"opacity 0.80 0.80,class:^(code-insiders-url-handler)$"
|
||||||
"opacity 0.80 0.80,class:^(kitty)$"
|
"opacity 0.80 0.80,class:^(kitty)$"
|
||||||
|
"opacity 0.80 0.80,class:^(neovide)$"
|
||||||
"opacity 0.80 0.80,class:^(org.kde.dolphin)$"
|
"opacity 0.80 0.80,class:^(org.kde.dolphin)$"
|
||||||
"opacity 0.80 0.80,class:^(org.kde.ark)$"
|
"opacity 0.80 0.80,class:^(org.kde.ark)$"
|
||||||
"opacity 0.80 0.80,class:^(nwg-look)$"
|
"opacity 0.80 0.80,class:^(nwg-look)$"
|
||||||
|
@ -351,7 +349,7 @@
|
||||||
services.hypridle = {
|
services.hypridle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
|
lock_cmd = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock"; # avoid starting multiple hyprlock instances.
|
||||||
before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
|
before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
|
||||||
after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
|
after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,6 +9,7 @@ pkgs: with pkgs; [
|
||||||
|
|
||||||
# utils
|
# utils
|
||||||
nurl # helps fetch git data for nixpkgs
|
nurl # helps fetch git data for nixpkgs
|
||||||
|
ffmpeg
|
||||||
|
|
||||||
# nix related
|
# nix related
|
||||||
#
|
#
|
||||||
|
|
|
@ -24,6 +24,16 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.neovide = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
font = {
|
||||||
|
normal = [ ];
|
||||||
|
size = 12;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# programs.firefox = {
|
# programs.firefox = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# # package = pkgs.librewolf;
|
# # package = pkgs.librewolf;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
# home.file.".config/waybar/config".source = ./config.jsonc;
|
|
||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
style = ./style.css;
|
style = ./style.css;
|
||||||
|
@ -67,16 +67,16 @@
|
||||||
backlight = {
|
backlight = {
|
||||||
interval = 2;
|
interval = 2;
|
||||||
format = " {percent}%";
|
format = " {percent}%";
|
||||||
on-scroll-up = "brightnessctl set +4";
|
on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl set +4";
|
||||||
on-scroll-down = "brightnessctl set 4-";
|
on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl set 4-";
|
||||||
};
|
};
|
||||||
|
|
||||||
wireplumber = {
|
wireplumber = {
|
||||||
format = "{icon} {volume}%";
|
format = "{icon} {volume}%";
|
||||||
format-muted = " ";
|
format-muted = " ";
|
||||||
on-click = "pamixer -t";
|
on-click = "pamixer -t";
|
||||||
on-scroll-up = "pamixer set 5%+";
|
on-scroll-up = "${pkgs.pamixer}/bin/pamixer set 5%+";
|
||||||
on-scroll-down = "pamixer set 5%-";
|
on-scroll-down = "${pkgs.pamixer}/bin/pamixer set 5%-";
|
||||||
format-icons = [
|
format-icons = [
|
||||||
""
|
""
|
||||||
""
|
""
|
||||||
|
|
Loading…
Reference in a new issue