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

update and small fixes

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-03-27 15:50:40 +03:00
parent d61eff2280
commit 4c8f2b0bcc
17 changed files with 107 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
flake.lock generated
View File

@ -653,11 +653,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1679480702,
"narHash": "sha256-npuRD61YmxUPitI1TqKwlxLrU6iGl5E+BPT196LgUDo=",
"lastModified": 1679786039,
"narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "363c46b2480f1b73ec37cf68caac61f5daa82a2e",
"rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727",
"type": "github"
},
"original": {
@ -674,11 +674,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1679505046,
"narHash": "sha256-JFzdbtnEaUHMdWi0eXznpxGZO6SRfdBRaOwn4PmDkE0=",
"lastModified": 1679792424,
"narHash": "sha256-EFXGWV13DcTO/6jaLf/zoAFOsQMCMPE8YMeXpSeUjNY=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "cf51a318078c82040eaeab29664bc34144ee1d62",
"rev": "3343aac6bf6aa601cb882859edf63a6cb59bb774",
"type": "github"
},
"original": {
@ -749,11 +749,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1679227749,
"narHash": "sha256-DgN58y1EIRAWhYNL/6rPcvWHnPNBV/ujT6P2dmeRMhU=",
"lastModified": 1679832509,
"narHash": "sha256-LZecjt8KSlAEVJgaVPcXX6XBTsf/hyYB4AWThsA6f2M=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "69605f77680adc94a11cf270a2485bb3bf4657fa",
"rev": "7068824f9ec4364c9375605f5af43793dd2eebee",
"type": "github"
},
"original": {
@ -838,11 +838,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1679528172,
"narHash": "sha256-pqYxAkFIN+Qb9ksSID+xlEM9ljrSiwCp4gIzxuTWTFk=",
"lastModified": 1679663238,
"narHash": "sha256-YfcEwIY5wo60Pmn7FkEfUcmoEqtQslyX8Le1Mi6L/vA=",
"owner": "nixos",
"repo": "nix",
"rev": "e5146a6a505003f16b40160486c21a70204480a2",
"rev": "e00abd3f566b16bb107d513925cf33b40cca35f4",
"type": "github"
},
"original": {
@ -958,11 +958,11 @@
]
},
"locked": {
"lastModified": 1679447549,
"narHash": "sha256-x4ZCisaKqkxfZ5B96hEs4wD0OaAV0ueR1HTYV+hMC+c=",
"lastModified": 1679793477,
"narHash": "sha256-yFXzazCPsTGIlCx5K7MMAki6LO6420uSIOBAveKHs7k=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "47112e20335e6e8330dabc99e4d25bd4c2aeccee",
"rev": "e48d195cc011edfde6cbe9b0ba4746842a434e8f",
"type": "github"
},
"original": {
@ -1040,11 +1040,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1679187309,
"narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=",
"lastModified": 1679791877,
"narHash": "sha256-tTV1Mf0hPWIMtqyU16Kd2JUBDWvfHlDC9pF57vcbgpQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "44214417fe4595438b31bdb9469be92536a61455",
"rev": "cc060ddbf652a532b54057081d5abd6144d01971",
"type": "github"
},
"original": {
@ -1073,11 +1073,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1679526881,
"narHash": "sha256-dcx33Ia9XjUGk8McxJ6H6O0zCOczpO8MRpFGVmK/Vg4=",
"lastModified": 1679866589,
"narHash": "sha256-igT2Idxfz8VcpXzYLa6kjMXrJCWDn1w3VfCUSqeC0MM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "49ca35cf163026c3cf91ee1d1e363476f6b5aa7f",
"rev": "64ccc2dccc16cbc7f8a955fe9812a72efbbdfecf",
"type": "github"
},
"original": {
@ -1129,11 +1129,11 @@
]
},
"locked": {
"lastModified": 1679405949,
"narHash": "sha256-dTFSHPV6OwqldEtTMgTsesCbr7DcBxbMLTB7IEOHWRU=",
"lastModified": 1679865057,
"narHash": "sha256-67JQKnO7ixAxBWpL5h3HMDWWSz06eqwlzbFmFdSSxEc=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "46bf400d1a04f089d9d73d5ef43e621b7f4eb881",
"rev": "9b7ecd63e27a56a3e434dcea01b8e62bd5792774",
"type": "github"
},
"original": {
@ -1192,11 +1192,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1679262748,
"narHash": "sha256-DQCrrAFrkxijC6haUzOC5ZoFqpcv/tg2WxnyW3np1Cc=",
"lastModified": 1679705136,
"narHash": "sha256-MDlZUR7wJ3PlPtqwwoGQr3euNOe0vdSSteVVOef7tBY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "60c1d71f2ba4c80178ec84523c2ca0801522e0a6",
"rev": "8f40f2f90b9c9032d1b824442cfbbe0dbabd0dbd",
"type": "github"
},
"original": {
@ -1256,11 +1256,11 @@
},
"nur": {
"locked": {
"lastModified": 1679525154,
"narHash": "sha256-Afqsg/fRFQoR/CIRqBnu8JdsIjQcWNmGfzO/NOmS/Zc=",
"lastModified": 1679863610,
"narHash": "sha256-XeBBouFuQ5pgp0C6C7ZEu5ZAGeYQ/cVDSQQIUWFDlOA=",
"owner": "nix-community",
"repo": "NUR",
"rev": "d4906c2ed98762a275cb7edb800c950ba2f46ce5",
"rev": "c921aa621201227946ba88caf73757864f1b22d7",
"type": "github"
},
"original": {
@ -1350,11 +1350,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1679341087,
"narHash": "sha256-brszjT9kFsQw1X/aGubd+T6Kw0ESHSevFe8NxihiIeE=",
"lastModified": 1679794178,
"narHash": "sha256-R4eYiH5+6jiBZpJ+dR3NsvrJrmYxypDYfYdi6u9hi7M=",
"owner": "AtaraxiaSjel",
"repo": "PrismLauncher",
"rev": "e004f55e0b694c56a987185e42ce4dc94863e052",
"rev": "7e1010f80dcb3e54f8e77ca80fbf2b89b8f6f987",
"type": "github"
},
"original": {
@ -1456,11 +1456,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1679524810,
"narHash": "sha256-CCcF3CzPOnQ70aA0HEvRdyomCBMKrJbN7j7C44iVHj4=",
"lastModified": 1679757179,
"narHash": "sha256-7ztq5VWSyQcRHHXu6OkvZTUnD7e2m1UfrnxgCv9lClo=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "9d83d8f9f8060fff7af736b707a59801ef0fb657",
"rev": "37fc1f4c3004bcc7c9da02c0a2b32ba1e2d84ee4",
"type": "gitlab"
},
"original": {

31
machines/AMD-Workstation/boot.nix
View File

@ -22,45 +22,40 @@ in {
loader = {
grub = {
enable = true;
device = "nodev";
version = 2;
device = "nodev";
copyKernels = true;
efiSupport = true;
enableCryptodisk = true;
useOSProber = false;
zfsSupport = true;
# efiInstallAsRemovable = true;
copyKernels = true;
};
systemd-boot = {
enable = lib.mkForce false;
editor = false;
configurationLimit = 10;
# graceful = true;
# efiInstallAsRemovable = true;
# theme = pkgs.;
};
systemd-boot.enable = lib.mkForce false;
efi.canTouchEfiVariables = true;
efi.efiSysMountPoint = "/efi";
generationsDir.copyKernels = true;
};
# binfmt.emulatedSystems = [ "aarch64-linux" ];
# kernelPackages = lib.mkForce pkgs.linuxPackages_lqx;
kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
binfmt.emulatedSystems = [ "aarch64-linux" ];
kernelPackages = lib.mkForce pkgs.linuxPackages_lqx;
# kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
kernelParams = [
"zfs.metaslab_lba_weighting_enabled=0"
"zfs.zfs_arc_max=${zfs_arc_max}"
];
tmpOnTmpfs = true;
tmpOnTmpfsSize = "32G";
# zfs.extraPools = [ "rpool" ];
};
persist = {
enable = true;
cache.clean.enable = false;
state.files = [
# "/etc/machine-id"
"/etc/NIXOS"
];
# state.files = [
# "/etc/machine-id"
# "/etc/NIXOS"
# ];
};
fileSystems."/home".neededForBoot = true;

2
machines/AMD-Workstation/default.nix
View File

@ -34,8 +34,6 @@
deviceSpecific.isGaming = true;
deviceSpecific.enableVirtualisation = true;
deviceSpecific.vpn.mullvad.enable = true;
hardware.video.hidpi.enable = lib.mkForce false;
# hardware.firmware = [ pkgs.rtl8761b-firmware ];
# networking.firewall.allowedTCPPorts = [ 52736 ];

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

@ -101,7 +101,6 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
networking.hostId = "0c00ab80";
boot.zfs.devNodes = "/dev/disk/by-id";
boot.supportedFilesystems = [ "zfs" ];

2
machines/Home-Hypervisor/default.nix
View File

@ -153,7 +153,7 @@ in {
'';
home.packages = with pkgs; [
bat podman-compose micro bottom nix-index-update
pwgen comma
pwgen comma kitty
];
xdg.mime.enable = false;
home.stateVersion = "22.11";

4
patches/zen-kernels.patch
View File

@ -6,10 +6,10 @@ index 1464bd4..ad21483 100644
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.2.6"; #lqx
- version = "6.2.7"; #lqx
+ version = "6.1.18"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "1b454badr366pbxiyz7h2n47405wy5pa35rdkk1is8q574yf6scy"; #lqx
- sha256 = "0dk79cglqrbsmlz9vimd714km5v717r1066r4bas20r3gi0zlzhi"; #lqx
+ sha256 = "1gyjy01ys74apa65abgvxcj0y51vf5ixampyj3jd8lxzn4vvkih6"; #lqx
isLqx = true;
};

1
profiles/nix/default.nix
View File

@ -37,6 +37,7 @@ with config.deviceSpecific; {
# "webcord.cachix.org-1:l555jqOZGHd2C9+vS8ccdh8FhqnGe8L78QrHNn+EFEs="
];
trusted-users = [ "root" config.mainuser "@wheel" ];
use-xdg-base-directories = true;
};
buildMachines = [

42
profiles/nix/nix.patch
View File

@ -1,42 +0,0 @@
diff --git a/src/libstore/profiles.cc b/src/libstore/profiles.cc
index b202351ce..944a90702 100644
--- a/src/libstore/profiles.cc
+++ b/src/libstore/profiles.cc
@@ -292,13 +292,6 @@ Path getDefaultProfile()
{
Path profileLink = getHome() + "/.nix-profile";
try {
- auto profile =
- getuid() == 0
- ? settings.nixStateDir + "/profiles/default"
- : profilesDir() + "/profile";
- if (!pathExists(profileLink)) {
- replaceSymlink(profile, profileLink);
- }
return absPath(readLink(profileLink), dirOf(profileLink));
} catch (Error &) {
return profileLink;
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index 406e548c0..e9004efee 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -1396,19 +1396,6 @@ static int main_nix_env(int argc, char * * argv)
globals.instSource.nixExprPath = getHome() + "/.nix-defexpr";
globals.instSource.systemFilter = "*";
- if (!pathExists(globals.instSource.nixExprPath)) {
- try {
- createDirs(globals.instSource.nixExprPath);
- replaceSymlink(
- fmt("%s/profiles/per-user/%s/channels", settings.nixStateDir, getUserName()),
- globals.instSource.nixExprPath + "/channels");
- if (getuid() != 0)
- replaceSymlink(
- fmt("%s/profiles/per-user/root/channels", settings.nixStateDir),
- globals.instSource.nixExprPath + "/channels_root");
- } catch (Error &) { }
- }
-
globals.dryRun = false;
globals.preserveInstalled = false;
globals.removeAll = false;

2
profiles/overlay.nix
View File

@ -62,7 +62,7 @@ with lib; {
nix = inputs.nix.packages.${system}.default.overrideAttrs (oa: {
doInstallCheck = false;
patches = [ ./nix/nix.patch ./nix/doas.patch ] ++ oa.patches or [ ];
patches = [ ./nix/doas.patch ] ++ oa.patches or [ ];
});
nix-direnv = inputs.nix-direnv.packages.${system}.default.override { pkgs = final; };

4
profiles/packages/waydroid-script.nix
View File

@ -19,8 +19,8 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
repo = "waydroid_script";
owner = "casualsnek";
rev = "2f4f056fb143e393756952ea74fe4b6c85a35cc1";
hash = "sha256-dYR22NtqHZ7Px4Q+oVEUw0Ke5+hOJSgwLEuTmpkM9T8=";
rev = "6c78b793c8405874b4be5b46527f81bca3f14c08";
hash = "sha256-Wkbm3/PihXCrGCMrRTfBM/OA1gXwafXlW5m7fvkOPOU=";
};
nativeBuildInputs = [ makeBinaryWrapper ];

2
profiles/services.nix
View File

@ -108,6 +108,4 @@ with config.deviceSpecific; {
# };
services.upower.enable = true;
systemd.services.systemd-udev-settle.enable = false;
}

4
profiles/workspace/cursor.nix
View File

@ -2,6 +2,10 @@
let
thm = config.lib.base16.theme;
in {
environment.sessionVariables = {
XCURSOR_PATH = lib.mkForce "/home/${config.mainuser}/.icons";
};
home-manager.users.${config.mainuser} = {
home.pointerCursor = {
package = thm.cursorPackage;

11
profiles/workspace/locale.nix
View File

@ -1,6 +1,14 @@
{ pkgs, config, lib, ... }:
with config.deviceSpecific; {
i18n.defaultLocale = "en_GB.UTF-8";
i18n.extraLocaleSettings = {
LANGUAGE = "en_GB.UTF-8";
LC_ALL = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8";
LC_ADDRESS = "ru_RU.UTF-8";
LC_MONETARY = "ru_RU.UTF-8";
LC_PAPER = "ru_RU.UTF-8";
};
console.font = "cyr-sun16";
# console.keyMap = "ruwin_cplk-UTF-8";
@ -8,7 +16,8 @@ with config.deviceSpecific; {
environment.sessionVariables = {
XKB_DEFAULT_LAYOUT = "us,ru";
XKB_DEFAULT_OPTIONS = "grp:win_space_toggle";
LANG = lib.mkForce "en_GB.UTF-8";
LANGUAGE = "en_GB.UTF-8";
LC_ALL = "en_GB.UTF-8";
};
time.timeZone = "Europe/Moscow";

30
profiles/workspace/mako.nix
View File

@ -1,7 +1,11 @@
{ pkgs, config, ... }: {
home-manager.users.${config.mainuser} = {
systemd.user.services.mako = {
Service = { ExecStart = "${pkgs.mako}/bin/mako"; };
Service = {
ExecStart = "${pkgs.mako}/bin/mako";
Environment =
[ "PATH=${pkgs.lib.makeBinPath [ pkgs.bash pkgs.mpv ]}" ];
};
Install = {
After = [ "hyprland-session.target" ];
WantedBy = [ "hyprland-session.target" ];
@ -21,6 +25,30 @@
progressColor = "over #${theme.base0B-hex}";
iconPath = "${theme.iconPackage}/share/icons/${theme.iconTheme}";
maxIconSize = 24;
# extraConfig = let
# play = sound:
# "mpv ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/${sound}.oga";
# in ''
# on-notify=exec ${play "message"}
# [app-name=yubikey-touch-detector]
# on-notify=exec ${play "service-login"}
# [app-name=command_complete summary~="✘.*"]
# on-notify=exec ${play "dialog-warning"}
# [app-name=command_complete summary~="✓.*"]
# on-notify=exec ${play "bell"}
# [category=osd]
# on-notify=none
# [mode=do-not-disturb]
# invisible=1
# [mode=do-not-disturb summary="Do not disturb: on"]
# invisible=0
# [mode=concentrate]
# invisible=1
# [mode=concentrate urgency=critical]
# invisible=0
# [mode=concentrate summary="Concentrate mode: on"]
# invisible=0
# '';
};
};
}

4
profiles/workspace/proxy.nix
View File

@ -11,7 +11,7 @@
containers.tor = {
mullvadExclude = config.deviceSpecific.vpn.mullvad.enable;
autoStart = true;
autoStart = false;
ephemeral = true;
# extraFlags = [ "-U" ]; # unprivileged
hostAddress = "192.168.1.10";
@ -78,4 +78,4 @@
};
networking.nat.internalInterfaces = [ "ve-tor" ];
}
}

8
profiles/workspace/xdg.nix
View File

@ -2,10 +2,10 @@
home-manager.users.${config.mainuser} = {
xdg.enable = true;
xdg.userDirs.enable = true;
xdg.systemDirs.data = [
"${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
"${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
];
# xdg.systemDirs.data = [
# "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
# "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
# ];
};
environment.sessionVariables = {

3
scripts/find-latest-zfs-kernel.py
View File

@ -11,7 +11,8 @@ if __name__ == "__main__":
for line in lines:
if "kernel.kernelOlder" in line:
results.append(line)
line = results[-2].strip()
break
line = results[0].strip()
pattern = re.compile(r"\d\.\d{1,2}")
version = pattern.search(line).group(0)
major, minor = version.split('.')