sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: miscellaneous necessary refactors post-update

Browse source
This commit is contained in:
oddlama 2024-03-02 14:06:34 +01:00
parent 6ce119d871
commit 5aad6c3a84
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
11 changed files with 48 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -910,11 +910,11 @@
"pre-commit-hooks": "pre-commit-hooks_3" "pre-commit-hooks": "pre-commit-hooks_3"
}, },
"locked": { "locked": {
"lastModified": 1705582795, "lastModified": 1709384560,
"narHash": "sha256-hfP3TcXu76XHtwkIoTQSQLAe00yHrS1/Vt+pMZdsNRg=", "narHash": "sha256-VZpbetW5npjZ1FWcFII81tcDBH03irTboyMVOWzdfF8=",
"owner": "oddlama", "owner": "oddlama",
"repo": "nixos-extra-modules", "repo": "nixos-extra-modules",
"rev": "dca8158b4f4354d7898439f4d449d0bfc4f6ebac", "rev": "34ba92f0576a3998133310f070381563448e2b1a",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
hosts/kroma/default.nix
View file

@ -2,8 +2,6 @@
inputs, inputs,
lib, lib,
minimal, minimal,
pkgs,
#nodes,
... ...
}: }:
{ {
@ -59,13 +57,6 @@
nix.settings.trusted-substituters = ["https://ai.cachix.org"]; nix.settings.trusted-substituters = ["https://ai.cachix.org"];
nix.settings.trusted-public-keys = ["ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="]; 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 = { #meta.promtail = {
# enable = true; # enable = true;
# proxy = "sentinel"; # proxy = "sentinel";

24
hosts/kroma/fs.nix
View file

@ -11,26 +11,14 @@ in {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/${disks.m2-ssd}"; device = "/dev/disk/by-id/${disks.m2-ssd}";
content = with lib.disko.gpt; { content = with lib.disko.gpt; {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ efi = partEfi "0%" "1GiB";
(partEfi "efi" "0%" "1GiB") swap = partSwap "1GiB" "17GiB";
(partSwap "swap" "1GiB" "17GiB") "rpool_${disks.m2-ssd}" = partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%";
(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; { zpool = with lib.disko.zfs; {
rpool = mkZpool {datasets = impermanenceZfsDatasets;}; rpool = mkZpool {datasets = impermanenceZfsDatasets;};

20
hosts/nom/fs.nix
View file

@ -11,23 +11,21 @@ in {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/${disks.m2-ssd}"; device = "/dev/disk/by-id/${disks.m2-ssd}";
content = with lib.disko.gpt; { content = with lib.disko.gpt; {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ "rpool_${disks.m2-ssd}" = partLuksZfs disks.m2-ssd "rpool" "0%" "100%";
(partLuksZfs disks.m2-ssd "rpool" "0%" "100%") };
];
}; };
}; };
${disks.boot-ssd} = { ${disks.boot-ssd} = {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/${disks.boot-ssd}"; device = "/dev/disk/by-id/${disks.boot-ssd}";
content = with lib.disko.gpt; { content = with lib.disko.gpt; {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ efi = partEfi "0%" "8GiB";
(partEfi "efi" "0%" "8GiB") swap = partSwap "8GiB" "100%";
(partSwap "swap" "8GiB" "100%") };
];
}; };
}; };
}; };

13
hosts/sentinel/fs.nix
View file

@ -11,13 +11,12 @@ in {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/${disks.main}"; device = "/dev/disk/by-id/${disks.main}";
content = with lib.disko.gpt; { content = with lib.disko.gpt; {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ grub = partGrub "0%" "1MiB";
(partGrub "grub" "0%" "1MiB") bios = partEfi "1MiB" "512MiB";
(partEfi "bios" "1MiB" "512MiB") "rpool_${disks.main}" = partLuksZfs disks.main "rpool" "512MiB" "100%";
(partLuksZfs disks.main "rpool" "512MiB" "100%") };
];
}; };
}; };
}; };

11
hosts/sire/fs.nix
View file

@ -12,12 +12,11 @@ in {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/${disks.m2-ssd-1}"; device = "/dev/disk/by-id/${disks.m2-ssd-1}";
content = with lib.disko.gpt; { content = with lib.disko.gpt; {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ efi = partEfi "0%" "1GiB";
(partEfi "efi" "0%" "1GiB") "rpool_${disks.m2-ssd-1}" = partLuksZfs disks.m2-ssd-1 "rpool" "1GiB" "100%";
(partLuksZfs disks.m2-ssd-1 "rpool" "1GiB" "100%") };
];
}; };
}; };
${disks.m2-ssd-2} = { ${disks.m2-ssd-2} = {

13
hosts/ward/fs.nix
View file

@ -11,13 +11,12 @@ in {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/${disks.m2-ssd}"; device = "/dev/disk/by-id/${disks.m2-ssd}";
content = with lib.disko.gpt; { content = with lib.disko.gpt; {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ efi = partEfi "0%" "1GiB";
(partEfi "efi" "0%" "1GiB") swap = partSwap "1GiB" "17GiB";
(partSwap "swap" "1GiB" "17GiB") "rpool_${disks.m2-ssd}" = partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%";
(partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%") };
];
}; };
}; };
}; };

13
hosts/zackbiene/fs.nix
View file

@ -11,13 +11,12 @@ in {
type = "disk"; type = "disk";
device = "/dev/disk/by-id/${disks.mmc}"; device = "/dev/disk/by-id/${disks.mmc}";
content = with lib.disko.gpt; { content = with lib.disko.gpt; {
type = "table"; type = "gpt";
format = "gpt"; partitions = {
partitions = [ efi = partEfi "0%" "1GiB";
(partEfi "efi" "0%" "1GiB") swap = partSwap "1GiB" "9GiB";
(partSwap "swap" "1GiB" "9GiB") "rpool_${disks.mmc}" = partLuksZfs disks.mmc "rpool" "9GiB" "100%";
(partLuksZfs disks.mmc "rpool" "9GiB" "100%") };
];
}; };
}; };
}; };

4
modules/optional/graphical/xserver.nix
View file

@ -21,8 +21,8 @@
# disableWhileTyping = true; # disableWhileTyping = true;
# }; # };
}; };
layout = "de"; xkb.layout = "de";
xkbVariant = "nodeadkeys"; xkb.variant = "nodeadkeys";
}; };
services.autorandr.enable = true; services.autorandr.enable = true;

2
pkgs/awakened-poe-trade.nix
View file

@ -20,7 +20,7 @@
icon = pkgs.fetchurl { icon = pkgs.fetchurl {
url = "https://web.poecdn.com/image/Art/2DItems/Currency/TransferOrb.png"; url = "https://web.poecdn.com/image/Art/2DItems/Currency/TransferOrb.png";
sha256 = "sha256-LBGkqfVgM1WAK8xnmWjnnh4phlBF8JPxPRu8bMXly3g="; sha256 = "sha256-/PydWTOU2SIjATfYYk7HEHBlssvb52dr/LkyBwzZPp8=";
}; };
in in
pkgs.appimageTools.wrapType2 { pkgs.appimageTools.wrapType2 {

6
users/myuser/neovim/misc.nix
View file

@ -29,8 +29,10 @@
# Undo tree # Undo tree
undotree = { undotree = {
enable = true; enable = true;
focusOnToggle = true; settings = {
windowLayout = 4; FocusOnToggle = true;
WindowLayout = 4;
};
}; };
# Quickfix menu # Quickfix menu