matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: replace 'with' with attrValues

Browse source
This commit is contained in:
matt1432 2024-08-31 19:16:06 -04:00
parent b47c11362d
commit 194c140dc1
56 changed files with 675 additions and 608 deletions

31
nixosModules/ags/default.nix
View file

@ -111,23 +111,26 @@ in {
packages =
[
(pkgs.callPackage ./clipboard {})
# TODO: replace with matugen
self.packages.${pkgs.system}.coloryou
]
++ (with pkgs; [
# ags
dart-sass
bun
playerctl
(callPackage ./clipboard {})
## gui
pavucontrol # TODO: replace with ags widget
])
++ (optionals cfgDesktop.isTouchscreen (with pkgs; [
lisgd
ydotool
]));
++ (builtins.attrValues {
inherit
(pkgs)
dart-sass
bun
playerctl
pavucontrol # TODO: replace with ags widget
;
})
++ (optionals cfgDesktop.isTouchscreen (builtins.attrValues {
inherit
(pkgs)
lisgd
ydotool
;
}));
};
wayland.windowManager.hyprland = {

44
nixosModules/desktop/environment/default.nix
View file

@ -51,8 +51,8 @@ in {
xdg.portal = {
enable = true;
extraPortals = with pkgs; [
kdePackages.xdg-desktop-portal-kde
extraPortals = [
pkgs.kdePackages.xdg-desktop-portal-kde
];
config.hyprland = {
@ -203,24 +203,28 @@ in {
};
# libs
home.packages = with pkgs; [
# tools
bluez-tools
brightnessctl
pulseaudio
alsa-utils
qt5.qtwayland
qt6.qtwayland
libayatana-appindicator
xdg-utils
evtest
glib
xorg.xrandr
libinput
xclip
libnotify
];
home.packages =
(builtins.attrValues {
inherit
(pkgs)
bluez-tools
brightnessctl
pulseaudio
alsa-utils
libayatana-appindicator
xdg-utils
evtest
glib
libinput
xclip
libnotify
;
})
++ [
pkgs.qt5.qtwayland
pkgs.qt6.qtwayland
pkgs.xorg.xrandr
];
};
};

30
nixosModules/desktop/environment/home/mpv.nix
View file

@ -3,24 +3,32 @@ self: {pkgs, ...}: {
inherit (self.legacyPackages.${pkgs.system}) mpvScripts;
in {
# For kdialog-open-files
home.packages = with pkgs; [
kdialog
home.packages = [
pkgs.kdialog
];
programs.mpv = {
enable = true;
# https://github.com/mpv-player/mpv/wiki/User-Scripts
scripts = with mpvScripts; [
modernx
# Dep of touch-gestures
pointer-event
touch-gestures
scripts = builtins.attrValues {
inherit
(mpvScripts)
modernx
persist-properties
undo-redo
;
# touch-gestures & deps
inherit
(mpvScripts)
pointer-event
touch-gestures
;
# Ctrl + o
kdialog-open-files
persist-properties
undo-redo
];
inherit (mpvScripts) kdialog-open-files;
};
scriptOpts = {
persist_properties = {

25
nixosModules/desktop/environment/modules/dolphin.nix
View file

@ -6,8 +6,8 @@
config = let
cfg = config.roles.desktop;
in {
environment.systemPackages = with pkgs; [
plasma5Packages.kio-admin
environment.systemPackages = [
pkgs.plasma5Packages.kio-admin
];
# To make it work with firefox
@ -26,20 +26,22 @@
};
};
home-manager.users.${cfg.user}.home.packages = with pkgs;
[
home-manager.users.${cfg.user}.home.packages = builtins.attrValues {
inherit
(pkgs)
gnome-calculator
]
++ (with kdePackages; [
;
inherit
(pkgs.kdePackages)
kde-cli-tools
])
++ (with plasma5Packages; [
;
inherit
(pkgs.plasma5Packages)
ark
kcharselect
kdenlive
okular
# Dolphin & co
dolphin
dolphin-plugins
kdegraphics-thumbnailers
@ -48,7 +50,8 @@
kio-admin # needs to be both here and in system pkgs
kio-extras
kmime
]);
;
};
};
# For accurate stack trace

120
nixosModules/desktop/environment/modules/packages.nix
View file

@ -76,70 +76,84 @@ in {
};
home.packages =
(with pkgs; [
(builtins.attrValues {
# School
xournalpp
virt-manager
libreoffice-fresh # TODO: declarative conf?
hunspell
hunspellDicts.en_CA
inherit (pkgs.hunspellDicts) en_CA;
inherit
(pkgs)
xournalpp
virt-manager
libreoffice-fresh # TODO: declarative conf?
hunspell
;
# Apps
protonmail-desktop
protonmail-bridge
spotifywm
photoqt
nextcloud-client
prismlauncher
/*
Discord themes for Vencord
https://markchan0225.github.io/RoundedDiscord/RoundedDiscord.theme.css
https://raw.githubusercontent.com/dracula/BetterDiscord/master/Dracula_Official.theme.css
*/
(discord.override {withVencord = true;})
(symlinkJoin {
name = "gparted";
paths = [gparted];
buildInputs = [makeWrapper];
postBuild = let
newWrapper = writeShellScriptBin "Gparted" ''
(
sleep 1.5
while killall -r -0 ksshaskpass > /dev/null 2>&1
do
sleep 0.1
if [[ $(hyprctl activewindow | grep Ksshaskpass) == "" ]]; then
killall -r ksshaskpass
fi
done
) &
exec env SUDO_ASKPASS="${libsForQt5.ksshaskpass}/bin/ksshaskpass" sudo -k -EA "${getExe gparted}" "$@"
'';
in ''
mkdir $out/.wrapped
mv $out/bin/gparted $out/.wrapped
cp ${getExe newWrapper} $out/bin/gparted
sed -i "s#Exec.*#Exec=$out/bin/gparted %f#" $out/share/applications/gparted.desktop
'';
})
inherit
(pkgs)
protonmail-desktop
protonmail-bridge
spotifywm
photoqt
nextcloud-client
prismlauncher
;
# tools
wl-color-picker
wl-clipboard
cliphist
grim-hyprland
slurp
satty
])
inherit
(pkgs)
wl-color-picker
wl-clipboard
cliphist
grim-hyprland
slurp
satty
;
})
++ [
(jellyfin-flake
.packages
.${pkgs.system}
.jellyfin-media-player
.override {isNvidiaWayland = isNvidia;})
/*
Discord themes for Vencord
https://markchan0225.github.io/RoundedDiscord/RoundedDiscord.theme.css
https://raw.githubusercontent.com/dracula/BetterDiscord/master/Dracula_Official.theme.css
*/
(pkgs.discord.override {withVencord = true;})
# GParted
(let
inherit (pkgs) writeShellScriptBin libsForQt5 gparted makeWrapper symlinkJoin;
newWrapper = writeShellScriptBin "Gparted" ''
(
sleep 1.5
while killall -r -0 ksshaskpass > /dev/null 2>&1
do
sleep 0.1
if [[ $(hyprctl activewindow | grep Ksshaskpass) == "" ]]; then
killall -r ksshaskpass
fi
done
) &
exec env SUDO_ASKPASS="${libsForQt5.ksshaskpass}/bin/ksshaskpass" sudo -k -EA "${getExe gparted}" "$@"
'';
in
symlinkJoin {
name = "gparted";
paths = [gparted];
buildInputs = [makeWrapper];
postBuild = let
in ''
mkdir $out/.wrapped
mv $out/bin/gparted $out/.wrapped
cp ${getExe newWrapper} $out/bin/gparted
sed -i "s#Exec.*#Exec=$out/bin/gparted %f#" $out/share/applications/gparted.desktop
'';
})
];
wayland.windowManager.hyprland = {

5
nixosModules/desktop/environment/modules/printer.nix
View file

@ -4,8 +4,9 @@
# Enable CUPS to print documents.
printing = {
enable = true;
drivers = with pkgs; [
hplip
drivers = [
pkgs.hplip
];
};
};

11
nixosModules/desktop/manager/ags/default.nix
View file

@ -58,10 +58,13 @@ in {
];
};
buildInputs = with pkgs; [
bun
dart-sass
];
buildInputs = builtins.attrValues {
inherit
(pkgs)
bun
dart-sass
;
};
buildPhase = ''
sass ./scss/greeter.scss style.css

4
nixosModules/desktop/theme/gtk/default.nix
View file

@ -9,8 +9,8 @@
cfg = osConfig.roles.desktop;
in {
home.packages = with pkgs; [
gnomeExtensions.user-themes
home.packages = [
pkgs.gnomeExtensions.user-themes
];
# Gtk settings

2
nixosModules/desktop/theme/hyprpaper.nix
View file

@ -6,7 +6,7 @@ self: {
config = let
wallpaper = toString self.legacyPackages.${pkgs.system}.dracula.wallpaper;
in {
home.packages = with pkgs; [hyprpaper];
home.packages = [pkgs.hyprpaper];
xdg.configFile."hypr/hyprpaper.conf" = {
text = lib.hm.generators.toHyprconf {

6
nixosModules/desktop/theme/qt.nix
View file

@ -9,9 +9,9 @@ self: {
cfg = osConfig.roles.desktop;
in {
home.packages = with pkgs; [
libsForQt5.qtstyleplugin-kvantum
kdePackages.qtstyleplugin-kvantum
home.packages = [
pkgs.libsForQt5.qtstyleplugin-kvantum
pkgs.kdePackages.qtstyleplugin-kvantum
];
qt = {

4
nixosModules/docker/default.nix
View file

@ -38,8 +38,8 @@ in {
};
# Script for updating the images of all images of a compose.nix file
environment.systemPackages = with pkgs; [
(callPackage ./updateImage.nix {})
environment.systemPackages = [
(pkgs.callPackage ./updateImage.nix {})
];
};

32
nixosModules/nvidia/default.nix
View file

@ -33,12 +33,15 @@ in {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
nvidia-vaapi-driver
];
extraPackages32 = with pkgs; [vaapiVdpau];
extraPackages = builtins.attrValues {
inherit
(pkgs)
vaapiVdpau
libvdpau-va-gl
nvidia-vaapi-driver
;
};
extraPackages32 = [pkgs.vaapiVdpau];
};
services.xserver.videoDrivers = ["nvidia"];
@ -71,13 +74,16 @@ in {
environment.systemPackages =
optionals cfg.enableCUDA [pkgs.cudaPackages.cudatoolkit]
++ (with pkgs; [
libva-utils
nvidia-vaapi-driver
nvtopPackages.nvidia
pciutils
vdpauinfo
]);
++ (builtins.attrValues {
inherit (pkgs.nvtopPackages) nvidia;
inherit
(pkgs)
libva-utils
nvidia-vaapi-driver
pciutils
vdpauinfo
;
});
boot.kernelModules =
optionals cfg.enableCUDA ["nvidia-uvm"]