remove now un-needed deps, remove quadphone
This commit is contained in:
parent
a0459e64b4
commit
bf891a5541
18 changed files with 58 additions and 2170 deletions
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
crossPkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
(
|
||||
_:
|
||||
import "${inputs.sdm845}/nixos/profiles/boot/kernel/sdm845-mainline" {
|
||||
inherit lib config;
|
||||
pkgs = crossPkgs;
|
||||
inputs = inputs.sdm845.inputs;
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
boot.initrd.allowMissingModules = true;
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
# boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
# nixpkgs.overlays = [
|
||||
# (_: super: {
|
||||
# # Because of https://github.com/NixOS/nixpkgs/pull/378579
|
||||
# qemu = super.qemu.overrideAttrs (old: {
|
||||
# patches = (old.patches or [ ]) ++ [ ./qemu.patch ];
|
||||
# });
|
||||
# })
|
||||
# ];
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/util/rcu.c b/util/rcu.c
|
||||
index fa32c942e4..8ae899f74e 100644
|
||||
--- a/util/rcu.c
|
||||
+++ b/util/rcu.c
|
||||
@@ -409,12 +409,6 @@ static void rcu_init_complete(void)
|
||||
|
||||
qemu_event_init(&rcu_call_ready_event, false);
|
||||
|
||||
- /* The caller is assumed to have BQL, so the call_rcu thread
|
||||
- * must have been quiescent even after forking, just recreate it.
|
||||
- */
|
||||
- qemu_thread_create(&thread, "call_rcu", call_rcu_thread,
|
||||
- NULL, QEMU_THREAD_DETACHED);
|
||||
-
|
||||
rcu_register_thread();
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [
|
||||
pkgs.archipelago
|
||||
pkgs.mumble
|
||||
];
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
networking.hosts = {
|
||||
"23.37.196.172" = [ "cdn.apple-mapkit.com" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
inputs: inputs.gnome-mobile.overlays.default
|
||||
1900
flake.lock
generated
1900
flake.lock
generated
File diff suppressed because it is too large
Load diff
27
flake.nix
27
flake.nix
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
inputs = {
|
||||
gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
wrapper-manager.url = "git+https://codeberg.org/viperML/wrapper-manager";
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
|
|
@ -57,10 +56,6 @@
|
|||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
sdm845 = {
|
||||
url = "github:Henry-Hiles/dotfiles-fork";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
degoog = {
|
||||
url = "github:degoog-org/degoog";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -97,20 +92,6 @@
|
|||
specialArgs = {
|
||||
inherit inputs dirUtils;
|
||||
inherit (info) type;
|
||||
|
||||
crossPkgs = import inputs.nixpkgs {
|
||||
hostPlatform = info.system;
|
||||
localSystem = info.system;
|
||||
buildPlatform = "x86_64-linux";
|
||||
|
||||
overlays =
|
||||
let
|
||||
path = ./cross-overlays/${info.hostname};
|
||||
in
|
||||
dirUtils.opt (builtins.pathExists path) (
|
||||
map (file: import file inputs) (lib.filesystem.listFilesRecursive path)
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
modules =
|
||||
|
|
@ -167,14 +148,6 @@
|
|||
type = "server";
|
||||
graphical = false;
|
||||
};
|
||||
"quadphone" = {
|
||||
type = "mobile";
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
"everquad" = {
|
||||
type = "mobile";
|
||||
system = "aarch64-linux";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
fd
|
||||
glib
|
||||
tldr
|
||||
killall
|
||||
ripgrep
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
fonts = {
|
||||
packages = with pkgs; [ twitter-color-emoji ];
|
||||
fontconfig.defaultFonts.emoji = [ "Twitter Color Emoji" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
gimp
|
||||
gale
|
||||
heroic
|
||||
inkscape
|
||||
libreoffice
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
services = {
|
||||
avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
printing.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -4,11 +4,13 @@
|
|||
packages = with pkgs; [
|
||||
inter
|
||||
nerd-fonts.fira-code
|
||||
twitter-color-emoji
|
||||
];
|
||||
fontconfig.defaultFonts = rec {
|
||||
serif = [ "Inter" ];
|
||||
sansSerif = serif;
|
||||
monospace = [ "FiraCode Nerd Font" ];
|
||||
emoji = [ "Twitter Color Emoji" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{ nixpkgs.config.allowBroken = true; }
|
||||
|
|
@ -1 +0,0 @@
|
|||
{ documentation.man.generateCaches = false; }
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{ crossPkgs, ... }:
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
gnome-shell = crossPkgs.gnome-shell;
|
||||
gnome-settings-daemon-mobile = crossPkgs.gnome-settings-daemon-mobile;
|
||||
mutter = crossPkgs.mutter;
|
||||
})
|
||||
];
|
||||
|
||||
i18n.inputMethod = {
|
||||
enable = true;
|
||||
type = "ibus";
|
||||
};
|
||||
|
||||
services.logind = {
|
||||
powerKey = "ignore";
|
||||
powerKeyLongPress = "poweroff";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
{
|
||||
modulesPath,
|
||||
crossPkgs,
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
efiArch = pkgs.stdenv.hostPlatform.efiArch;
|
||||
in
|
||||
{
|
||||
imports = [ "${modulesPath}/image/repart.nix" ];
|
||||
systemd.repart = {
|
||||
enable = true;
|
||||
partitions."03-root".Type = "root";
|
||||
};
|
||||
|
||||
boot.initrd = {
|
||||
supportedFilesystems.ext4 = true;
|
||||
systemd = {
|
||||
enable = true;
|
||||
root = "gpt-auto";
|
||||
};
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
};
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
image.repart = {
|
||||
name = "image";
|
||||
split = true;
|
||||
partitions = {
|
||||
"20-esp" = {
|
||||
contents = {
|
||||
"/EFI/EDK2-UEFI-SHELL/SHELL.EFI".source = "${
|
||||
crossPkgs.edk2-uefi-shell.overrideAttrs {
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";
|
||||
}
|
||||
}/shell.efi";
|
||||
"/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
|
||||
"${pkgs.stdenv.hostPlatform.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
|
||||
"/EFI/Linux/${config.system.boot.loader.ukiFile}".source =
|
||||
"${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
|
||||
"/loader/loader.conf".source = crossPkgs.writeText "loader.conf" ''
|
||||
timeout 5
|
||||
console-mode keep
|
||||
'';
|
||||
"/loader/entries/shell.conf".source = crossPkgs.writeText "shell.conf" ''
|
||||
title EDK2 UEFI Shell
|
||||
efi /EFI/EDK2-UEFI-SHELL/SHELL.EFI
|
||||
'';
|
||||
};
|
||||
repartConfig = {
|
||||
Type = "esp";
|
||||
Label = "ESP";
|
||||
Format = "vfat";
|
||||
SplitName = "system";
|
||||
SizeMinBytes = "500M";
|
||||
GrowFileSystem = true;
|
||||
};
|
||||
};
|
||||
"30-root" = {
|
||||
storePaths = [ config.system.build.toplevel ];
|
||||
contents."/boot".source = crossPkgs.runCommand "boot" { } "mkdir $out";
|
||||
repartConfig = {
|
||||
Type = "root";
|
||||
Format = "ext4";
|
||||
Label = "nixos";
|
||||
Minimize = "guess";
|
||||
SplitName = "userdata";
|
||||
GrowFileSystem = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{ imports = [ ../server/ssh.nix ]; }
|
||||
Loading…
Reference in a new issue