#11 Add unstable mpv module

This commit is contained in:
Tibo De Peuter 2023-06-24 14:01:21 +02:00 committed by Tibo De Peuter
parent 23a8f4c918
commit 0faf97e6d2
5 changed files with 81 additions and 46 deletions

View file

@ -46,11 +46,11 @@
]
},
"locked": {
"lastModified": 1687163790,
"narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=",
"lastModified": 1687595284,
"narHash": "sha256-W4bGX7yCjWLeAugWpCMURlXxgPmXBJGTr/isGyd6Uew=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337",
"rev": "05a584b4f63f5de442f59c8cec01dddc77312856",
"type": "github"
},
"original": {
@ -62,11 +62,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1687288566,
"narHash": "sha256-VckkiJ88Gzdc2cstm0z5eFcrHbvkm4VjxavHBGssvZI=",
"lastModified": 1687466461,
"narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b6c73c5fe53bb3afbf65e870541e0645e9145171",
"rev": "ecb441f22067ba1d6312f4932a7c64efa8d19a7b",
"type": "github"
},
"original": {
@ -91,12 +91,28 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1687502512,
"narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"root": {
"inputs": {
"devshell": "devshell",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix",
"utils": "utils"
}
@ -109,11 +125,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1687267549,
"narHash": "sha256-jpg5zwhEQlovGH/xrml9X5ciPKpIZr/3Z04+Fh3VtQY=",
"lastModified": 1687398569,
"narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "d299d0538295e71e194aa0dfa896ad399f4508e3",
"rev": "2ff6973350682f8d16371f8c071a304b8067f192",
"type": "github"
},
"original": {

View file

@ -3,6 +3,7 @@
inputs = {
nixpkgs.url = "nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
devshell = {
url = "github:numtide/devshell";
@ -30,7 +31,7 @@
};
outputs = inputs@{
self, nixpkgs,
self, nixpkgs, nixpkgs-unstable,
devshell, flake-utils, home-manager, sops-nix, utils,
... }:
let
@ -45,6 +46,13 @@
hostDefaults = {
inherit system;
specialArgs = {
pkgs-unstable = import nixpkgs-unstable {
inherit system;
};
};
modules = [
home-manager.nixosModule
sops-nix.nixosModules.sops

View file

@ -1,40 +1,41 @@
{
imports = [
./vifm
./vim
./zellij
imports = [
./mpv
./vifm
./vim
./zellij
];
home-manager.users.tdpeuter = { pkgs, ... }: {
home.packages = with pkgs; [
direnv
duf
git-crypt
lynx
w3m
zenith
];
home-manager.users.tdpeuter = { pkgs, ... }: {
home.packages = with pkgs; [
direnv
duf
git-crypt
lynx
w3m
zenith
];
programs = {
direnv = {
enable = true;
nix-direnv.enable = true;
};
programs = {
direnv = {
enable = true;
nix-direnv.enable = true;
};
git = {
enable = true;
userName = "tdpeuter";
userEmail = "tibo.depeuter@gmail.com";
extraConfig = {
core.editor = "vim";
};
includes = [
{
path = "~/.gitconfig-ugent";
condition = "gitdir:~/Nextcloud/Documenten/UGent";
}
];
git = {
enable = true;
userName = "tdpeuter";
userEmail = "tibo.depeuter@gmail.com";
extraConfig = {
core.editor = "vim";
};
includes = [
{
path = "~/.gitconfig-ugent";
condition = "gitdir:~/Nextcloud/Documenten/UGent";
}
];
};
};
};
}

View file

@ -0,0 +1,7 @@
{ config, system, lib, pkgs-unstable, ... }:
{
home-manager.users.tdpeuter.home.packages = with pkgs-unstable; [
mpv
];
}

View file

@ -1,8 +1,11 @@
{ config, pkgs, lib, ... }:
{
home-manager.users.tdpeuter.home = {
packages = [ pkgs.zellij ];
file.".config/zellij".source = ../../../../stow/zellij/.config/zellij;
};
home-manager.users.tdpeuter.home = {
packages = with pkgs; [
zellij
];
file.".config/zellij".source = ../../../../stow/zellij/.config/zellij;
};
}