gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

switched nvim-flake to unstable

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

37
common.nix
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 stuff
hardware = { hardware = {
enableRedistributableFirmware = true; enableRedistributableFirmware = true;

26
flake.lock generated
View file

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

4
flake.nix
View file

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

1
imports/dwm.nix
View file

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

1
imports/gnome.nix
View file

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

1
imports/xfce.nix
View file

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

8
nix.nix
View file

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