Emi
/
Nix-Configs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Emi:bd00a85c76e0d53156438010534396e85df53dd4
Branches Tags
Emi:main
...
compare: Emi:3fff9d218595b0f183f53209fd5bf86dbea9c28f
Branches Tags
Emi:main

5 Commits
bd00a85c76 ... 3fff9d2185

Author SHA1 Message Date
Emi Simpson 3fff9d2185
Mitigate deprecations 2023-12-22 19:52:38 -05:00
Emi Simpson f2977680be
Upgrade JSOTP to V13 2023-12-22 19:47:51 -05:00
Emi Simpson b275e3d36a
Repair JustSeeds package 2023-12-22 19:37:45 -05:00
Emi Simpson c1e9f48c21
Switch to 23.11 2023-12-22 19:37:27 -05:00
Emi Simpson 62fc9699a3
Remove stray line 2023-12-22 18:36:47 -05:00
4 changed files with 25 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
configs/programs/neovim.nix
View File

@ -79,7 +79,7 @@ let
]; ];
# Via https://gist.github.com/nat-418/d76586da7a5d113ab90578ed56069509 # Via https://gist.github.com/nat-418/d76586da7a5d113ab90578ed56069509
fromGitHub = ref: repo: pkgs.vimUtils.buildVimPluginFrom2Nix { fromGitHub = ref: repo: pkgs.vimUtils.buildVimPlugin {
pname = "${lib.strings.sanitizeDerivationName repo}"; pname = "${lib.strings.sanitizeDerivationName repo}";
version = ref; version = ref;
src = builtins.fetchGit { src = builtins.fetchGit {

6
nixos.nix
View File

@ -135,7 +135,7 @@ let systemInformation = import ./system/system-information.nix; in
totem totem
]; ];
fonts = { fonts = {
fonts = with pkgs; with import packages/all-packages.nix nixpkgs; [ packages = with pkgs; with import packages/all-packages.nix nixpkgs; [
justseeds justseeds
manrope manrope
google-fonts google-fonts
@ -143,7 +143,7 @@ let systemInformation = import ./system/system-information.nix; in
atkinson-hyperlegible atkinson-hyperlegible
]; ];
fontDir.enable = true; fontDir.enable = true;
enableDefaultFonts = true; enableDefaultPackages = true;
fontconfig.defaultFonts = { fontconfig.defaultFonts = {
sansSerif = ["Atkinson Hyperlegible"]; sansSerif = ["Atkinson Hyperlegible"];
monospace = ["Comic Mono:style=Normal"]; monospace = ["Comic Mono:style=Normal"];
@ -164,7 +164,7 @@ let systemInformation = import ./system/system-information.nix; in
dataDir = "/home/ember"; dataDir = "/home/ember";
configDir = "/home/ember/.config/syncthing"; configDir = "/home/ember/.config/syncthing";
user = "ember"; user = "ember";
devices = { settings.devices = {
redwood.name = "🍂 Redwood"; redwood.name = "🍂 Redwood";
redwood.id = redwood.id =
"WY2GFMX-CQ52VBK-M3Y4JJH-4FIA6F2-NGB3S2I-SJ42D45-7FT77KH-2OGO2AZ"; "WY2GFMX-CQ52VBK-M3Y4JJH-4FIA6F2-NGB3S2I-SJ42D45-7FT77KH-2OGO2AZ";

24
packages/justseeds.nix
View File

@ -1,6 +1,6 @@
{pkgs, stdenv, lib, ...}: stdenv.mkDerivation { {pkgs, stdenv, lib, ...}: stdenv.mkDerivation {
pname = "justseeds-fontpack"; pname = "justseeds-fontpack";
version = "10.000"; version = "13.000";
# Fontpack 1 # Fontpack 1
pack01 = pkgs.fetchzip { pack01 = pkgs.fetchzip {
@ -18,8 +18,8 @@
# Fontpack 3 # Fontpack 3
pack03 = pkgs.fetchzip { pack03 = pkgs.fetchzip {
url = "https://justseeds.org/wp-content/uploads/JSOTP-FP3.zip"; url = "https://justseeds.org/wp-content/uploads/JSOTP-FP3_2.zip";
sha256 = "lLPsbpRuDVWgt/GX3/ZvxPjBDVNeu7OhhnBLqpmCArA="; sha256 = "gUbyXkR+Kr5w0//fbl72qqQRgqiyaA34pwDt1+t+Ejc=";
stripRoot = false; stripRoot = false;
}; };
@ -79,11 +79,25 @@
stripRoot = false; stripRoot = false;
}; };
# Fontpack 12
pack12 = pkgs.fetchzip {
url = "https://justseeds.org/wp-content/uploads/JSOTP-12.zip";
sha256 = "anwRr+yaQWp/nxdXu89UMHSoexGvAuE2gApsfq3UibU=";
stripRoot = false;
};
# Fontpack 13
pack13 = pkgs.fetchzip {
url = "https://justseeds.org/wp-content/uploads/JOSTP-13.zip";
sha256 = "HOVl9PYZb6PUs0nIbognJQDvaasiafOWMkxiWliPQZg=";
stripRoot = false;
};
dontUnpack = true; dontUnpack = true;
installPhase = '' installPhase = ''
install -D -m 444 $pack01/JS_fontpak1/*.otf -t $out/share/fonts/otf install -D -m 444 $pack01/JS_fontpak1/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack02/justseeds_fontpak2/*.otf -t $out/share/fonts/otf install -D -m 444 $pack02/justseeds_fontpak2/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack03/'JSOTP FP3'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack03/'JSOTP FP3_2'/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack04/fontpak4/*.otf -t $out/share/fonts/otf install -D -m 444 $pack04/fontpak4/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack05/'JS Font Pak 5'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack05/'JS Font Pak 5'/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack06/'JS Font pack 6'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack06/'JS Font pack 6'/*.otf -t $out/share/fonts/otf
@ -92,6 +106,8 @@
install -D -m 444 $pack09/'Justseeds Font Pack 9'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack09/'Justseeds Font Pack 9'/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack10/'JSOTP 10'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack10/'JSOTP 10'/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack11/'JSOTP 11'/*.otf -t $out/share/fonts/otf install -D -m 444 $pack11/'JSOTP 11'/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack12/'JSOTP 12'/*.otf -t $out/share/fonts/otf
install -D -m 444 $pack13/'JOSTP 13'/*.otf -t $out/share/fonts/otf
''; '';
meta = { meta = {

3
system/hardware-requirements.nix
View File

@ -1,10 +1,9 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
<nixos-hardware/framework> <nixos-hardware/framework/13-inch/11th-gen-intel>
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];