AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update f2fs-tools

Browse Source
This commit is contained in:
Dmitriy Kholkin 2020-09-04 23:32:11 +04:00
parent 299dad13bc
commit 89da7d69df
6 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware-configuration/Dell-Laptop.nix
View File

@ -14,11 +14,11 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/37acf829-e092-4232-85a0-3876f0b34cc8"; { device = "/dev/disk/by-uuid/ac8a1cde-9a8b-4181-acd2-719580160943";
fsType = "f2fs"; fsType = "f2fs";
}; };
boot.initrd.luks.devices."cryptnixos".device = "/dev/disk/by-uuid/ec31faea-a697-42b2-b12c-021bfd176d5b"; boot.initrd.luks.devices."cryptnixos".device = "/dev/disk/by-uuid/5cc91d59-4341-48c8-9e72-a5169b3d9a41";
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/7294-A273"; { device = "/dev/disk/by-uuid/7294-A273";

16
install/install Normal file → Executable file
View File

@ -4,15 +4,15 @@ cd ..
CONFIG_FOLDER=$(pwd) CONFIG_FOLDER=$(pwd)
cd install cd install
ENCRYPT_ROOT=false ENCRYPT_ROOT=true
FORMAT_BOOT_PARTITION=true FORMAT_BOOT_PARTITION=false
DEVICE_NAME=NixOS-VM DEVICE_NAME=Dell-Laptop
MAX_JOBS=4 MAX_JOBS=8
DEVICE=/dev/sda DEVICE=/dev/nvme0n1
BOOT_PARTITION=/dev/sda1 BOOT_PARTITION=/dev/nvme0n1p1
SWAP_PARTITION=/dev/sda3 SWAP_PARTITION=/dev/nvme0n1p3
ROOT_PARTITION=/dev/sda2 ROOT_PARTITION=/dev/nvme0n1p2
ROOT_NAME=cryptnixos ROOT_NAME=cryptnixos
gdisk $DEVICE gdisk $DEVICE

BIN
misc/Passwords.kdbx Executable file → Normal file
View File

Binary file not shown.

BIN
misc/Passwords.old.kdbx
View File

Binary file not shown.

5
modules/applications/packages.nix
View File

@ -4,6 +4,7 @@ with rec {
}; };
with deviceSpecific; { with deviceSpecific; {
programs.adb.enable = true; programs.adb.enable = true;
programs.java = { programs.java = {
enable = true; enable = true;
package = if (device == "AMD-Workstation") then pkgs.jdk13 else pkgs.jre; package = if (device == "AMD-Workstation") then pkgs.jdk13 else pkgs.jre;
@ -66,6 +67,10 @@ with deviceSpecific; {
] ++ lib.optionals (!isVM) [ ] ++ lib.optionals (!isVM) [
# rust-stable # rust-stable
libreoffice libreoffice
# Android dev
androidenv.androidPkgs_9_0.androidsdk
android-studio
# scrcpy
] ++ lib.optionals isGaming [ ] ++ lib.optionals isGaming [
# lutris # lutris
# protontricks # protontricks

15
modules/packages.nix
View File

@ -43,12 +43,14 @@
]; ];
}); });
discord = super.discord.overrideAttrs (old: rec { #TODO: Remove after nixpkgs will update to v1.14.0
version = "0.0.11"; f2fs-tools = super.f2fs-tools.overrideAttrs (old: rec {
src = pkgs.fetchurl { version = "1.14.0";
url = "https://dl.discordapp.net/apps/linux/0.0.11/discord-0.0.11.tar.gz"; src = pkgs.fetchgit {
sha256 = "1saqwigi1gjgy4q8rgnwyni57aaszi0w9vqssgyvfgzff8fpcx54"; url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
}; rev = "refs/tags/v${version}";
sha256 = "06ss05n87i1c3149qb3n7j1qp2scv3g2adx0v6ljkl59ab9b5saj";
};
}); });
spotifyd = super.spotifyd.override { withPulseAudio = true; }; spotifyd = super.spotifyd.override { withPulseAudio = true; };
@ -64,6 +66,7 @@
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
android_sdk.accept_license = true;
}; };
environment.etc.nixpkgs.source = inputs.nixpkgs; environment.etc.nixpkgs.source = inputs.nixpkgs;