hm master branch, add more programs

This commit is contained in:
tristan 2023-04-14 14:10:38 +01:00
parent 7a86dc748a
commit 83ed8e6997
4 changed files with 40 additions and 37 deletions

26
flake.lock generated
View file

@ -4,20 +4,19 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
]
},
"locked": {
"lastModified": 1680555990,
"narHash": "sha256-Tu/i5sd0hk4c4VtWO8XpY3c9KmHDcOWF5Y2GSCh3LXA=",
"lastModified": 1681468923,
"narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d6f3ba090ed090ae664ab5bac329654093aae725",
"rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.11",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
@ -42,21 +41,6 @@
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
}
},
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

View file

@ -3,7 +3,7 @@
inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-22.11";
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
};

View file

@ -7,12 +7,6 @@
{ config, pkgs, ... }:
{
#required for upgrade to unstable?
nixpkgs.overlays = [
(self: super: {fcitx-engines = pkgs.fcitx5;})
];
imports = [
./hardware-configuration.nix
];
@ -107,6 +101,7 @@
swaybg
pcmanfm
pavucontrol
trash-cli
(neovim.override {
vimAlias = true;
configure = {

View file

@ -8,19 +8,22 @@
home.username = "tristan";
home.homeDirectory = "/home/tristan";
xdg.userDirs.enable = true;
home.packages = with pkgs; [
gimp
logseq
quickemu
exa
bitwarden-cli
bitwarden
playerctl
nextcloud-client
lf
du-dust
godot_4
ansible
ardour
blender
musescore
];
programs.git = {
@ -80,14 +83,14 @@
];
};
# services.mako.enable = true;
services.mako.enable = true;
programs.ncmpcpp.enable = true;
programs.ncmpcpp.settings.mpd_host = "192.168.1.2";
# services.mpd-mpris.enable = true;
# services.mpd-mpris.mpd = {
# host = "192.168.1.2";
# };
programs.ncmpcpp.settings.mpd_host = "music.local";
services.mpd-mpris.enable = true;
services.mpd-mpris.mpd = {
host = "music.local";
};
programs.mpv.enable = true;
programs.mpv.bindings = {
@ -108,6 +111,7 @@
};
programs.foot.enable = true;
programs.foot.server.enable = true;
programs.foot.settings = {
main = {
term = "xterm-256color";
@ -172,7 +176,12 @@
};
programs.notmuch.enable = true;
programs.neomutt.enable = true;
programs.neomutt = {
enable = true;
vimKeys = true;
sort = "reverse-date";
sidebar.enable = true;
};
programs.mbsync.enable = true;
services.mbsync.enable = true;
@ -184,4 +193,19 @@
};
};
programs.ssh.enable = true;
programs.ssh.matchBlocks = {
"git.tristans.cloud" = {
user = "git";
port = 2222;
};
};
programs.neovim.defaultEditor = true;
programs.lf.enable = true;
programs.lf.keybindings = {
D = "trash";
};
}