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

80
flake.lock generated
View File

@@ -28,11 +28,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1751930350,
"narHash": "sha256-hBIrzyrwG3XjeNyzVNWKDX+yYVlpwAqf9ovgF7qecug=",
"lastModified": 1752328525,
"narHash": "sha256-0aaVFLQxY1dKIS5jzwhbO847yIdr3U0o2heUzC5iat4=",
"owner": "Aylur",
"repo": "ags",
"rev": "22f37ccb0db58d9d8a11ad0054ab20ecfad005ad",
"rev": "2eb3ea54311b0f7ba9d333d661d12cda1ed5507e",
"type": "github"
},
"original": {
@@ -144,11 +144,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1752141190,
"narHash": "sha256-RHNq77Z84BtLTwyRtrBffm5V9006Dqw4vh3vrvULlxM=",
"lastModified": 1752318841,
"narHash": "sha256-/Vfi3vmpBDaEDCdPYEOgUIUTyt2lOTRWVj3ESBRIChY=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "ef0794b8e94eea166407141f7e92da75f6df925a",
"rev": "b342f1adfa040963c9b00f4f1755def9f8588a58",
"type": "github"
},
"original": {
@@ -203,11 +203,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1752216262,
"narHash": "sha256-OO7SPN6DfXK8TG62AKWHUYc6D8kVNaKgAStGhDBEcBc=",
"lastModified": 1752302273,
"narHash": "sha256-xXZ0JkrpcpSgeuhezJZV2T+7gHcYCo39ogc55c4FyRw=",
"owner": "nix-community",
"repo": "fenix",
"rev": "1b96480284e9b3f76fb1f68dc2be246c8ae90e13",
"rev": "910743660778c55917959d64980bf046f52142ef",
"type": "github"
},
"original": {
@@ -465,11 +465,11 @@
"zon2nix": "zon2nix"
},
"locked": {
"lastModified": 1752207706,
"narHash": "sha256-6Fiy+icid2rKXL9oKcRd3zuITSwtdnShqCPp0Evt3fM=",
"lastModified": 1752328988,
"narHash": "sha256-07BUaMjLkaSjUgVhlSrbODF+OZHCck5PeGvbtq6wQaA=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "4aa28988a6ddd9aa8b3402e4bab05ad02a0c12c6",
"rev": "b5000dcd94b75d745dacbcd3d4bfaf181d288671",
"type": "github"
},
"original": {
@@ -576,11 +576,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1752196485,
"narHash": "sha256-lZfS2eNoykbgNzv/bbp1JCed5YucBKjif4df5nTZt6M=",
"lastModified": 1752333091,
"narHash": "sha256-eh+B8odDb6EVL3htpMzNd8ap7elM7kvCggTeNvYhZb0=",
"owner": "helix-editor",
"repo": "helix",
"rev": "ba04f538300735d267cbf7ec1a225abcdac3c724",
"rev": "e844a4365d8556dc53b72b67206a6dca8742be80",
"type": "github"
},
"original": {
@@ -596,11 +596,11 @@
]
},
"locked": {
"lastModified": 1752202894,
"narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=",
"lastModified": 1752286566,
"narHash": "sha256-A4nftqiNz2bNihz0bKY94Hq/6ydR6UQOcGioeL7iymY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fab659b346c0d4252208434c3c4b3983a4b38fec",
"rev": "392ddb642abec771d63688c49fa7bcbb9d2a5717",
"type": "github"
},
"original": {
@@ -638,11 +638,11 @@
]
},
"locked": {
"lastModified": 1751824240,
"narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=",
"lastModified": 1752202894,
"narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fd9e55f5fac45a26f6169310afca64d56b681935",
"rev": "fab659b346c0d4252208434c3c4b3983a4b38fec",
"type": "github"
},
"original": {
@@ -789,11 +789,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1752149340,
"narHash": "sha256-DJc2ROpttbP6FHcXwWpmK7EB2cpVsP/LmXjEr8RWcO8=",
"lastModified": 1752337199,
"narHash": "sha256-QezjVkFHSa4AfyUVs2oRhNxELLLJxXM4WbJIzXWtsPw=",
"owner": "hyprwm",
"repo": "hyprland",
"rev": "b5433bb75324a95dd27eb5492141565466c2cdd6",
"rev": "8bfff87833e403c9e8e43af576d48645f98e16d6",
"type": "github"
},
"original": {
@@ -1177,11 +1177,11 @@
]
},
"locked": {
"lastModified": 1751529406,
"narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=",
"lastModified": 1752218319,
"narHash": "sha256-fEvLVaVduwVotOib8NqO0e4N3dMsdA04Jlfm2sZQH5Q=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d",
"rev": "d5da490d8c2553fc8d589b49f9c036973b9656a1",
"type": "github"
},
"original": {
@@ -1273,11 +1273,11 @@
]
},
"locked": {
"lastModified": 1752199489,
"narHash": "sha256-p2zkn8fdLvZ19MgAA5CdiuQWQ/gE3YNg1Nhbm4EAflI=",
"lastModified": 1752285931,
"narHash": "sha256-6jawOVAYX+hgFQgJb6+Ll7vKPGUwrNsNl3n6ThSBKW4=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "62f976ed47de88323770646a9a92e4912d33585f",
"rev": "a5bdc5faada1290ad6ca0b91d5ca87bbfbde474a",
"type": "github"
},
"original": {
@@ -1584,11 +1584,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1752182378,
"narHash": "sha256-bKzsGh+1AWSpL2Q2/0FKgNchTJOmYpQH2BS9dCyKXaI=",
"lastModified": 1752262373,
"narHash": "sha256-eRDeo/hVnf958ESWy8qV/jZj4ZRbFXsmMdw1cnI57dE=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "e2c8cefa63bd4cafb66978867c0f1ec2ba14bb03",
"rev": "a489123e806ceadfdc5568bf9609b0468f5a2e6a",
"type": "github"
},
"original": {
@@ -1606,11 +1606,11 @@
]
},
"locked": {
"lastModified": 1751856221,
"narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=",
"lastModified": 1752201818,
"narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e",
"rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d",
"type": "github"
},
"original": {
@@ -1901,11 +1901,11 @@
]
},
"locked": {
"lastModified": 1752095083,
"narHash": "sha256-fb5xIlyJlDZb7PN95nucFeuFEHyXEwXK9zxBFPCFef4=",
"lastModified": 1752246318,
"narHash": "sha256-NV4/8N2p+ao8t1BmCqOeS22Tf17yTWDZCnCtRJWLt+U=",
"ref": "refs/heads/main",
"rev": "24ad25977fb703d35239e9ba4d289d4971d7b1cc",
"revCount": 112,
"rev": "13149225d583c9f39ec2d3fd52f6bd5331c64914",
"revCount": 113,
"type": "git",
"url": "https://git.sr.ht/~canasta/zen-browser-flake"
},

