Compare commits
7 Commits
cae95f99af
...
830f8d51b3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
830f8d51b3 | ||
|
|
59032852f0 | ||
|
|
8df8a7ed39 | ||
|
|
6d3c3630a1 | ||
|
|
f26e79c734 | ||
|
|
2adff754bd | ||
|
|
3097ba6084 |
21
.vscode/tasks.json
vendored
Normal file
21
.vscode/tasks.json
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
// See https://go.microsoft.com/fwlink/?LinkId=733558
|
||||||
|
// for the documentation about the tasks.json format
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"type": "shell",
|
||||||
|
"label": "nixos-rebuild",
|
||||||
|
"command": "bash",
|
||||||
|
"args": [
|
||||||
|
"-c",
|
||||||
|
"sudo nixos-rebuild switch --flake ."
|
||||||
|
],
|
||||||
|
"problemMatcher": [],
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
0
homes/x86_64-iso/.gitkeep
Normal file
0
homes/x86_64-iso/.gitkeep
Normal file
@ -26,6 +26,7 @@ in
|
|||||||
pkgs.my-namespace.udev-steelseries
|
pkgs.my-namespace.udev-steelseries
|
||||||
pkgs.qbittorrent
|
pkgs.qbittorrent
|
||||||
pkgs.vesktop
|
pkgs.vesktop
|
||||||
|
pkgs.obsidian
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
0
modules/.gitkeep
Normal file
0
modules/.gitkeep
Normal file
0
overlays/.gitkeep
Normal file
0
overlays/.gitkeep
Normal file
68
packages/hello/default.nix
Normal file
68
packages/hello/default.nix
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
{
|
||||||
|
# Snowfall Lib provides a customized `lib` instance with access to your flake's library
|
||||||
|
# as well as the libraries available from your flake's inputs.
|
||||||
|
lib,
|
||||||
|
# You also have access to your flake's inputs.
|
||||||
|
inputs,
|
||||||
|
|
||||||
|
# The namespace used for your flake, defaulting to "internal" if not set.
|
||||||
|
namespace,
|
||||||
|
|
||||||
|
# All other arguments come from NixPkgs. You can use `pkgs` to pull packages or helpers
|
||||||
|
# programmatically or you may add the named attributes as arguments here.
|
||||||
|
stdenv,
|
||||||
|
fetchurl,
|
||||||
|
nixos,
|
||||||
|
testers,
|
||||||
|
versionCheckHook,
|
||||||
|
hello,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "hello";
|
||||||
|
version = "2.12.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz";
|
||||||
|
hash = "sha256-jZkUKv2SV28wsM18tCqNxoCZmLxdYH2Idh9RLibH2yA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
# The GNU Hello `configure` script detects how to link libiconv but fails to actually make use of that.
|
||||||
|
# Unfortunately, this cannot be a patch to `Makefile.am` because `autoreconfHook` causes a gettext
|
||||||
|
# infrastructure mismatch error when trying to build `hello`.
|
||||||
|
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||||
|
NIX_LDFLAGS = "-liconv";
|
||||||
|
};
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
doInstallCheck = true;
|
||||||
|
nativeInstallCheckInputs = [
|
||||||
|
versionCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
# Give hello some install checks for testing purpose.
|
||||||
|
postInstallCheck = ''
|
||||||
|
stat "''${!outputBin}/bin/${finalAttrs.meta.mainProgram}"
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
version = testers.testVersion { package = hello; };
|
||||||
|
};
|
||||||
|
|
||||||
|
passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Program that produces a familiar, friendly greeting";
|
||||||
|
longDescription = ''
|
||||||
|
GNU Hello is a program that prints "Hello, world!" when you run it.
|
||||||
|
It is fully customizable.
|
||||||
|
'';
|
||||||
|
homepage = "https://www.gnu.org/software/hello/manual/";
|
||||||
|
changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";
|
||||||
|
license = lib.licenses.gpl3Plus;
|
||||||
|
maintainers = with lib.maintainers; [ stv0g ];
|
||||||
|
mainProgram = "hello";
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
};
|
||||||
|
})
|
||||||
0
systems/x86_64-iso/.gitkeep
Normal file
0
systems/x86_64-iso/.gitkeep
Normal file
@ -8,7 +8,6 @@
|
|||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./nvidia.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
|
|||||||
@ -83,6 +83,9 @@ in
|
|||||||
git
|
git
|
||||||
pkgs.wine
|
pkgs.wine
|
||||||
pkgs.bottles
|
pkgs.bottles
|
||||||
|
pkgs.gparted
|
||||||
|
pkgs.ntfs3g
|
||||||
|
pkgs.ntfsprogs
|
||||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||||
# wget
|
# wget
|
||||||
]
|
]
|
||||||
|
|||||||
@ -7,14 +7,13 @@
|
|||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
./nvidia.nix
|
||||||
./acer-monitor-edid.nix
|
./acer-monitor-edid.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.blacklistedKernelModules = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76";
|
{ device = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
|
|||||||
@ -12,11 +12,12 @@
|
|||||||
# "nvidia-drm.fbdev=1"
|
# "nvidia-drm.fbdev=1"
|
||||||
#];
|
#];
|
||||||
boot.blacklistedKernelModules = [
|
boot.blacklistedKernelModules = [
|
||||||
# "i915"
|
"i915"
|
||||||
# "amdgpu"
|
"amdgpu"
|
||||||
"nouveau"
|
"nouveau"
|
||||||
];
|
];
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
boot.initrd.kernelModules = [ "nvidia" ];
|
||||||
#boot.initrd.kernelModules = [ "nvidia" ];
|
#boot.initrd.kernelModules = [ "nvidia" ];
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user