Compare commits

..

7 Commits

Author SHA1 Message Date
Andreas Schaafsma
830f8d51b3 add missing parts of the dir structure 2024-11-12 22:54:37 +01:00
Andreas Schaafsma
59032852f0 add sample hello package (copied from nixpkgs) 2024-11-12 22:54:06 +01:00
Andreas Schaafsma
8df8a7ed39 add required packages for interfacing with ntfs and modifying partitions 2024-11-12 22:53:35 +01:00
Andreas Schaafsma
6d3c3630a1 add obsidian to andreas@drivebystation 2024-11-12 22:53:11 +01:00
Andreas Schaafsma
f26e79c734 update hardware config 2024-11-12 22:52:54 +01:00
Andreas Schaafsma
2adff754bd update hardware config 2024-11-12 22:52:35 +01:00
Andreas Schaafsma
3097ba6084 add vscode task for building 2024-11-12 22:49:01 +01:00
11 changed files with 99 additions and 7 deletions

21
.vscode/tasks.json vendored Normal file
View 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
}
}
]
}

View File

View File

@ -26,6 +26,7 @@ in
pkgs.my-namespace.udev-steelseries
pkgs.qbittorrent
pkgs.vesktop
pkgs.obsidian
];
};
}

0
modules/.gitkeep Normal file
View File

0
overlays/.gitkeep Normal file
View File

View 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;
};
})

View File

View File

@ -8,7 +8,6 @@
imports =
[
./hardware-configuration.nix
./nvidia.nix
];
# Bootloader.

View File

@ -83,6 +83,9 @@ in
git
pkgs.wine
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.
# wget
]

View File

@ -7,14 +7,13 @@
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
./nvidia.nix
./acer-monitor-edid.nix
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.blacklistedKernelModules = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76";
fsType = "ext4";

View File

@ -12,11 +12,12 @@
# "nvidia-drm.fbdev=1"
#];
boot.blacklistedKernelModules = [
# "i915"
# "amdgpu"
"nouveau"
"i915"
"amdgpu"
"nouveau"
];
services.xserver.videoDrivers = [ "nvidia" ];
boot.initrd.kernelModules = [ "nvidia" ];
#boot.initrd.kernelModules = [ "nvidia" ];