feat: initial switch from hm to hjem
This commit is contained in:
parent
e775e4e8b3
commit
e773d06933
15 changed files with 131 additions and 154 deletions
|
@ -6,17 +6,16 @@
|
|||
fishPlugins.hydro
|
||||
];
|
||||
|
||||
hm.programs.fish = {
|
||||
enable = true;
|
||||
hjem.users.leo.files.".config/fish/config.fish".text = ''
|
||||
function fish_greeting
|
||||
end
|
||||
|
||||
interactiveShellInit = ''
|
||||
if status is-interactive
|
||||
set --global hydro_symbol_git_dirty "*"
|
||||
set --global hydro_color_pwd blue
|
||||
set --global hydro_color_git magenta
|
||||
set --global hydro_color_prompt green
|
||||
set --global hydro_color_duration yellow
|
||||
'';
|
||||
|
||||
functions.fish_greeting = "";
|
||||
};
|
||||
end
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
xpadneo.enable = true;
|
||||
};
|
||||
|
||||
hm.home.packages = with pkgs; [
|
||||
environment.systemPackages = with pkgs; [
|
||||
obs-studio
|
||||
osu-lazer-bin
|
||||
krita
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
hm.programs.ghostty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "light:catppuccin-latte,dark:catppuccin-mocha";
|
||||
font-family = "Iosevka Term";
|
||||
font-size = 12;
|
||||
font-feature = [
|
||||
"-calt"
|
||||
"-dlig"
|
||||
];
|
||||
};
|
||||
};
|
||||
environment.systemPackages = [ pkgs.ghostty ];
|
||||
|
||||
hjem.users.leo.files.".config/ghostty/config".text = ''
|
||||
font-family = Iosevka Term
|
||||
font-feature = -calt
|
||||
font-feature = -dlig
|
||||
font-size = 12
|
||||
theme = light:catppuccin-latte,dark:catppuccin-mocha
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -1,36 +1,36 @@
|
|||
{ config, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
programs.git.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
gh
|
||||
];
|
||||
|
||||
hm.programs = {
|
||||
git = {
|
||||
inherit (config.programs.git) enable package;
|
||||
userName = "uku";
|
||||
userEmail = "hi@uku.moe";
|
||||
|
||||
signing = {
|
||||
format = "ssh";
|
||||
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+7+KfdOrhcnHayxvOENUeMx8rE4XEIV/AxMHiaNUP8";
|
||||
signByDefault = true;
|
||||
hjem.users.leo.files = {
|
||||
".gitconfig".text = lib.generators.toGitINI {
|
||||
user = {
|
||||
name = "uku";
|
||||
email = "hi@uku.moe";
|
||||
signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+7+KfdOrhcnHayxvOENUeMx8rE4XEIV/AxMHiaNUP8";
|
||||
};
|
||||
|
||||
# delta.enable = true;
|
||||
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
core.autocrlf = "input";
|
||||
push.autoSetupRemote = true;
|
||||
merge.conflictStyle = "zdiff3";
|
||||
rebase.autoStash = true;
|
||||
status.submoduleSummary = true;
|
||||
diff.submodule = "log";
|
||||
submodule.recurse = true;
|
||||
commit.verbose = true;
|
||||
commit = {
|
||||
gpgSign = true;
|
||||
verbose = true;
|
||||
};
|
||||
|
||||
gpg.format = "ssh";
|
||||
tag.gpgSign = true;
|
||||
core.autocrlf = "input";
|
||||
diff.submodule = "log";
|
||||
init.defaultBranch = "main";
|
||||
merge.conflictStyle = "zdiff3";
|
||||
push.autoSetupRemote = true;
|
||||
rebase.autoStash = true;
|
||||
status.submoduleSummary = true;
|
||||
submodule.recurse = true;
|
||||
};
|
||||
|
||||
gh = {
|
||||
enable = true;
|
||||
".config/gh/config.yml".text = lib.generators.toYAML { } {
|
||||
settings.git_protocol = "ssh";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -16,14 +16,6 @@
|
|||
terminal = "ghostty";
|
||||
};
|
||||
|
||||
hm.programs.gnome-shell = {
|
||||
enable = true;
|
||||
extensions = with pkgs.gnomeExtensions; [
|
||||
{ package = appindicator; }
|
||||
{ package = dash-to-panel; }
|
||||
];
|
||||
};
|
||||
|
||||
# ssh-agent is provided by gnome-keyring-daemon
|
||||
# (mabye soon by gcr, see NixOS/nixpkgs#140824)
|
||||
programs.ssh.startAgent = lib.mkForce false;
|
||||
|
@ -32,6 +24,8 @@
|
|||
systemPackages = [
|
||||
adw-gtk3
|
||||
gnome-tweaks
|
||||
gnomeExtensions.appindicator
|
||||
gnomeExtensions.dash-to-panel
|
||||
];
|
||||
|
||||
gnome.excludePackages = [
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
# home-manager module
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.neovide = {
|
||||
enable = true;
|
||||
settings.fork = true;
|
||||
};
|
||||
environment.systemPackages = [ pkgs.neovide ];
|
||||
|
||||
hjem.users.leo.files.".config/neovide/config.toml".text = "fork = true";
|
||||
}
|
||||
|
|
|
@ -8,8 +8,8 @@ let
|
|||
toml = pkgs.formats.toml { };
|
||||
in
|
||||
{
|
||||
hm.home.file.".cargo/config.toml".source = toml.generate "config.toml" {
|
||||
build.target-dir = "${config.hm.home.homeDirectory}/.cargo/target";
|
||||
hjem.users.leo.files.".cargo/config.toml".source = toml.generate "config.toml" {
|
||||
build.target-dir = "${config.hjem.users.leo.directory}/.cargo/target";
|
||||
|
||||
target.x86_64-unknown-linux-gnu = {
|
||||
linker = "${lib.getExe pkgs.clang}";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue