Merge pull request 'Remove fonts, cleanup pub solar overlay' (#3) from fix/cleanup-core into core

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/3
This commit is contained in:
teutat3s 2021-06-09 16:43:36 +00:00
commit 41b72dfe1c
22 changed files with 21 additions and 72 deletions

View file

@ -1 +0,0 @@
import ./fonts

View file

@ -1,4 +0,0 @@
final: prev:
with final; {
futura-otf = import ./futura.nix;
}

View file

@ -1,19 +0,0 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "futura";
version = "1.0.0";
src = ../secrets/fonts/Futura Std;
installPhase = ''
install -D -m 444 /* -t $out/share/fonts/otf
'';
meta = with stdenv.lib; {
description = "";
longDescription = ''
'';
homepage = "";
};
}

View file

@ -1 +0,0 @@
import ./pub-solar

View file

@ -1,15 +0,0 @@
final: prev:
with final; {
import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
mu = writeShellScriptBin "mu" (import ./mu.nix final);
mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
psos = writeShellScriptBin "psos" (import ./psos.nix final);
s = writeShellScriptBin "s" (import ./s.nix final);
swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
uhk-agent = import ./uhk-agent.nix final;
wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
}

View file

@ -1,7 +0,0 @@
GPU_VGA_PORT="0000:01:00.0"
echo 1 > "/sys/bus/pci/devices/$GPU_VGA_PORT/rom"
cat "/sys/bus/pci/devices/$GPU_VGA_PORT/rom" > \
"/usr/share/qemu/gpu-1060.rom"
echo 0 > "/sys/bus/pci/devices/$GPU_VGA_PORT/rom"

View file

@ -1,9 +0,0 @@
shopt - s nullglob
for
g in /sys/kernel/iommu_groups/*; do
echo "IOMMU Group ${g##*/}:"
for d in $g/devices/*; do
echo -e "\t$(lspci -nns ${d##*/})"
done;
done;

View file

@ -1,5 +0,0 @@
# You can use this file as a nixpkgs overlay. This is useful in the
# case where you don't want to add the whole NUR namespace to your
# configuration.
self: super: import ./default.nix { pkgs = super; }

View file

@ -1 +1,15 @@
final: prev: { } final: prev:
with final; {
import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
mu = writeShellScriptBin "mu" (import ./mu.nix final);
psos = writeShellScriptBin "psos" (import ./psos.nix final);
s = writeShellScriptBin "s" (import ./s.nix final);
sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
uhk-agent = import ./uhk-agent.nix final;
wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
}

View file

@ -127,9 +127,6 @@ in
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
<<<<<<< HEAD
services.earlyoom.enable = true;
=======
# For rage encryption, all hosts need a ssh key pair # For rage encryption, all hosts need a ssh key pair
services.openssh = { services.openssh = {
enable = true; enable = true;
@ -137,7 +134,6 @@ in
}; };
services.earlyoom.enable = true; services.earlyoom.enable = true;
>>>>>>> devos/core
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];