AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor config

Browse Source
This commit is contained in:
Dmitriy Kholkin 2021-10-24 23:12:25 +03:00
parent 6e11ebb3d6
commit 74c023c627
8 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/devices.nix
View File

@ -36,6 +36,11 @@ with types; {
default = default =
!isNull (builtins.match ".*VM" config.networking.hostName); !isNull (builtins.match ".*VM" config.networking.hostName);
}; };
isCloud = mkOption {
type = bool;
default =
!isNull (builtins.match ".*Cloud" config.networking.hostName);
};
isISO = mkOption { isISO = mkOption {
type = bool; type = bool;
default = default =

6
profiles/applications/kitty.nix
View File

@ -3,13 +3,15 @@ let
thm = config.lib.base16.theme; thm = config.lib.base16.theme;
in with config.deviceSpecific; in with config.deviceSpecific;
{ {
defaultApplications.term = lib.mkIf (isLaptop || isDesktop) { # defaultApplications.term = lib.mkIf (isLaptop || isDesktop) {
defaultApplications.term = {
cmd = "${pkgs.kitty}/bin/kitty"; cmd = "${pkgs.kitty}/bin/kitty";
desktop = "kitty"; desktop = "kitty";
}; };
home-manager.users.alukard = { home-manager.users.alukard = {
programs.kitty = { programs.kitty = {
enable = isLaptop || isDesktop; # enable = isLaptop || isDesktop;
enable = enable;
font.name = "${thm.fonts.powerline.family} ${thm.fontSizes.small.str}"; font.name = "${thm.fonts.powerline.family} ${thm.fontSizes.small.str}";
# keybindings = '' # keybindings = ''
# ''; # '';

2
profiles/services.nix
View File

@ -57,6 +57,8 @@ with config.deviceSpecific; {
services.udev.packages = [ pkgs.stlink ]; services.udev.packages = [ pkgs.stlink ];
home-manager.users.alukard.services.udiskie.enable = true;
services.upower.enable = true; services.upower.enable = true;
systemd.services.systemd-udev-settle.enable = false; systemd.services.systemd-udev-settle.enable = false;

4
profiles/workspace/locale.nix
View File

@ -11,9 +11,9 @@
LANG = lib.mkForce "en_GB.UTF-8"; LANG = lib.mkForce "en_GB.UTF-8";
}; };
time.timeZone = "Europe/Moscow"; time.timeZone = mkIf (!config.deviceSpecific.isCloud) "Europe/Moscow";
location = { location = mkIf (!config.deviceSpecific.isCloud) {
provider = "manual"; provider = "manual";
latitude = 48.78583; latitude = 48.78583;
longitude = 44.77973; longitude = 44.77973;

1
profiles/workspace/misc.nix
View File

@ -8,7 +8,6 @@
}; };
home-manager.users.alukard = { home-manager.users.alukard = {
services.udiskie.enable = true;
news.display = "silent"; news.display = "silent";
systemd.user.startServices = true; systemd.user.startServices = true;
home.stateVersion = "21.11"; home.stateVersion = "21.11";

1
profiles/workspace/ssh.nix
View File

@ -11,6 +11,7 @@
users.users.alukard.openssh.authorizedKeys.keys = [ users.users.alukard.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+xd8ClJPvJuAdYC9HlNnjiubEtYfvnKjYr9ROV+UmPVvI3ZITF24OaMI+fxgR0EqGfcUzSGom8528IB53Q3aFMIAaA0vKjW+jrByyB2l/k/+ttpLbH75c9WyOpAcUDTen8BhHKPyXOHoJ1jLu7GFmtPZ+mZo8thFB/VIRrwECHd8DnF0drsSCorkRp1bZC7bAHgztaYHNBUoAVGgJ7nLwW7DotlgbUEDiPJHXOxd/c/ZlXIB/cfUUqF+L5ThbMPhMcwRMspLy+nQdmHhih9k6SkvYqJoNqHT5/XeShb0RkIzvUWT2CYTPop5kAY5mMnatVTOY1FZPhHzk3G8MhOQ3r/elM/ecZxmjL8uozMN9kRGf1IL4DgQZfVqQRILdNSQGb0tfeiyirNZe1RlDw9UvMnZJOw0EkiC9lSSRhBWXXxAmxRrbNFTPQSp+/kiIGDmp2AsGhD11CfTDEU3wcLEUPBUqp1FYSzHncJyEKGy2Dpa5xaUJ0cuyGL4W3WHDXa4sTfY+AIXbQTD88Ujdsbfzyd6lrikG4D/crCurXissrh7q9DuYKWRI24cp5bw9lG33U1EXisnZqFyZNwMAmSj2QEGsHCwSevn0FgyRa2WYXgpZ9hfgY4le+ZSMo2JTosQ6DjGyxMDyQAHJ/ismTTzL67Q2p6U+73toYm62Qqdspw== (none)" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+xd8ClJPvJuAdYC9HlNnjiubEtYfvnKjYr9ROV+UmPVvI3ZITF24OaMI+fxgR0EqGfcUzSGom8528IB53Q3aFMIAaA0vKjW+jrByyB2l/k/+ttpLbH75c9WyOpAcUDTen8BhHKPyXOHoJ1jLu7GFmtPZ+mZo8thFB/VIRrwECHd8DnF0drsSCorkRp1bZC7bAHgztaYHNBUoAVGgJ7nLwW7DotlgbUEDiPJHXOxd/c/ZlXIB/cfUUqF+L5ThbMPhMcwRMspLy+nQdmHhih9k6SkvYqJoNqHT5/XeShb0RkIzvUWT2CYTPop5kAY5mMnatVTOY1FZPhHzk3G8MhOQ3r/elM/ecZxmjL8uozMN9kRGf1IL4DgQZfVqQRILdNSQGb0tfeiyirNZe1RlDw9UvMnZJOw0EkiC9lSSRhBWXXxAmxRrbNFTPQSp+/kiIGDmp2AsGhD11CfTDEU3wcLEUPBUqp1FYSzHncJyEKGy2Dpa5xaUJ0cuyGL4W3WHDXa4sTfY+AIXbQTD88Ujdsbfzyd6lrikG4D/crCurXissrh7q9DuYKWRI24cp5bw9lG33U1EXisnZqFyZNwMAmSj2QEGsHCwSevn0FgyRa2WYXgpZ9hfgY4le+ZSMo2JTosQ6DjGyxMDyQAHJ/ismTTzL67Q2p6U+73toYm62Qqdspw== (none)"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1OdiD3T30dTTVtwDjiVEQ+Dd9P92/4rI60x1xYtr6P75UYZF7eIO6FrxH8FAeSH6N10YsdTK1NPRDj5bsbLDB7d4D4YewPw+tnl3Qnp/04k+/+gpSFhVyUwKWvSTgU34NZFiwdHLuefYkHdAmDBhUhWC+28DyWSPn2LLTHhGRBOaNG39ur/1vaIuJb00vbzA/HWQmIYIByd51gjQkgC+SxIlYb13Q/L6SqHCZ8RUzJyS9bGM9Imw5T7V7SVC2FRjOt6NUm8AVVw06yRgtjXipEYA9GE+Rp69+MNmKr2OxR//KWyQb/SCfQyIWrBn0ee266XukOFuC4bpp50TjTEXx oracle_cloud"
]; ];
home-manager.users.alukard = { home-manager.users.alukard = {

2
roles/desktop.nix
View File

@ -26,7 +26,7 @@
rofi rofi
spotify spotify
steam steam
urxvt # urxvt
vivaldi vivaldi
vscode vscode

24
roles/server.nix
View File

@ -1,5 +1,25 @@
{ inputs, ... }: { { inputs, ... }: {
imports = [ imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [
./base.nix inputs.home-manager.nixosModules.home-manager
inputs.base16.hmModule
applications
devices
locale
misc
nix
overlay
secrets
secrets-envsubst
security
themes
ssh
xdg
zsh
kitty
direnv
fonts
]; ];
} }