[fix] Use lib.optionals where possible

This commit is contained in:
uttarayan21
2024-03-11 09:16:47 +05:30
parent 3487d5eb28
commit 6fcac28663
4 changed files with 18 additions and 12 deletions

View File

@@ -9,8 +9,8 @@ in
# Include the results of the hardware scan. # Include the results of the hardware scan.
./tmux.nix ./tmux.nix
./wezterm.nix ./wezterm.nix
] ++ (if device.isLinux then [ ../linux ] else [ ]) ] ++ lib.optionals device.isLinux [ ../linux ]
++ (if !lazy then [ ./nvim ] else [ ]); ++ lib.optionals (!lazy) [ ./nvim ];
home.packages = with pkgs; home.packages = with pkgs;
[ [
@@ -19,7 +19,6 @@ in
neovide neovide
sqls sqls
vcpkg vcpkg
# vcpkg-tool
file file
yt-dlp yt-dlp
ngrok ngrok
@@ -50,7 +49,7 @@ in
lua-language-server lua-language-server
(nerdfonts.override { fonts = [ "Hasklig" ]; }) (nerdfonts.override { fonts = [ "Hasklig" ]; })
mpv mpv
] ++ (if device.isLinux then [ ] ++ lib.optionals device.isLinux [
gnome.seahorse gnome.seahorse
gnome.nautilus gnome.nautilus
nextcloud-client nextcloud-client
@@ -71,7 +70,6 @@ in
accent = "mauve"; accent = "mauve";
flavor = "mocha"; flavor = "mocha";
}) })
swaynotificationcenter
usbutils usbutils
handlr-regex handlr-regex
webcord-vencord webcord-vencord
@@ -86,8 +84,7 @@ in
handlr open "$@" handlr open "$@"
''; '';
}) })
] else ] ++ lib.optionals device.isMac [ ];
[ ]) ++ (if device.isMac then [ ] else [ ]);
# xdg.enable = true; # xdg.enable = true;
@@ -126,9 +123,7 @@ in
ls = "eza"; ls = "eza";
t = "${start-tmux}"; t = "${start-tmux}";
}; };
shellAliases = { shellAliases = { g = "git"; };
g = "git";
};
shellInit = '' shellInit = ''
set fish_greeting set fish_greeting
yes | fish_config theme save "Catppuccin Mocha" yes | fish_config theme save "Catppuccin Mocha"
@@ -144,6 +139,7 @@ in
shellAliases = { shellAliases = {
cd = "z"; cd = "z";
yy = "yazi"; yy = "yazi";
nv = "neovide";
}; };
package = pkgs.nushellFull; package = pkgs.nushellFull;
configFile.text = '' configFile.text = ''
@@ -245,6 +241,7 @@ in
EDITOR = "nvim"; EDITOR = "nvim";
SHELL = "${pkgs.nushellFull}/bin/nu"; SHELL = "${pkgs.nushellFull}/bin/nu";
CARGO_TARGET_DIR = "${config.xdg.cacheHome}/cargo/target"; CARGO_TARGET_DIR = "${config.xdg.cacheHome}/cargo/target";
BROWSER = "xdg-open";
}; };
sessionPath = [ sessionPath = [
"${config.home.homeDirectory}/.local/bin" "${config.home.homeDirectory}/.local/bin"

View File

@@ -31,7 +31,7 @@
kb_options = "ctrl:nocaps"; kb_options = "ctrl:nocaps";
# kb_rules = ""; # kb_rules = "";
follow_mouse = 0; # follow_mouse = 0;
touchpad = { touchpad = {
natural_scroll = true; natural_scroll = true;
@@ -146,7 +146,7 @@
"$mainMod, Space, exec, ${pkgs.anyrun}/bin/anyrun" "$mainMod, Space, exec, ${pkgs.anyrun}/bin/anyrun"
"$mainMod, p, pseudo, # dwindle" "$mainMod, p, pseudo, # dwindle"
"$mainMod, v, togglesplit," "$mainMod, v, togglesplit,"
"$mainMod, a, exec, swaync-client -t" # "$mainMod, a, exec, swaync-client -t"
"$mainMod, Tab, cyclenext" "$mainMod, Tab, cyclenext"
# Audio # Audio
",xf86audioraisevolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume raise" ",xf86audioraisevolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume raise"

View File

@@ -73,6 +73,13 @@
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;
hardware.bluetooth.settings = {
General = {
Name = "Ryu";
Enable = "Source,Sink,Media,Socket";
};
};
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = pkgs.lib.mkForce false; boot.loader.systemd-boot.enable = pkgs.lib.mkForce false;

View File

@@ -46,6 +46,8 @@
}; };
# hardware.bluetooth.settings = {
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =
[ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];