kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix static ip and move gitconfig

Browse Source
This commit is contained in:
Kopatz
2024-04-29 21:55:52 +02:00
parent 9c1d4fc667
commit 650f502800
14 changed files with 44 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
users/anon/.gitconfig → home-manager/.gitconfig
View File

0
users/anon/.gitconfig-evolit → home-manager/.gitconfig-evolit
View File

0
users/anon/.gitconfig-github → home-manager/.gitconfig-github
View File

0
users/anon/.gitconfig-gitlabfh → home-manager/.gitconfig-gitlabfh
View File

0
users/anon/.gitconfig-selfhosted → home-manager/.gitconfig-selfhosted
View File

28
home-manager/gitconfig.nix Normal file
View File

@@ -0,0 +1,28 @@
{ config, pkgs, inputs, ...}:
{
home.file.".gitconfig" = {
enable = true;
source = ./.gitconfig;
target = ".gitconfig";
};
home.file.".gitconfig-github" = {
enable = true;
source = ./.gitconfig-github;
target = ".gitconfig-github";
};
home.file.".gitconfig-selfhosted" = {
enable = true;
source = ./.gitconfig-selfhosted;
target = ".gitconfig-selfhosted";
};
home.file.".gitconfig-gitlabfh" = {
enable = true;
source = ./.gitconfig-gitlabfh;
target = ".gitconfig-gitlabfh";
};
home.file.".gitconfig-evolit" = {
enable = true;
source = ./.gitconfig-evolit;
target = ".gitconfig-evolit";
};
}

7
modules/collections/desktop.nix
View File

@@ -7,7 +7,6 @@
../gpg.nix
../kernel.nix # use latest kernel
../services/syncthing.nix
../static-ip.nix
../support/ntfs.nix
];
@@ -22,6 +21,12 @@
ld.enable = true;
settings.enable = true;
};
static-ip = {
enable = true;
interface = "enp42s0";
ip = "192.168.0.11";
dns = "192.168.0.6";
};
hardware = {
vfio.enable = true;
nvidia.enable = true;

27
users/anon/home.nix
View File

@@ -14,36 +14,11 @@
imports = [
../../home-manager/nvim.nix
../../home-manager/gitconfig.nix
../../home-manager/zsh.nix
../../home-manager/direnv.nix
inputs.nix-colors.homeManagerModule
];
home.file.".gitconfig" = {
enable = true;
source = ./.gitconfig;
target = ".gitconfig";
};
home.file.".gitconfig-github" = {
enable = true;
source = ./.gitconfig-github;
target = ".gitconfig-github";
};
home.file.".gitconfig-selfhosted" = {
enable = true;
source = ./.gitconfig-selfhosted;
target = ".gitconfig-selfhosted";
};
home.file.".gitconfig-gitlabfh" = {
enable = true;
source = ./.gitconfig-gitlabfh;
target = ".gitconfig-gitlabfh";
};
home.file.".gitconfig-evolit" = {
enable = true;
source = ./.gitconfig-evolit;
target = ".gitconfig-evolit";
};
colorScheme = inputs.nix-colors.colorSchemes.tokyo-night-dark;
}

38
users/kopatz/.gitconfig
View File

@@ -1,38 +0,0 @@
[user]
name = Lukas
email = lukas.kopatz11@gmail.com
[alias]
pushfwl = push --force-with-lease
last = log -1 --stat
now = commit --amend --date="now" --no-edit
cp = cherry-pick
co = checkout
cl = clone
ci = commit
st = status -sb
br = branch
unstage = reset HEAD --
dc = diff --cached
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lg = !"git lg1"
[color]
ui = true
[mergetool]
keeptemporaries = false
keepbackups = false
prompt = false
trustexitcode = false
[pull]
ff = true
[includeIf "gitdir/i:~/projects/github/**"]
path = .gitconfig-github
[includeIf "gitdir/i:~/projects/gitea/**"]
path = .gitconfig-gitea
[includeIf "gitdir/i:~/projects/fh/**"]
path = .gitconfig-gitlabfh
[includeIf "gitdir/i:~/projects/evolit/**"]
path = .gitconfig-evolit
[includeIf "gitdir/i:~/projects/selfhosted/**"]
path = .gitconfig-selfhosted

3
users/kopatz/.gitconfig-evolit
View File

@@ -1,3 +0,0 @@
[user]
name = Lukas Kopatz
email = lukas.kopatz@evolit.com

18
users/kopatz/.gitconfig-github
View File

@@ -1,18 +0,0 @@
[push]
default = upstream
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[mergetool]
keeptemporaries = false
keepbackups = false
prompt = false
trustexitcode = false
[user]
name = Kopatz
email = 7265381+Kropatz@users.noreply.github.com

18
users/kopatz/.gitconfig-gitlabfh
View File

@@ -1,18 +0,0 @@
[push]
default = upstream
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[mergetool]
keeptemporaries = false
keepbackups = false
prompt = false
trustexitcode = false
[user]
name = Kopatz
email = is221015@fhstp.ac.at

18
users/kopatz/.gitconfig-selfhosted
View File

@@ -1,18 +0,0 @@
[push]
default = upstream
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[mergetool]
keeptemporaries = false
keepbackups = false
prompt = false
trustexitcode = false
[user]
name = Kopatz
email = lukas.kopatz11@gmail.com

43
users/kopatz/home.nix
View File

@@ -13,45 +13,20 @@
};
imports = [
../../home-manager/nvim.nix
../../home-manager/code.nix
../../home-manager/zsh.nix
../../home-manager/theme.nix
../../home-manager/direnv.nix
../../home-manager/lf.nix
../../home-manager/kitty.nix
../../home-manager/rofi.nix
../../home-manager/kde-path.nix
../../home-manager/hyprland
../../home-manager/firefox
../../home-manager/gitconfig.nix
../../home-manager/hyprland
../../home-manager/kde-path.nix
../../home-manager/kitty.nix
../../home-manager/lf.nix
../../home-manager/nvim.nix
../../home-manager/rofi.nix
../../home-manager/theme.nix
../../home-manager/zsh.nix
inputs.nix-colors.homeManagerModule
];
home.file.".gitconfig" = {
enable = true;
source = ./.gitconfig;
target = ".gitconfig";
};
home.file.".gitconfig-github" = {
enable = true;
source = ./.gitconfig-github;
target = ".gitconfig-github";
};
home.file.".gitconfig-selfhosted" = {
enable = true;
source = ./.gitconfig-selfhosted;
target = ".gitconfig-selfhosted";
};
home.file.".gitconfig-gitlabfh" = {
enable = true;
source = ./.gitconfig-gitlabfh;
target = ".gitconfig-gitlabfh";
};
home.file.".gitconfig-evolit" = {
enable = true;
source = ./.gitconfig-evolit;
target = ".gitconfig-evolit";
};
colorScheme = import ../../home-manager/themes/yorha/colors.nix;
}