mirror of
https://github.com/sadan4/dotfiles.git
synced 2025-06-24 05:07:00 -04:00
more refactoring
This commit is contained in:
parent
375a1b2e89
commit
5fca9d16c0
13 changed files with 163 additions and 78 deletions
|
@ -1,39 +1,24 @@
|
|||
{ config, pkgs, inputs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
files = import ../../files.nix { inherit config; };
|
||||
file = import ../../files.nix { inherit config; };
|
||||
shell = import ../../shell.nix { inherit config pkgs; };
|
||||
pkgTypes = import ../../pkgs.nix { inherit pkgs config; };
|
||||
packages = pkgTypes.dev ++ pkgTypes.gui ++ pkgTypes.general ++ pkgTypes.scripts ++ pkgTypes.gaming;
|
||||
in
|
||||
{
|
||||
nixpkgs.config.allowInsecurePredicate = (pkg: true);
|
||||
nixpkgs.config.allowUnfreePredicate = (pkg: true);
|
||||
imports = [
|
||||
../homeModules/flameshot.nix
|
||||
../homeModules/arrpc.nix
|
||||
../homeModules/zsh.nix
|
||||
../homeModules/desktopEntries.nix
|
||||
../homeModules/java.nix
|
||||
./sops.nix
|
||||
./git.nix
|
||||
];
|
||||
programs.java.enable = true;
|
||||
programs.java.package = pkgs.temurin-bin-17;
|
||||
programs.git.enable = true;
|
||||
programs.git.userName = "sadan";
|
||||
programs.git.userEmail = "117494111+sadan4@users.noreply.github.com";
|
||||
programs.git.extraConfig = {
|
||||
gpg.format = "ssh";
|
||||
user = {
|
||||
signingkey = "~/.ssh/id_ed25519";
|
||||
};
|
||||
commit.gpgsign = true;
|
||||
core.autocrlf = "input";
|
||||
pull.rebase = true;
|
||||
push.autoSetupRemote = true;
|
||||
init.defaultBranch = "main";
|
||||
rerere.enabled = true;
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = (pkg: true);
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# nixpkg.config.allowUnfree = true;
|
||||
# manage.
|
||||
|
@ -41,22 +26,16 @@ in
|
|||
home.homeDirectory = "/home/meyer";
|
||||
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "23.11"; # Please read the comment before changing.
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
home = {
|
||||
inherit packages;
|
||||
inherit packages file;
|
||||
};
|
||||
home.shellAliases = shell.dev.aliases;
|
||||
home.sessionPath = shell.dev.path;
|
||||
home.sessionVariables = shell.dev.env;
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
home.file = files;
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
# 'home.sessionVariables'. If you don't want to manage your shell through Home
|
||||
|
@ -73,10 +52,15 @@ in
|
|||
#
|
||||
# /etc/profiles/per-user/meyer/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
home.shellAliases = shell.dev.aliases;
|
||||
home.sessionPath = shell.dev.path;
|
||||
home.sessionVariables = shell.dev.env;
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "23.11"; # Please read the comment before changing.
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue