Compare commits

..

11 Commits

4 changed files with 41 additions and 19 deletions

View File

@@ -45,7 +45,6 @@
nixpkgs, nixpkgs,
home-manager, home-manager,
agenix, agenix,
stylix,
nixos-wsl, nixos-wsl,
statusbar, statusbar,
... ...
@@ -98,9 +97,6 @@
agenix.homeManagerModules.default agenix.homeManagerModules.default
./secrets ./secrets
stylix.homeModules.stylix
./home/stylix
]; ];
}; };
@@ -117,9 +113,6 @@
agenix.homeManagerModules.default agenix.homeManagerModules.default
./secrets ./secrets
stylix.homeModules.stylix
./home/stylix
]; ];
}; };
@@ -147,7 +140,7 @@
modules ? [], modules ? [],
}: }:
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {hostPlatform = system;}; pkgs = import nixpkgs {inherit system;};
inherit modules; inherit modules;
extraSpecialArgs = {inherit inputs stateVersion user dotsDir;}; extraSpecialArgs = {inherit inputs stateVersion user dotsDir;};
}; };
@@ -156,13 +149,13 @@
user = "nix"; user = "nix";
dotsDir = "/home/homelab-dots"; dotsDir = "/home/homelab-dots";
modules = [ modules = [
./home/headless.nix ./home/demenik.nix
]; ];
}; };
"db56@wsl50" = mkHomeConfig { "db56@wsl50" = mkHomeConfig {
user = "db56"; user = "db56";
modules = [ modules = [
./home/headless.nix ./home/demenik.nix
]; ];
}; };
}; };

View File

@@ -1,4 +1,8 @@
{pkgs, ...}: { {
pkgs,
inputs,
...
}: {
imports = [ imports = [
./global.nix ./global.nix
./xdg-desktop.nix ./xdg-desktop.nix
@@ -16,6 +20,9 @@
./editors/nvim ./editors/nvim
./editors/intellij.nix ./editors/intellij.nix
./editors/godot.nix ./editors/godot.nix
inputs.stylix.homeModules.stylix
./stylix
]; ];
home.file.".face" = { home.file.".face" = {

View File

@@ -24,6 +24,7 @@
url = { url = {
"ssh://git@gitlab.uni-ulm.de".insteadOf = "https://gitlab.uni-ulm.de"; "ssh://git@gitlab.uni-ulm.de".insteadOf = "https://gitlab.uni-ulm.de";
"ssh://git@github.com".insteadOf = "https://github.com"; "ssh://git@github.com".insteadOf = "https://github.com";
"ssh://git@gitea.demenik.dev".insteadOf = "https://gitea.demenik.dev";
}; };
user = { user = {
@@ -32,16 +33,34 @@
signingkey = "${config.home.homeDirectory}/.ssh/id_rsa"; signingkey = "${config.home.homeDirectory}/.ssh/id_rsa";
}; };
"includeIf \"hasconfig:remote.*.url:git@gitlab.uni-ulm.de:*/**\"" = {
path = "${pkgs.writeText ".gitconfig-gitlab.uni-ulm.de" ''
[user]
email = "dominik.bernroider@uni-ulm.de"
name = "Dominik Bernroider"
''}";
};
init.defaultBranch = "main"; init.defaultBranch = "main";
}; };
includes = let
mkRemoteSsh = {
user ? "git",
url,
config,
}: {
condition = "hasconfig:remote.*.url:${user}@${url}:*/**";
path = "${pkgs.writeText "gitconfig-${url}" (pkgs.lib.generators.toGitINI config)}";
};
in [
(mkRemoteSsh {
url = "gitlab.uni-ulm.de";
config.user = {
email = "dominik.bernroider@uni-ulm.de";
name = "Dominik Bernroider";
};
})
(mkRemoteSsh {
url = "gitea.demenik.dev";
config.user = {
email = "mail@demenik.dev";
name = "demenik";
};
})
];
}; };
gpg.enable = true; gpg.enable = true;
}; };

View File

@@ -57,6 +57,9 @@ final_space = true
fetch_upstream_icon = true fetch_upstream_icon = true
fetch_status = true fetch_status = true
[blocks.segments.properties.upstream_icons]
"gitea.demenik.dev" = ""
[[blocks]] [[blocks]]
type = 'prompt' type = 'prompt'
alignment = 'left' alignment = 'left'