chore: format all files to nixpkgs standards
This commit is contained in:
parent
c089af45ef
commit
965ac78482
14
flake.nix
14
flake.nix
|
@ -23,12 +23,12 @@
|
||||||
custom-neovim.url = "github:wizardlink/neovim";
|
custom-neovim.url = "github:wizardlink/neovim";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs =
|
||||||
self,
|
{ self
|
||||||
nixpkgs,
|
, nixpkgs
|
||||||
home-manager,
|
, home-manager
|
||||||
hyprland,
|
, hyprland
|
||||||
...
|
, ...
|
||||||
}@inputs: {
|
}@inputs: {
|
||||||
nixosConfigurations.nixos =
|
nixosConfigurations.nixos =
|
||||||
let
|
let
|
||||||
|
@ -52,5 +52,7 @@
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
nixpkgs.lib.nixosSystem { inherit system modules; };
|
nixpkgs.lib.nixosSystem { inherit system modules; };
|
||||||
|
|
||||||
|
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
|
@ -14,27 +15,32 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/2EFE-3A26";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/2EFE-3A26";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/mnt/ssd" =
|
fileSystems."/mnt/ssd" =
|
||||||
{ device = "/dev/disk/by-uuid/f27f2224-d351-46fd-89f5-991de36166ad";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/f27f2224-d351-46fd-89f5-991de36166ad";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/mnt/internal" =
|
fileSystems."/mnt/internal" =
|
||||||
{ device = "/dev/disk/by-uuid/b8541c0d-9146-4388-b217-431f196957cc";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/b8541c0d-9146-4388-b217-431f196957cc";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/mnt/media" =
|
fileSystems."/mnt/media" =
|
||||||
{ device = "/dev/disk/by-uuid/52c17b8b-46c1-4870-b86c-c3b9f4bd4434";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/52c17b8b-46c1-4870-b86c-c3b9f4bd4434";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -129,6 +129,27 @@
|
||||||
libsForQt5.qtwayland
|
libsForQt5.qtwayland
|
||||||
qt6Packages.qtstyleplugin-kvantum
|
qt6Packages.qtstyleplugin-kvantum
|
||||||
qt6Packages.qtwayland
|
qt6Packages.qtwayland
|
||||||
|
|
||||||
|
# Create an FHS environment using the command `fhs`, enabling the execution of non-NixOS packages in NixOS!
|
||||||
|
(
|
||||||
|
let base = pkgs.appimageTools.defaultFhsEnvArgs; in
|
||||||
|
pkgs.buildFHSUserEnv (base // {
|
||||||
|
name = "fhs";
|
||||||
|
targetPkgs = pkgs: (
|
||||||
|
# pkgs.buildFHSUserEnv provides only a minimal FHS environment,
|
||||||
|
# lacking many basic packages needed by most software.
|
||||||
|
# Therefore, we need to add them manually.
|
||||||
|
#
|
||||||
|
# pkgs.appimageTools provides basic packages required by most software.
|
||||||
|
(base.targetPkgs pkgs) ++ (with pkgs; [
|
||||||
|
nodejs
|
||||||
|
])
|
||||||
|
);
|
||||||
|
profile = "export FHS=1";
|
||||||
|
runScript = "bash";
|
||||||
|
extraOutputsToInstall = [ "dev" ];
|
||||||
|
})
|
||||||
|
)
|
||||||
];
|
];
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -10,7 +10,8 @@
|
||||||
##
|
##
|
||||||
|
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[
|
||||||
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
# Include service configuration
|
# Include service configuration
|
||||||
./services/caddy.nix
|
./services/caddy.nix
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
cpu_mhz = true;
|
cpu_mhz = true;
|
||||||
cpu_load_change = true;
|
cpu_load_change = true;
|
||||||
cpu_load_value = [ 60 90 ];
|
cpu_load_value = [ 60 90 ];
|
||||||
cpu_load_color= [ "39F900" "FDFD09" "B22222" ];
|
cpu_load_color = [ "39F900" "FDFD09" "B22222" ];
|
||||||
|
|
||||||
|
|
||||||
# IO Statistics
|
# IO Statistics
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
no_display = true;
|
no_display = true;
|
||||||
|
|
||||||
# Where to output log files.
|
# Where to output log files.
|
||||||
output_folder=/home/wizardlink/.config/MangoHud;
|
output_folder = /home/wizardlink/.config/MangoHud;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,6 @@
|
||||||
programs.wezterm = {
|
programs.wezterm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = builtins.readFile ./wezterm.lua;
|
extraConfig = builtins.readFile ./wezterm.lua;
|
||||||
package = (pkgs.callPackage ./package.nix {});
|
package = (pkgs.callPackage ./package.nix { });
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,16 @@
|
||||||
{
|
{ fetchFromGitHub
|
||||||
fetchFromGitHub,
|
, flavor ? "Mocha"
|
||||||
flavor ? "Mocha",
|
, lib
|
||||||
lib,
|
, stdenvNoCC
|
||||||
stdenvNoCC
|
}:
|
||||||
}: let
|
let
|
||||||
validFlavors = ["Frappe" "Latte" "Macchiato" "Mocha"];
|
validFlavors = [ "Frappe" "Latte" "Macchiato" "Mocha" ];
|
||||||
pname = "catppucin-qt5ct";
|
pname = "catppucin-qt5ct";
|
||||||
in
|
in
|
||||||
lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ]
|
lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ]
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation
|
||||||
|
{
|
||||||
inherit pname;
|
inherit pname;
|
||||||
version = "unstable-2023-10-24";
|
version = "unstable-2023-10-24";
|
||||||
|
|
||||||
|
@ -34,4 +35,4 @@ in
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue