Successfully melded nixvim configuration into the sysflake itself rather than using it as a flake input

This commit is contained in:
pagedmov
2024-10-18 19:24:52 -04:00
parent 860bcb3bc6
commit f4c430c2c5
4 changed files with 37 additions and 36 deletions

23
flake.lock generated
View File

@@ -878,8 +878,7 @@
"nixvim": "nixvim",
"nur": "nur",
"spicetify-nix": "spicetify-nix",
"stylix": "stylix",
"toilet": "toilet"
"stylix": "stylix"
}
},
"spicetify-nix": {
@@ -1042,26 +1041,6 @@
"type": "github"
}
},
"toilet": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1729154419,
"narHash": "sha256-h+n5Xrd8fkHCztLd+QtJwKZ3+LCNVlKPSoEKw/DrCj0=",
"owner": "pagedMov",
"repo": "toilet-extra-fonts",
"rev": "057dda35fc9893feeea2aba47987e4f9641e4df2",
"type": "github"
},
"original": {
"owner": "pagedMov",
"repo": "toilet-extra-fonts",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [

View File

@@ -28,11 +28,6 @@
url = "github:gerg-l/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
toilet = {
url = "github:pagedMov/toilet-extra-fonts";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
@@ -41,7 +36,6 @@
home-manager,
self,
nixvim,
toilet,
stylix,
...
} @ inputs: let

View File

@@ -1,16 +1,29 @@
{
lib,
inputs,
pkgs,
modulesPath,
...
}: let
nvim = inputs.nvim.packages."x86_64-linux".default;
toilet = inputs.toilet.packages."x86_64-linux".default;
install-script = pkgs.writeShellScriptBin "movcfg-install" (builtins.readFile ./movcfg-install.sh);
extraFigletFonts = pkgs.fetchFromGitHub {
owner = "xero";
repo = "figlet-fonts";
rev = "master";
sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY=";
};
toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
installPhase = ''
make install PREFIX=$out
mkdir -p $out/share/figlet
cp -r ${extraFigletFonts}/* $out/share/figlet
'';
});
in {
imports = [
"${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
../../modules/sys/software/nixvim
];
nixpkgs.hostPlatform = "x86_64-linux";
system.stateVersion = "24.05";
@@ -44,7 +57,7 @@ in {
bc
pciutils
usbutils
toilet
toilet-extrafonts
install-script
nvim
];

View File

@@ -1,10 +1,25 @@
{
pkgs,
inputs,
host,
...
}: let
toilet = inputs.toilet.packages."x86_64-linux".default;
}:
let
extraFigletFonts = pkgs.fetchFromGitHub {
owner = "xero";
repo = "figlet-fonts";
rev = "master";
sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY=";
};
toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
installPhase = ''
make install PREFIX=$out
mkdir -p $out/share/figlet
cp -r ${extraFigletFonts}/* $out/share/figlet
'';
});
desktop_pkgs =
if (host == "oganesson")
then
@@ -39,7 +54,7 @@ in {
libreoffice
gtrash
ripgrep
toilet
toilet-extrafonts
python3
]
++ desktop_pkgs;