2
hosts/cnixpad/default.nix → hosts/bunk/default.nix
View File

@@ -35,7 +35,7 @@ in {
./modules.nix
];
networking.hostName = "cnixpad";
networking.hostName = "bunk";
swapDevices = [
{

0
hosts/cnixpad/hardware-configuration.nix → hosts/bunk/hardware-configuration.nix
View File

2
hosts/cnixpad/modules.nix → hosts/bunk/modules.nix
View File

@@ -124,7 +124,7 @@
services = {
agenix = {
enable = true;
cnixpad = {
bunk = {
enable = true;
};
};

19
hosts/default.nix
View File

@@ -23,15 +23,14 @@
# get these into the module system
specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig umodPath smodPath;};
in {
cnixtop = nixosSystem {
kima = nixosSystem {
inherit specialArgs;
modules = [
./cnixtop
./kima
"${self}/nix"
{
home-manager = {
users.cnst.imports = homeImports."cnst@cnixtop";
users.cnst.imports = homeImports."cnst@kima";
extraSpecialArgs = specialArgs;
};
}
@@ -41,14 +40,14 @@
inputs.agenix.nixosModules.default
];
};
cnixpad = nixosSystem {
bunk = nixosSystem {
inherit specialArgs;
modules = [
./cnixpad
./bunk
"${self}/nix"
{
home-manager = {
users.cnst.imports = homeImports."cnst@cnixpad";
users.cnst.imports = homeImports."cnst@bunk";
extraSpecialArgs = specialArgs;
};
}
@@ -57,14 +56,14 @@
inputs.agenix.nixosModules.default
];
};
cnixlab = nixosSystem {
sobotka = nixosSystem {
inherit specialArgs;
modules = [
./cnixlab
./sobotka
"${self}/nix"
{
home-manager = {
users.cnstlab.imports = homeImports."cnstlab@cnixlab";
users.cnst.imports = homeImports."cnst@sobotka";
extraSpecialArgs = specialArgs;
};
}

2
hosts/cnixtop/default.nix → hosts/kima/default.nix
View File

@@ -37,7 +37,7 @@ in {
time.hardwareClockInLocalTime = true;
networking.hostName = "cnixtop";
networking.hostName = "kima";
environment.variables = {
NH_FLAKE = "/home/cnst/.nix-config";

0
hosts/cnixtop/hardware-configuration.nix → hosts/kima/hardware-configuration.nix
View File

2
hosts/cnixtop/modules.nix → hosts/kima/modules.nix
View File

@@ -128,7 +128,7 @@
services = {
agenix = {
enable = true;
cnixtop = {
kima = {
enable = true;
};
};

6
hosts/cnixlab/default.nix → hosts/sobotka/default.nix
View File

@@ -6,7 +6,7 @@
}: let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
users.users.cnstlab = {
users.users.cnst = {
isNormalUser = true;
shell = pkgs.fish;
extraGroups = ifTheyExist [
@@ -37,9 +37,9 @@ in {
boot.initrd.luks.devices."luks-47b35d4b-467a-4637-a5f9-45177da62897".device = "/dev/disk/by-uuid/47b35d4b-467a-4637-a5f9-45177da62897";
networking.hostName = "cnixlab";
networking.hostName = "sobotka";
environment.variables.NH_FLAKE = "/home/cnstlab/.nix-config";
environment.variables.NH_FLAKE = "/home/cnst/.nix-config";
# # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = lib.mkDefault "25.05";

0
hosts/cnixlab/hardware-configuration.nix → hosts/sobotka/hardware-configuration.nix
View File

4
hosts/cnixlab/modules.nix → hosts/sobotka/modules.nix
View File

@@ -125,7 +125,7 @@
services = {
agenix = {
enable = false;
cnixtop = {
kima = {
enable = false;
};
};
@@ -149,7 +149,7 @@
};
greetd = {
enable = false;
user = "cnstlab";
user = "cnst";
};
gvfs = {
enable = false;

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";
};

29
users/cnst/default.nix
View File

@@ -1,18 +1,8 @@
{
pkgs,
lib,
config,
# osConfig,
...
}:
# let
# isCnixpad = osConfig.networking.hostName == "cnixpad";
# in
{
{pkgs, ...}: {
imports = [
./modules
./variables
];
# ++ lib.optionals isCnixpad [./cpmodules.nix];
home = {
username = "cnst";
@@ -20,21 +10,8 @@
stateVersion = "23.11";
extraOutputsToInstall = ["doc" "devdoc"];
packages = with pkgs; [
# misc.system
bun
];
sessionVariables = {
BROWSER = "zen";
EDITOR = "hx";
TERM = "xterm-256color";
VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d";
QT_QPA_PLATFORM = "wayland";
XDG_SESSION_TYPE = "wayland";
# GEMINI_API_KEY = "$(cat ${config.age.secrets.gcapi.path})";
};
};
manual = {
@@ -44,6 +21,4 @@
};
programs.home-manager.enable = true;
# systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"];
}

0
users/cnst/modules/home.nix → users/cnst/modules/bunkmod.nix
View File

2
users/cnst/modules/options.nix → users/cnst/modules/bunkopt.nix
View File

@@ -2,7 +2,7 @@
accounts = {
username = "cnst";
mail = "adam@cnst.dev";
sshUser = "cnixtop";
sshUser = "bunk";
};
monitors = [
{

23
users/cnst/modules/default.nix
View File

@@ -1,6 +1,19 @@
{
imports = [
./home.nix
./options.nix
];
{osConfig, ...}: let
hostSpecificImports =
if osConfig.networking.hostName == "sobotka"
then [
./sobotkamod.nix
./sobotkaopt.nix
]
else if osConfig.networking.hostName == "bunk"
then [
./bunkmod.nix
./bunkopt.nix
]
else [
./kimamod.nix
./kimaopt.nix
];
in {
imports = hostSpecificImports;
}

155
users/cnst/modules/kimamod.nix Normal file
View File

@@ -0,0 +1,155 @@
{
home = {
programs = {
aerc = {
enable = false;
};
alacritty = {
enable = true;
};
bash = {
enable = true;
};
chromium = {
enable = true;
};
discord = {
enable = true;
variant = "vesktop";
};
eza = {
enable = true;
};
floorp = {
enable = false;
};
firefox = {
enable = true;
};
fish = {
enable = true;
};
foot = {
enable = true;
};
fuzzel = {
enable = true;
};
git = {
enable = true;
};
ghostty = {
enable = true;
};
helix = {
enable = true;
};
hyprlock = {
enable = true;
};
jujutsu = {
enable = false;
};
kitty = {
enable = false;
};
misc = {
enable = true;
};
mpv = {
enable = true;
};
neovim = {
enable = false;
};
nvf = {
enable = false;
};
nwg-bar = {
enable = true;
};
rofi = {
enable = true;
};
ssh = {
enable = true;
};
tuirun = {
enable = true;
};
vscode = {
enable = false;
};
waybar = {
enable = true;
};
wezterm = {
enable = false;
};
yazi = {
enable = true;
};
zathura = {
enable = true;
};
zed-editor = {
enable = false;
};
zellij = {
enable = false;
};
zen = {
enable = true;
};
zsh = {
enable = false;
};
};
services = {
blueman-applet = {
enable = false;
};
copyq = {
enable = false;
};
dconf = {
settings = {
color-scheme = "prefer-dark";
};
};
dunst = {
enable = true;
};
gpg = {
enable = true;
};
gtk = {
enable = true;
};
hypridle = {
enable = true;
};
hyprpaper = {
enable = true;
};
mako = {
enable = false;
};
nix-index = {
enable = true;
};
protonmail-bridge = {
enable = false;
};
syncthing = {
enable = true;
};
udiskie = {
enable = true;
};
xdg = {
enable = true;
};
};
};
}

4
users/cnstlab/modules/options.nix → users/cnst/modules/kimaopt.nix
View File

@@ -1,8 +1,8 @@
{
accounts = {
username = "cnstlab";
username = "cnst";
mail = "adam@cnst.dev";
sshUser = "cnixlab";
sshUser = "kima";
};
monitors = [
{

0
users/cnstlab/modules/home.nix → users/cnst/modules/sobotkamod.nix
View File

44
users/cnst/modules/sobotkaopt.nix Normal file
View File

@@ -0,0 +1,44 @@
{
accounts = {
username = "cnst";
mail = "adam@cnst.dev";
sshUser = "sobotka";
};
monitors = [
{
name = "DP-3";
width = 2560;
height = 1440;
refreshRate = 240;
position = "0x0";
transform = 0;
bitDepth = 10;
workspace = "1";
primary = true;
}
{
name = "DP-4";
width = 1920;
height = 1080;
refreshRate = 60;
position = "2560x0";
transform = 3;
workspace = "5";
primary = false;
}
{
name = "eDP-1";
width = 1920;
height = 1200;
refreshRate = 60;
workspace = "1";
primary = false;
}
];
theme = {
background = {
lockscreen = "wallpaper_2";
desktop = "wallpaper_1";
};
};
}

27
users/cnst/variables/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{osConfig, ...}: let
hostSpecificVariables =
if osConfig.networking.hostName == "sobotka"
then {
EDITOR = "hx";
TERM = "xterm-256color";
}
else if osConfig.networking.hostName == "bunk"
then {
BROWSER = "zen";
EDITOR = "hx";
TERM = "xterm-256color";
QT_QPA_PLATFORM = "wayland";
XDG_SESSION_TYPE = "wayland";
}
else {
BROWSER = "zen";
EDITOR = "hx";
TERM = "xterm-256color";
VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d";
QT_QPA_PLATFORM = "wayland";
XDG_SESSION_TYPE = "wayland";
};
in {
home.sessionVariables = hostSpecificVariables;
}

43
users/cnstlab/default.nix
View File

@@ -1,43 +0,0 @@
{
pkgs,
lib,
config,
# osConfig,
...
}:
# let
# isCnixpad = osConfig.networking.hostName == "cnixpad";
# in
{
imports = [
./modules
];
# ++ lib.optionals isCnixpad [./cpmodules.nix];
home = {
username = "cnstlab";
homeDirectory = "/home/cnstlab";
stateVersion = "23.11";
extraOutputsToInstall = ["doc" "devdoc"];
packages = with pkgs; [
# misc.system
bun
];
sessionVariables = {
BROWSER = "zen";
EDITOR = "hx";
TERM = "xterm-256color";
};
};
manual = {
html.enable = false;
json.enable = false;
manpages.enable = false;
};
programs.home-manager.enable = true;
# systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"];
}

6
users/cnstlab/modules/default.nix
View File

@@ -1,6 +0,0 @@
{
imports = [
./home.nix
./options.nix
];
}

9
users/default.nix
View File

@@ -6,7 +6,6 @@
extraSpecialArgs = {inherit inputs self;};
sharedImports = [
# ./etc
"${self}/scripts"
inputs.nvf.homeManagerModules.default
self.nixosModules.home
@@ -14,20 +13,20 @@
];
homeImports = {
"cnst@cnixtop" =
"cnst@kima" =
sharedImports
++ [
./cnst
];
"cnst@cnixpad" =
"cnst@bunk" =
sharedImports
++ [
./cnst
];
"cnstlab@cnixlab" =
"cnst@sobotka" =
sharedImports
++ [
./cnstlab
./cnst
];
"toothpick@toothpc" =
sharedImports