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

update

Browse Source
This commit is contained in:
Dmitriy Kholkin 2021-06-29 22:27:50 +03:00
parent a425290cc8
commit 4949659d36
12 changed files with 81 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.direnv
.VSCodeCounter
result
*.bak

5
.vscode/settings.json vendored
View File

@ -1,3 +1,6 @@
{
"files.eol": "\n"
"files.eol": "\n",
"[nix]": {
"editor.tabSize": 2
}
}

17
flake.lock generated
View File

@ -84,6 +84,22 @@
"type": "github"
}
},
"multimc-cracked": {
"flake": false,
"locked": {
"lastModified": 1624669240,
"narHash": "sha256-JNiP5brnWmdbBJikWPJet7Hki7JZgq7ZeDevrIRPcXk=",
"owner": "AfoninZ",
"repo": "MultiMC5-Cracked",
"rev": "6d6218a21ba54e77c4fc76b3ae8cddf3334f1a5d",
"type": "github"
},
"original": {
"owner": "AfoninZ",
"repo": "MultiMC5-Cracked",
"type": "github"
}
},
"nix": {
"inputs": {
"nixpkgs": "nixpkgs_3"
@ -218,6 +234,7 @@
"home-manager": "home-manager",
"i3lock-fancy-rapid": "i3lock-fancy-rapid",
"materia-theme": "materia-theme",
"multimc-cracked": "multimc-cracked",
"nix": "nix",
"nixpkgs": "nixpkgs_4",
"nixpkgs-master": "nixpkgs-master",

4
flake.nix
View File

@ -46,6 +46,10 @@
url = gitlab:rycee/nur-expressions;
flake = false;
};
multimc-cracked = {
url = github:AfoninZ/MultiMC5-Cracked;
flake = false;
};
};
outputs = { nixpkgs, nix, self, ... }@inputs: {

6
install/install-btrfs.sh
View File

@ -4,9 +4,9 @@
set -e
CONFIG_FOLDER="$(dirname "$(pwd)")"
DEVICE_NAME=Dell-Laptop
MAX_JOBS=8
SWAP_SIZE=8GiB
DEVICE_NAME=AMD-Workstation
MAX_JOBS=12
SWAP_SIZE=16GiB
NIXOS_COMMIT="1905f5f2e55e0db0bb6244cfe62cb6c0dbda391d"
USE_ECNRYPTION=false

46
machines/AMD-Workstation/hardware-configuration.nix
View File

@ -1,11 +1,12 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, inputs, ... }:
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ "${inputs.nixpkgs}/nixos/modules/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.kernelModules = [ ];
@ -13,35 +14,50 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/6ff40d9f-8ed8-46c7-8bdd-da6242eae75e";
{ device = "/dev/disk/by-uuid/6dd76867-e5be-4237-9af3-1aeaf0cbe04e";
fsType = "btrfs";
options = [ "subvol=@nixos" ];
options = [ "subvol=nixos" "compress-force=zstd" "noatime" "autodefrag" "ssd" ];
};
fileSystems."/.snapshots" =
{ device = "/dev/disk/by-uuid/6ff40d9f-8ed8-46c7-8bdd-da6242eae75e";
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/6dd76867-e5be-4237-9af3-1aeaf0cbe04e";
fsType = "btrfs";
options = [ "subvol=@snapshots" ];
options = [ "subvol=nix" "compress-force=zstd" "noatime" "autodefrag" "ssd" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/6ff40d9f-8ed8-46c7-8bdd-da6242eae75e";
{ device = "/dev/disk/by-uuid/6dd76867-e5be-4237-9af3-1aeaf0cbe04e";
fsType = "btrfs";
options = [ "subvol=@home" ];
options = [ "subvol=home" "compress-force=zstd" "noatime" "autodefrag" "ssd" ];
};
fileSystems."/nix/store" =
{ device = "/dev/disk/by-uuid/6ff40d9f-8ed8-46c7-8bdd-da6242eae75e";
fileSystems."/var" =
{ device = "/dev/disk/by-uuid/6dd76867-e5be-4237-9af3-1aeaf0cbe04e";
fsType = "btrfs";
options = [ "subvol=@nix-store" ];
options = [ "subvol=var" "compress-force=zstd" "noatime" "autodefrag" "ssd" ];
};
fileSystems."/media/bittorrent" =
{ device = "/dev/disk/by-uuid/6dd76867-e5be-4237-9af3-1aeaf0cbe04e";
fsType = "btrfs";
options = [ "subvol=bittorrent" "nodatacow" "ssd" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/9850-7AEE";
{ device = "/dev/disk/by-uuid/948B-11EC";
fsType = "vfat";
};
swapDevices = [ ];
swapDevices = [
{
device = "/dev/disk/by-partuuid/417966a4-f0f1-4cf4-8954-f30007268a09";
randomEncryption.enable = true;
}
];
nix.maxJobs = lib.mkDefault 12;
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
networking.hostId = "fb781078";
boot.initrd.supportedFilesystems = [ "btrfs" ];
boot.supportedFilesystems = [ "btrfs" ];
}

BIN
misc/Passwords.kdbx
View File

Binary file not shown.

28
modules/overlay.nix
View File

@ -27,17 +27,16 @@ in
# bpytop = pkgs.callPackage ./packages/bpytop.nix { };
ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { };
# spotifyd = pkgs.callPackage ./packages/spotifyd.nix { };
foliate = pkgs.callPackage ./packages/foliate.nix { };
vscode = master.vscode;
vivaldi = master.vivaldi;
multimc = super.multimc.overrideAttrs (old: rec {
version = "unstable-2021-04-15";
version = "unstable-cracked";
src = super.fetchFromGitHub {
owner = "AfoninZ";
repo = "MultiMC5-Cracked";
rev = "22008d9267f9c818bd4b0098e3f0f4a303687b5a";
sha256 = "9+Hq+0/8HhNURZ3HbJx4ClZgU5pfHl1c7l7wAYFFw1s=";
rev = "6d6218a21ba54e77c4fc76b3ae8cddf3334f1a5d";
sha256 = "0k59pnqdlzqp75c1lbpqy2i09mmy5qisikalm427i16b07ga9xcl";
fetchSubmodules = true;
};
});
@ -46,17 +45,16 @@ in
pipewire
];
};
# qbittorrent = super.qbittorrent.overrideAttrs (old: rec {
# version = "4.3.4.11";
# src = super.fetchFromGitHub {
# owner = "c0re100";
# repo = "qBittorrent-Enhanced-Edition";
# # rev = "71404629f86b8b95ea5e4bef9805068678720673";
# rev = "release-${version}";
# sha256 = "XVjx1fOgNiLGRsvIu0Ny5nai++Mxw4V/uM5zqXCytow=";
# fetchSubmodules = true;
# };
# });
wine = super.wineWowPackages.staging;
qbittorrent = super.qbittorrent.overrideAttrs (old: rec {
version = "4.3.6.10";
src = super.fetchFromGitHub {
owner = "c0re100";
repo = "qBittorrent-Enhanced-Edition";
rev = "release-${version}";
sha256 = "1pfwg95vi1yig36qkganhqw1rz28qfzlfpixnbb3hibvzsjl2p8m";
};
});
rust-stable = pkgs.latest.rustChannels.stable.rust.override {
extensions = [
"rls-preview"

3
modules/themes.nix
View File

@ -32,7 +32,8 @@
minimalFontSize = "8";
cursorPackage = pkgs.bibata-cursors;
cursorSize = if bigScreen then 32 else 16;
# cursorSize = if bigScreen then 32 else 16;
cursorSize = 16;
};
};
}

4
modules/workspace/direnv.nix
View File

@ -1,6 +1,6 @@
{ ... }: {
home-manager.users.alukard = {
programs.direnv = {
home-manager.users.alukard.programs = {
direnv = {
enable = true;
enableZshIntegration = true;
nix-direnv = {

6
modules/workspace/i3status-rust/default.nix
View File

@ -117,9 +117,9 @@ in {
# weather_thunder = ""
# xrandr = ""
[[block]]
block = "music"
buttons = ["play", "next"]
# [[block]]
# block = "music"
# buttons = ["play", "next"]
[[block]]
block = "net"

2
modules/workspace/i3status-rust/scripts/df.nix
View File

@ -1,4 +1,4 @@
{ iconfont, ... }: ''
#!/usr/bin/env bash
echo '<span font="${iconfont} Solid"></span>'
echo "<span font="${iconfont} Solid"></span> `_ btrfs fi usage / | head -n7 | tail -n1 | awk '{print $3}'`"
''