switched nvim-flake to unstable

switched nix off of master
added nixpkgs and system to registry
moved X to tty1 and fixed kmscon to not run on tty1
This commit is contained in:
Gerg-L 2023-02-17 21:27:54 -05:00
parent 81319aa076
commit 32a4a75654
8 changed files with 62 additions and 20 deletions

View file

@ -1,4 +1,39 @@
_: {lib, ...}: {
_: {
lib,
pkgs,
...
}: {
#use a better tty
services.kmscon = {
enable = true;
hwRender = true;
extraConfig = ''
font-size=10
'';
fonts = [
{
name = "Overpass Mono";
package = pkgs.overpass;
}
{
name = "OverpassMono Nerd Font";
package =
pkgs.nerdfonts.override
{
fonts = ["Overpass"];
};
}
{
name = "Material Design Icons";
package = pkgs.material-design-icons;
}
];
};
systemd.services = {
"autovt@tty1".enable = false;
"kmsconvt@tty1".enable = false;
};
#hardware stuff
hardware = {
enableRedistributableFirmware = true;

26
flake.lock generated
View file

@ -115,11 +115,11 @@
},
"master": {
"locked": {
"lastModified": 1676591006,
"narHash": "sha256-pOIGhMOZuo3DRqhV0UIpJuRzVpw5RGrn/+DCov/d4T8=",
"lastModified": 1676689129,
"narHash": "sha256-vxrK0/BO3DDP6TuqBdu+gtlyKpP3X7pbWySAiBdDons=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e95204260063aa90718a94eaccac3591a5c64469",
"rev": "adc41db18f43ecac5b910f030d80c6f63070c065",
"type": "github"
},
"original": {
@ -246,15 +246,15 @@
"flake-utils": "flake-utils_3",
"neovim-src": "neovim-src",
"nixpkgs": [
"master"
"unstable"
]
},
"locked": {
"lastModified": 1676518460,
"narHash": "sha256-RS0QNSofkjv+4zpxzgvxJ9yd9syhB9Vv4qMQ7m+DSbc=",
"lastModified": 1676688838,
"narHash": "sha256-HtvnH++N3ks4jNkrwLKzsJj81NojHDcjboBfHwocj2c=",
"owner": "Gerg-L",
"repo": "nvim-flake",
"rev": "e8c8de7c88722a73e3fa73e35e6af50cf7ccb3ff",
"rev": "bcfba539ade44f6372f7ed0581970429f7a9cba7",
"type": "github"
},
"original": {
@ -298,11 +298,11 @@
},
"stable": {
"locked": {
"lastModified": 1676375384,
"narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=",
"lastModified": 1676546582,
"narHash": "sha256-MJ+PXNmUyxnMTFoss7G2lEcUY2cfYZM6RudBAL5aX1k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c43f676c938662072772339be6269226c77b51b8",
"rev": "2fb7d749c084890192b2cd08ba264e5e4a14df1b",
"type": "github"
},
"original": {
@ -334,11 +334,11 @@
},
"unstable": {
"locked": {
"lastModified": 1676481215,
"narHash": "sha256-afma/1RU0EePRyrBPcjBdOt+dV8z1bJH9dtpTN/WXmY=",
"lastModified": 1676569297,
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b",
"rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37",
"type": "github"
},
"original": {

View file

@ -1,5 +1,5 @@
{
inputs = rec {
inputs = {
#channels
master.url = "github:NixOS/nixpkgs";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
@ -23,7 +23,7 @@
};
nvim-flake = {
url = "github:Gerg-L/nvim-flake";
inputs.nixpkgs.follows = "master";
inputs.nixpkgs.follows = "unstable";
};
fetch-rs = {
url = "github:Gerg-L/fetch-rs";

View file

@ -24,6 +24,7 @@
lightdm = {
enable = true;
background = ../images/recursion.png;
extraConfig = "minimum-vt=1";
greeters.mini = {
enable = true;
user = settings.username;

View file

@ -37,6 +37,7 @@ _: {
]);
services.xserver = {
enable = true;
tty = 1;
exportConfiguration = true; #make config debuggable
layout = "us";
libinput.enable = true;

View file

@ -5,6 +5,7 @@ _: {
}: {
services.xserver = {
enable = true;
tty = 1;
exportConfiguration = true; #make config debuggable
layout = "us";
libinput.enable = true;

View file

@ -5,12 +5,12 @@
}: {
inputs,
lib,
pkgs,
self,
settings,
...
}: {
nix = {
package = nix.packages.${pkgs.system}.nix;
# package = nix.packages.${pkgs.system}.nix;
#automatically get registry from input flakes
registry =
(
@ -26,6 +26,10 @@
)
inputs
)
// {
nixpkgs.flake = unstable;
system.flake = self;
}
)
// {system = {flake = self;};};
#automatically add registry entries to nixPath