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";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
hyprland,
|
||||
...
|
||||
outputs =
|
||||
{ self
|
||||
, nixpkgs
|
||||
, home-manager
|
||||
, hyprland
|
||||
, ...
|
||||
}@inputs: {
|
||||
nixosConfigurations.nixos =
|
||||
let
|
||||
|
@ -52,5 +52,7 @@
|
|||
];
|
||||
in
|
||||
nixpkgs.lib.nixosSystem { inherit system modules; };
|
||||
|
||||
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
{
|
||||
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" ];
|
||||
|
@ -14,27 +15,32 @@
|
|||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/2EFE-3A26";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/2EFE-3A26";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
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";
|
||||
};
|
||||
|
||||
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";
|
||||
};
|
||||
|
||||
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";
|
||||
};
|
||||
|
||||
|
|
|
@ -129,6 +129,27 @@
|
|||
libsForQt5.qtwayland
|
||||
qt6Packages.qtstyleplugin-kvantum
|
||||
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 =
|
||||
[ # Include the results of the hardware scan.
|
||||
[
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
# Include service configuration
|
||||
./services/caddy.nix
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
cpu_mhz = true;
|
||||
cpu_load_change = true;
|
||||
cpu_load_value = [ 60 90 ];
|
||||
cpu_load_color= [ "39F900" "FDFD09" "B22222" ];
|
||||
cpu_load_color = [ "39F900" "FDFD09" "B22222" ];
|
||||
|
||||
|
||||
# IO Statistics
|
||||
|
@ -57,7 +57,7 @@
|
|||
no_display = true;
|
||||
|
||||
# Where to output log files.
|
||||
output_folder=/home/wizardlink/.config/MangoHud;
|
||||
output_folder = /home/wizardlink/.config/MangoHud;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,6 +4,6 @@
|
|||
programs.wezterm = {
|
||||
enable = true;
|
||||
extraConfig = builtins.readFile ./wezterm.lua;
|
||||
package = (pkgs.callPackage ./package.nix {});
|
||||
package = (pkgs.callPackage ./package.nix { });
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
{
|
||||
fetchFromGitHub,
|
||||
flavor ? "Mocha",
|
||||
lib,
|
||||
stdenvNoCC
|
||||
}: let
|
||||
validFlavors = ["Frappe" "Latte" "Macchiato" "Mocha"];
|
||||
{ fetchFromGitHub
|
||||
, flavor ? "Mocha"
|
||||
, lib
|
||||
, stdenvNoCC
|
||||
}:
|
||||
let
|
||||
validFlavors = [ "Frappe" "Latte" "Macchiato" "Mocha" ];
|
||||
pname = "catppucin-qt5ct";
|
||||
in
|
||||
lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ]
|
||||
lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ]
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "unstable-2023-10-24";
|
||||
|
||||
|
@ -34,4 +35,4 @@ in
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue