mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-10 23:00:39 +02:00
chore: miscellaneous necessary refactors post-update
This commit is contained in:
parent
6ce119d871
commit
5aad6c3a84
11 changed files with 48 additions and 73 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -910,11 +910,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705582795,
|
||||
"narHash": "sha256-hfP3TcXu76XHtwkIoTQSQLAe00yHrS1/Vt+pMZdsNRg=",
|
||||
"lastModified": 1709384560,
|
||||
"narHash": "sha256-VZpbetW5npjZ1FWcFII81tcDBH03irTboyMVOWzdfF8=",
|
||||
"owner": "oddlama",
|
||||
"repo": "nixos-extra-modules",
|
||||
"rev": "dca8158b4f4354d7898439f4d449d0bfc4f6ebac",
|
||||
"rev": "34ba92f0576a3998133310f070381563448e2b1a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
inputs,
|
||||
lib,
|
||||
minimal,
|
||||
pkgs,
|
||||
#nodes,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
@ -59,13 +57,6 @@
|
|||
nix.settings.trusted-substituters = ["https://ai.cachix.org"];
|
||||
nix.settings.trusted-public-keys = ["ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="];
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = lib.warnIf (pkgs.obsidian.version != "1.5.3") "REMOVE THIS obsidian electron override! in kroma.nix" [
|
||||
"electron-25.9.0"
|
||||
];
|
||||
|
||||
# BUG: remove when https://github.com/NixOS/nixpkgs/issues/280826 is merged
|
||||
environment.systemPackages = lib.trace "remove pcsclite polkit override https://github.com/NixOS/nixpkgs/issues/280826" [pkgs.pcscliteWithPolkit.out];
|
||||
|
||||
#meta.promtail = {
|
||||
# enable = true;
|
||||
# proxy = "sentinel";
|
||||
|
|
|
@ -11,26 +11,14 @@ in {
|
|||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.m2-ssd}";
|
||||
content = with lib.disko.gpt; {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
(partEfi "efi" "0%" "1GiB")
|
||||
(partSwap "swap" "1GiB" "17GiB")
|
||||
(partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%")
|
||||
];
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "0%" "1GiB";
|
||||
swap = partSwap "1GiB" "17GiB";
|
||||
"rpool_${disks.m2-ssd}" = partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
#data-hdd = {
|
||||
# type = "disk";
|
||||
# device = "/dev/disk/by-id/${config.repo.secrets.local.disk.data-hdd}";
|
||||
# content = with lib.disko.gpt; {
|
||||
# type = "table";
|
||||
# format = "gpt";
|
||||
# partitions = [
|
||||
# (partLuksZfs "data" "0%" "100%")
|
||||
# ];
|
||||
# };
|
||||
#};
|
||||
};
|
||||
zpool = with lib.disko.zfs; {
|
||||
rpool = mkZpool {datasets = impermanenceZfsDatasets;};
|
||||
|
|
|
@ -11,23 +11,21 @@ in {
|
|||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.m2-ssd}";
|
||||
content = with lib.disko.gpt; {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
(partLuksZfs disks.m2-ssd "rpool" "0%" "100%")
|
||||
];
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
"rpool_${disks.m2-ssd}" = partLuksZfs disks.m2-ssd "rpool" "0%" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
${disks.boot-ssd} = {
|
||||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.boot-ssd}";
|
||||
content = with lib.disko.gpt; {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
(partEfi "efi" "0%" "8GiB")
|
||||
(partSwap "swap" "8GiB" "100%")
|
||||
];
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "0%" "8GiB";
|
||||
swap = partSwap "8GiB" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -11,13 +11,12 @@ in {
|
|||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.main}";
|
||||
content = with lib.disko.gpt; {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
(partGrub "grub" "0%" "1MiB")
|
||||
(partEfi "bios" "1MiB" "512MiB")
|
||||
(partLuksZfs disks.main "rpool" "512MiB" "100%")
|
||||
];
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
grub = partGrub "0%" "1MiB";
|
||||
bios = partEfi "1MiB" "512MiB";
|
||||
"rpool_${disks.main}" = partLuksZfs disks.main "rpool" "512MiB" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -12,12 +12,11 @@ in {
|
|||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.m2-ssd-1}";
|
||||
content = with lib.disko.gpt; {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
(partEfi "efi" "0%" "1GiB")
|
||||
(partLuksZfs disks.m2-ssd-1 "rpool" "1GiB" "100%")
|
||||
];
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "0%" "1GiB";
|
||||
"rpool_${disks.m2-ssd-1}" = partLuksZfs disks.m2-ssd-1 "rpool" "1GiB" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
${disks.m2-ssd-2} = {
|
||||
|
|
|
@ -11,13 +11,12 @@ in {
|
|||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.m2-ssd}";
|
||||
content = with lib.disko.gpt; {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
(partEfi "efi" "0%" "1GiB")
|
||||
(partSwap "swap" "1GiB" "17GiB")
|
||||
(partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%")
|
||||
];
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "0%" "1GiB";
|
||||
swap = partSwap "1GiB" "17GiB";
|
||||
"rpool_${disks.m2-ssd}" = partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -11,13 +11,12 @@ in {
|
|||
type = "disk";
|
||||
device = "/dev/disk/by-id/${disks.mmc}";
|
||||
content = with lib.disko.gpt; {
|
||||
type = "table";
|
||||
format = "gpt";
|
||||
partitions = [
|
||||
(partEfi "efi" "0%" "1GiB")
|
||||
(partSwap "swap" "1GiB" "9GiB")
|
||||
(partLuksZfs disks.mmc "rpool" "9GiB" "100%")
|
||||
];
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
efi = partEfi "0%" "1GiB";
|
||||
swap = partSwap "1GiB" "9GiB";
|
||||
"rpool_${disks.mmc}" = partLuksZfs disks.mmc "rpool" "9GiB" "100%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
# disableWhileTyping = true;
|
||||
# };
|
||||
};
|
||||
layout = "de";
|
||||
xkbVariant = "nodeadkeys";
|
||||
xkb.layout = "de";
|
||||
xkb.variant = "nodeadkeys";
|
||||
};
|
||||
services.autorandr.enable = true;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
icon = pkgs.fetchurl {
|
||||
url = "https://web.poecdn.com/image/Art/2DItems/Currency/TransferOrb.png";
|
||||
sha256 = "sha256-LBGkqfVgM1WAK8xnmWjnnh4phlBF8JPxPRu8bMXly3g=";
|
||||
sha256 = "sha256-/PydWTOU2SIjATfYYk7HEHBlssvb52dr/LkyBwzZPp8=";
|
||||
};
|
||||
in
|
||||
pkgs.appimageTools.wrapType2 {
|
||||
|
|
|
@ -29,8 +29,10 @@
|
|||
# Undo tree
|
||||
undotree = {
|
||||
enable = true;
|
||||
focusOnToggle = true;
|
||||
windowLayout = 4;
|
||||
settings = {
|
||||
FocusOnToggle = true;
|
||||
WindowLayout = 4;
|
||||
};
|
||||
};
|
||||
|
||||
# Quickfix menu
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue