This commit is contained in:
ChaotiCryptidz 2022-10-27 16:25:26 +01:00
parent 078b58de2f
commit d14f1e2d44
No known key found for this signature in database
12 changed files with 98 additions and 47 deletions

View file

@ -16,13 +16,12 @@ in {
path = activateNixOS_x64_64-linux nixosConfigurations.hetzner-vm;
};
};
raspberry = {
hostname = "raspberry.tailscale-internal.genderfucked.monster";
storage = {
hostname = "storage.servers.genderfucked.monster";
username = "root";
profiles.system = {
user = "root";
path = deploy-rs.lib.aarch64-linux.activate.nixos
nixosConfigurations.raspberry;
path = activateNixOS_x64_64-linux nixosConfigurations.storage;
};
};
}

View file

@ -96,11 +96,11 @@
"utils": "utils_3"
},
"locked": {
"lastModified": 1663328500,
"narHash": "sha256-7n+J/exp8ky4dmk02y5a9R7CGmJvHpzrHMzfEkMtSWA=",
"lastModified": 1666463764,
"narHash": "sha256-NmayV9S0s7CgNEA2QbIxDU0VCIiX6bIHu8PCQPnYHDM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5427f3d1f0ea4357cd4af0bffee7248d640c6ffc",
"rev": "69d19b9839638fc487b370e0600a03577a559081",
"type": "github"
},
"original": {
@ -118,11 +118,11 @@
"utils": "utils_4"
},
"locked": {
"lastModified": 1660637669,
"narHash": "sha256-9IY0GmzoWDTJ8CHizAw8GEJ0xU18qjtNu39c7S9Y8Ps=",
"lastModified": 1666470518,
"narHash": "sha256-01Ss0P9+tZ5acXZ4u23vjfi7VuyHJvcot1BSy5Wh5zA=",
"owner": "ChaotiCryptidz",
"repo": "musicutil",
"rev": "ab30add61a04bda6a5f436e7e99e17cfbbeea90b",
"rev": "3eb010b21c1a5fa6991cdc8e7fd483280c731f96",
"type": "gitlab"
},
"original": {
@ -138,11 +138,11 @@
]
},
"locked": {
"lastModified": 1663492236,
"narHash": "sha256-KzgrcFVhv/Ca7m83SaijE0W+tLHzjoypHZm9gHGS+cY=",
"lastModified": 1665392861,
"narHash": "sha256-bCd8fYJMAb0LzabsiXl4nxECDoz483bJOCa2hjox7N0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "de4d41ee9fd12a60236c1f35cead7c511dac08eb",
"rev": "ef56fd8979b5f4e800c4716f62076e00600b1172",
"type": "github"
},
"original": {
@ -186,11 +186,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1663494472,
"narHash": "sha256-fSowlaoXXWcAM8m9wA6u+eTJJtvruYHMA+Lb/tFi/qM=",
"lastModified": 1666377499,
"narHash": "sha256-dZZCGvWcxc7oGnUgFVf0UeNHsJ4VhkTM0v5JRe8EwR8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f677051b8dc0b5e2a9348941c99eea8c4b0ff28f",
"rev": "301aada7a64812853f2e2634a530ef5d34505048",
"type": "github"
},
"original": {

View file

@ -1,12 +1,3 @@
{ inputs, pkgs, ... }: {
imports = [ inputs.musicutil.hmModule ];
programs.musicutil = {
enable = true;
settings = {
log_level = "debug";
cache = true;
cache_dir = "/tmp";
};
};
home.packages = with pkgs; [ musicutil ];
}

View file

@ -1,3 +1,18 @@
{ pkgs, inputs, ... }: {
home.packages = with pkgs; [ jq ripgrep fd pv tmux socat file ];
home.packages = with pkgs; [
jq
ripgrep
fd
pv
tmux
socat
file
(pkgs.busybox.override {
enableAppletSymlinks = false;
extraConfig = ''
CONFIG_INSTALL_APPLET_DONT y
CONFIG_INSTALL_APPLET_SYMLINKS n
'';
})
];
}

View file

@ -3,7 +3,7 @@ let hm = inputs.home-manager.lib.hm;
in {
imports = with tree; [ home.apps.kitty home.apps.rofi ];
home.packages = with pkgs; [ dconf2nix gnome.dconf-editor ];
home.packages = with pkgs; [ dconf2nix gnome.dconf-editor xclip ];
dconf.enable = true;
dconf.settings = {

View file

@ -44,6 +44,12 @@ in {
modules = defaultModules ++ [ ./hetzner-vm/hetzner-vm.nix ];
};
storage = nixosUnstableSystem {
specialArgs = defaultSpecialArgs;
system = "x86_64-linux";
modules = defaultModules ++ [ ./storage/storage.nix ];
};
# nix --no-sandbox build .#nixosConfigurations.raspberry.config.system.build.sdImage
raspberry = nixosUnstableSystem {
specialArgs = defaultSpecialArgs;

View file

@ -0,0 +1,12 @@
{ ...}: {
imports = [
];
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
boot.initrd.kernelModules = [ "nvme" ];
fileSystems."/" = {
device = "/dev/sda1";
fsType = "ext4";
};
}

9
hosts/storage/misc.nix Normal file
View file

@ -0,0 +1,9 @@
{...}: {
nix.settings.auto-optimise-store = true;
nix.gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 1d";
};
}

View file

38
hosts/storage/storage.nix Normal file
View file

@ -0,0 +1,38 @@
{ modulesPath, tree, config, pkgs, lib, ... }:
{
imports = with tree; [
users.root
users.chaos
profiles.base
profiles.tailscale
profiles.sshd
./storage.nix
./hardware.nix
./misc.nix
(modulesPath + "/profiles/qemu-guest.nix")
../../extras/laura-ssh-root.nix
];
environment.systemPackages = with pkgs; [ rclone cifs-utils ];
home-manager.users.root = {
imports = with tree; [ home.base home.dev.small ];
home.stateVersion = "22.05";
};
home-manager.users.chaos = {
imports = with tree; [ home.base home.dev.small ];
home.stateVersion = "22.05";
};
networking.hostName = "storage";
time.timeZone = "Europe/London";
system.stateVersion = "21.11";
}

View file

@ -3,24 +3,6 @@ final: prev: {
comic-code = final.callPackage ./comic-code { };
zar = final.callPackage ./zar { };
gobar = final.callPackage ./gobar { };
invidious-latest = final.callPackage ./invidious-latest {
# needs a specific version of lsquic
lsquic = final.callPackage ./invidious-latest/lsquic.nix { };
};
linuxPackages = prev.linuxPackages.extend (lpFinal: lpPrev: {
rtl8812au = lpPrev.linuxPackages.rtl8812au.overrideAttrs (oldAttrs: {
version = "8821au-20210708";
src = lpPrev.pkgs.fetchFromGitHub {
owner = "morrownr";
repo = "8821au-20210708";
rev = "6a0f4752cab464e1d895c9d8091d36e720f4ed18";
sha256 = prev.pkgs.lib.fakeSha256;
};
});
});
roc-toolkit-patched = final.callPackage ./roc-toolkit-patched { };
roc-send-pcm = final.callPackage ./roc-send-pcm { };
}

View file

@ -7,7 +7,6 @@
};
environment.gnome.excludePackages = [
pkgs.gnome.cheese
pkgs.gnome-photos
pkgs.gnome.gnome-music
pkgs.gnome.gnome-terminal
pkgs.gnome.gedit