Compare commits

...

2 commits

Author SHA1 Message Date
vorboyvo 47c5aee868 Moved git config to own file. 2024-11-12 17:17:06 -05:00
vorboyvo cb34038c91 Updated flake.lock and added Lix back. 2024-11-12 17:15:56 -05:00
4 changed files with 119 additions and 32 deletions

View file

@ -1,5 +1,38 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -7,11 +40,11 @@
]
},
"locked": {
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"lastModified": 1731235328,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github"
},
"original": {
@ -20,13 +53,48 @@
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1723503926,
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1723510904,
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
@ -38,8 +106,24 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"lix-module": "lix-module",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View file

@ -3,33 +3,22 @@
inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable";
# xdg-terminal-exec = {
# url = "path:/etc/nixos/flakes/xdg-terminal-exec";
# inputs.nixpkgs.follows = "nixpkgs";
# };
# lix-module = {
# url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
# inputs.nixpkgs.follows = "nixpkgs";
# };
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
# nixvim = {
# url = "github:nix-community/nixvim";
# inputs.nixpkgs.follows = "nixpkgs";
# };
# nur.url = "github:nix-community/NUR";
};
outputs =
{
self,
nixpkgs,
# lix-module,
lix-module,
home-manager,
}:
let
@ -45,7 +34,7 @@
modules = [
./hosts/${hostname}/configuration.nix
home-manager.nixosModules.home-manager
# lix-module.nixosModules.default
lix-module.nixosModules.default
# nur.nixosModules.nur
];
};

View file

@ -12,6 +12,7 @@ in {
../../programs/zsh.nix
../../programs/taskwarrior.nix
../../programs/clifm.nix
../../programs/git.nix
];
home.username = "alice";
home.homeDirectory = "/home/alice";
@ -124,15 +125,15 @@ in {
programs.home-manager.enable = true;
programs.git = {
enable = true;
userName = "vorboyvo";
userEmail = "mrsirofvibe@outlook.com";
extraConfig = {
init.defaultBranch = "main";
core.editor = "kak";
};
};
# programs.git = {
# enable = true;
# userName = "vorboyvo";
# userEmail = "mrsirofvibe@outlook.com";
# extraConfig = {
# init.defaultBranch = "main";
# core.editor = "kak";
# };
# };
wayland.windowManager.sway = import ../../programs/sway.nix {
inherit scripts extra config lib pkgs terminal;

13
programs/git.nix Normal file
View file

@ -0,0 +1,13 @@
{...}: {
programs.git = {
enable = true;
userName = "vorboyvo";
userEmail = "mrsirofvibe@outlook.com";
extraConfig = {
init.defaultBranch = "main";
core.editor = "kak";
};
};
}