cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

renaming machines for clarity

Browse Source
This commit is contained in:
cnst
2025-07-13 16:59:29 +02:00
parent 52685ee8d5
commit cef90a81a3
32 changed files with 355 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/home/programs/fish/default.nix
View File

@@ -23,16 +23,9 @@ in {
];
shellAbbrs = {
extract = "extract.sh";
homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/home.nix";
hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/home.nix";
homeoptions = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/options.nix";
hopt = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/options.nix";
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
nixcleanboot = "sudo nix run /home/$USER/.nix-config#cleanup-boot";
nixclean = "nh clean all --keep 3";
nixdev = "nix develop ~/.nix-config -c $SHELL";
nixconfig = "cd /home/$USER/.nix-config/";
nixup = "nh os switch -H $hostname";
nixupv = "nh os switch -v -H $hostname";
flakeup = "nix flake update";
@@ -43,6 +36,13 @@ in {
"...." = "cd ../../../";
"....." = "cd ../../../../";
"......" = "cd ../../../../../";
nixconfig = "cd /home/$USER/.nix-config/";
homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}mod.nix";
hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}mod.nix";
homeoptions = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}opt.nix";
hopt = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}opt.nix";
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
tree = "${getExe eza} --tree --icons=always";
cat = "${getExe bat} --style=plain";
ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";

4
modules/home/programs/fuzzel/default.nix
View File

@@ -44,10 +44,10 @@ in {
};
};
}
(mkIf (host == "cnixtop") {
(mkIf (host == "kima") {
programs.fuzzel.settings.main.terminal = "${inputs.ghostty.packages.x86_64-linux.default}/bin/ghostty";
})
(mkIf (host == "cnixpad") {
(mkIf (host == "bunk") {
programs.fuzzel.settings.main.terminal = "${pkgs.foot}/bin/foot";
})
(mkIf (host == "toothpc") {

2
modules/home/services/xdg/default.nix
View File

@@ -6,7 +6,7 @@
}: let
inherit (lib) mkIf mkEnableOption mkForce elem;
browser =
if elem osConfig.networking.hostName ["cnixtop" "cnixpad"]
if elem osConfig.networking.hostName ["kima" "bunk"]
then "zen.desktop"
else "firefox.desktop";
cfg = config.home.services.xdg;

4
modules/nixos/programs/hyprland/inputs.nix
View File

@@ -62,7 +62,7 @@ in {
};
}
(mkIf (host == "cnixtop") {
(mkIf (host == "kima") {
programs.hyprland.settings = {
render = {
direct_scanout = 1;
@@ -80,7 +80,7 @@ in {
};
})
(mkIf (host == "cnixpad") {
(mkIf (host == "bunk") {
programs.hyprland.settings = {
input = {
kb_options = "ctrl:swapcaps";

4
modules/nixos/programs/hyprland/keybinds.nix
View File

@@ -92,7 +92,7 @@ in {
};
}
(mkIf (host == "cnixtop") {
(mkIf (host == "kima") {
programs.hyprland.settings = {
"$terminal" = "alacritty";
"$browser" = "zen";
@@ -104,7 +104,7 @@ in {
};
})
(mkIf (host == "cnixpad") {
(mkIf (host == "bunk") {
programs.hyprland.settings = {
"$terminal" = "foot";
"$browser" = "zen";

4
modules/nixos/programs/hyprland/rules.nix
View File

@@ -78,7 +78,7 @@ in {
];
};
}
(mkIf (host == "cnixtop") {
(mkIf (host == "kima") {
programs.hyprland.settings.workspace = [
"name:1,monitor:DP-3"
"name:2,monitor:DP-3"
@@ -92,7 +92,7 @@ in {
"name:10,monitor:DP-3"
];
})
(mkIf (host == "cnixpad") {
(mkIf (host == "bunk") {
programs.hyprland.settings.workspace = [];
})
(mkIf (host == "toothpc") {

4
modules/nixos/programs/hyprland/startup.nix
View File

@@ -28,7 +28,7 @@ in {
};
}
(mkIf (host == "cnixtop") {
(mkIf (host == "kima") {
programs.hyprland.settings.exec-once =
[
"uwsm app -- mullvad-vpn"
@@ -37,7 +37,7 @@ in {
++ commonExecOnce;
})
(mkIf (host == "cnixpad") {
(mkIf (host == "bunk") {
programs.hyprland.settings.exec-once =
[]
++ commonExecOnce;

36
modules/nixos/services/agenix/default.nix
View File

@@ -12,27 +12,32 @@ in {
options = {
nixos.services.agenix = {
enable = mkEnableOption "Enables agenix system environment";
cnixtop.enable = mkOption {
kima.enable = mkOption {
type = lib.types.bool;
default = false;
description = "Apply cnix agenix settings";
description = "Apply kima agenix settings";
};
bunk.enable = mkOption {
type = lib.types.bool;
default = false;
description = "Apply bunk agenix settings";
};
sobotka.enable = mkOption {
type = lib.types.bool;
default = false;
description = "Apply sobotka agenix settings";
};
toothpc.enable = mkOption {
type = lib.types.bool;
default = false;
description = "Apply toothpc agenix settings";
};
cnixpad.enable = mkOption {
type = lib.types.bool;
default = false;
description = "Apply cnixpad agenix settings";
};
};
};
config = mkIf cfg.enable {
age = mkMerge [
(mkIf cfg.cnixtop.enable {
(mkIf cfg.kima.enable {
secrets = {
cnstssh.file = "${self}/secrets/cnstssh.age";
cnixssh.file = "${self}/secrets/cnixssh.age";
@@ -45,16 +50,21 @@ in {
};
};
})
(mkIf cfg.bunk.enable {
secrets = {
# Add bunk specific secrets here
};
})
(mkIf cfg.sobotka.enable {
secrets = {
# Add sobotka specific secrets here
};
})
(mkIf cfg.toothpc.enable {
secrets = {
# Add toothpc specific secrets here
};
})
(mkIf cfg.cnixpad.enable {
secrets = {
# Add adampad specific secrets here
};
})
];
environment = {

6
modules/options/accounts/default.nix
View File

@@ -6,9 +6,9 @@
inherit (lib) mkOption types;
sshKeys = {
cnixpad = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIXCjkKouZrsMoswMIeueO8X/c3kuY3Gb0E9emvkqwUv cnst@cnixpad";
cnixlab = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiNcNex+/hrEQJYJJTj89uPXocSfChU38E5TujWdxaM cnstlab@cnixlab";
cnixtop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEUub8vbzUn2f39ILhAJ2QeH8xxLSjiyUuo8xvHGx/VB adam@cnst.dev";
bunk = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIXCjkKouZrsMoswMIeueO8X/c3kuY3Gb0E9emvkqwUv cnst@cnixpad";
sobotka = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiNcNex+/hrEQJYJJTj89uPXocSfChU38E5TujWdxaM cnstlab@cnixlab";
kima = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEUub8vbzUn2f39ILhAJ2QeH8xxLSjiyUuo8xvHGx/VB adam@cnst.dev";
toothpc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGu5vZbb5ExampleKeyHereGfDF9c5 toothpick@toothpc";
};