style: Align formatting and organize imports
This commit is contained in:
parent
fe9b420f30
commit
1d325819ee
3 changed files with 23 additions and 21 deletions
17
flake.nix
17
flake.nix
|
@ -192,18 +192,19 @@
|
|||
# list paths
|
||||
pkgs-paths-list = pkgs.lib.fileset.toList (pkgs.lib.fileset.fromSource (pkgs.lib.sources.sourceFilesBySuffices ./pkgs [ ".nix" ]));
|
||||
# filename-extension parsed out
|
||||
pkgs-paths = (builtins.map
|
||||
(path: {
|
||||
name = (pkgs.lib.strings.removeSuffix ".nix" (builtins.baseNameOf path));
|
||||
path = path;
|
||||
})
|
||||
pkgs-paths-list);
|
||||
pkgs-paths =
|
||||
builtins.map
|
||||
(path: {
|
||||
name = pkgs.lib.strings.removeSuffix ".nix" (builtins.baseNameOf path);
|
||||
path = path;
|
||||
})
|
||||
pkgs-paths-list;
|
||||
# import each path
|
||||
imported-pkgs = (pkgs.lib.attrsets.mergeAttrsList (builtins.map
|
||||
imported-pkgs = pkgs.lib.attrsets.mergeAttrsList (builtins.map
|
||||
(pkg: {
|
||||
"${pkg.name}" = pkgs.callPackage pkg.path { };
|
||||
})
|
||||
pkgs-paths));
|
||||
pkgs-paths);
|
||||
in
|
||||
imported-pkgs;
|
||||
diskoConfigurations = {
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
];
|
||||
};
|
||||
|
||||
xdg.desktopEntries= {
|
||||
xdg.desktopEntries = {
|
||||
steam-15 = {
|
||||
name = "Steam (1.5 Scaling)";
|
||||
type = "Application";
|
||||
|
@ -59,7 +59,6 @@
|
|||
bitwarden
|
||||
airshipper
|
||||
ardour
|
||||
# blender
|
||||
brave
|
||||
cavalier
|
||||
ffmpeg
|
||||
|
@ -70,7 +69,6 @@
|
|||
jellyfin-mpv-shim
|
||||
warp-terminal
|
||||
libsForQt5.kasts
|
||||
# miraclecast
|
||||
krita
|
||||
kdePackages.kate
|
||||
kdePackages.kdenlive
|
||||
|
@ -81,7 +79,6 @@
|
|||
nextcloud-client
|
||||
onlyoffice-bin
|
||||
protonup-qt
|
||||
# rustdesk
|
||||
signal-desktop
|
||||
webcord-vencord
|
||||
tome4
|
||||
|
@ -89,15 +86,21 @@
|
|||
gst_all_1.gst-vaapi
|
||||
waypipe
|
||||
veracrypt
|
||||
# deadbeef-with-plugins
|
||||
lutris
|
||||
heroic
|
||||
# qbittorrent
|
||||
unar
|
||||
fuse # TODO Why needed ?
|
||||
pcsx2
|
||||
# flightgear
|
||||
kdePackages.konversation
|
||||
unar
|
||||
fuse
|
||||
qbittorrent
|
||||
pcsx2
|
||||
xdelta
|
||||
winetricks
|
||||
# blender
|
||||
# miraclecast
|
||||
# rustdesk
|
||||
# deadbeef-with-plugins
|
||||
# flightgear
|
||||
# orbiter
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
, portaudio
|
||||
,
|
||||
}:
|
||||
|
||||
let
|
||||
python3 = python311.override {
|
||||
self = python3;
|
||||
|
@ -30,8 +29,7 @@ python3.pkgs.buildPythonApplication {
|
|||
|
||||
build-system = with python3.pkgs; [ setuptools-scm ];
|
||||
|
||||
dependencies =
|
||||
with python3.pkgs;
|
||||
dependencies = with python3.pkgs;
|
||||
[
|
||||
aiohappyeyeballs
|
||||
backoff
|
||||
|
|
Loading…
Add table
Reference in a new issue