random936/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Other config; added new tpm package for tmux

Browse Source
This commit is contained in:
Random936 2024-05-21 21:43:28 -07:00
parent e6e927ae0d
commit c82e83bf59
8 changed files with 64 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
home-manager/common.nix
View File

@ -1,14 +1,17 @@
{ inputs, config, pkgs, ... }: {
{ inputs, config, pkgs, ... }:
{
nixpkgs.config.allowUnfree = true;
fonts.fontconfig.enable = true;
home.packages = with pkgs; [
home.packages = (with pkgs; [
tmux
clang
cargo
gnumake
neofetch
spotify
];
bitwarden-cli
]);
programs = {
home-manager.enable = true;
@ -25,16 +28,6 @@
home.file = {
".mbsyncrc".source = ../dotfiles/.mbsyncrc;
".functions.zsh".source = ../dotfiles/.functions.zsh;
# Emacs files
".emacs".source = ../dotfiles/.emacs;
".emacs.d/config.org".source = ../dotfiles/.emacs.d/config.org;
".emacs.d/terminal.org".source = ../dotfiles/.emacs.d/terminal.org;
".emacs.d/functions.org".source = ../dotfiles/.emacs.d/functions.org;
".emacs.d/email.org".source = ../dotfiles/.emacs.d/email.org;
".emacs.d/org.org".source = ../dotfiles/.emacs.d/org.org;
".emacs.d/lsp.org".source = ../dotfiles/.emacs.d/lsp.org;
};
}

9
home-manager/darwin-home.nix
View File

@ -1,4 +1,10 @@
{ inputs, config, pkgs, ... }: {
{ inputs, lib, config, pkgs, ... }:
let
mypkgs = import ../packages/all-packages.nix {
inherit pkgs lib config;
};
in
{
home = {
username = "jadenmaxwell";
@ -11,5 +17,6 @@
./zsh.nix
];
home.file.".tmux/plugins/tpm".source = "${mypkgs.tpm}";
home.stateVersion = "23.11";
}

13
home-manager/emacs.nix
View File

@ -4,6 +4,7 @@
isync
ispell
ledger
texliveFull
mu
fira-code
@ -12,6 +13,7 @@
programs.emacs = {
enable = true;
package = pkgs.emacs29;
extraPackages = epkgs: with epkgs; [
mu4e
vterm
@ -19,4 +21,15 @@
nerd-icons
];
};
home.file = {
".emacs".source = ../dotfiles/.emacs;
".emacs.d/config.org".source = ../dotfiles/.emacs.d/config.org;
".emacs.d/terminal.org".source = ../dotfiles/.emacs.d/terminal.org;
".emacs.d/functions.org".source = ../dotfiles/.emacs.d/functions.org;
".emacs.d/email.org".source = ../dotfiles/.emacs.d/email.org;
".emacs.d/org.org".source = ../dotfiles/.emacs.d/org.org;
".emacs.d/lsp.org".source = ../dotfiles/.emacs.d/lsp.org;
".mbsyncrc".source = ../dotfiles/.mbsyncrc;
};
}

3
home-manager/nixos-home.nix
View File

@ -13,6 +13,9 @@
home.packages = with pkgs; [
feh
microsoft-edge
nextcloud-client
bitwarden
];
gtk = {

11
nixos/configuration.nix
View File

@ -112,19 +112,8 @@
vim
git
picom
microsoft-edge
nextcloud-client
bitwarden-cli
bitwarden
];
fonts.packages = with pkgs; [
fira-code
fira-code-symbols
meslo-lgs-nf
];
services.emacs.enable = true;
system.stateVersion = "23.11";
}

10
nixos/darwin-configuration.nix
View File

@ -1,8 +1,9 @@
{ config, pkgs, ... }:
{
{ config, pkgs, lib, ... }: {
nix.settings.experimental-features = ["nix-command" "flakes"];
# Path fix for GUI applications.
launchd.user.envVariables.PATH = config.environment.systemPath;
nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [
git
@ -13,6 +14,9 @@
homebrew = {
enable = true;
brews = [
"coreutils"
];
casks = [
"microsoft-edge"
"bitwarden"

3
packages/all-packages.nix Normal file
View File

@ -0,0 +1,3 @@
{ pkgs, lib, config, ... }: rec {
tpm = pkgs.callPackage ./tpm {};
}

24
packages/tpm/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
pname = "tpm";
version = "3.1.0";
src = fetchFromGitHub {
owner = "tmux-plugins";
repo = "tpm";
rev = "v${version}";
hash = "sha256-CeI9Wq6tHqV68woE11lIY4cLoNY8XWyXyMHTDmFKJKI=";
};
doCheck = true;
installPhase = ''
cp -rv $src/ $out
'';
meta = with lib; {
description = "A tmux package manager. Installs and loads tmux plugins.";
homepage = "https://github.com/tmux-plugins/tpm";
license = licenses.mit;
platforms = platforms.all;
};
}