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

modularizing zsh

Browse Source
This commit is contained in:
cnst
2024-10-03 19:16:22 +02:00
parent 92d9e7bda3
commit e271e32e70
11 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
flake.lock generated
View File

@@ -226,11 +226,11 @@
"rust-analyzer-src": "rust-analyzer-src_2" "rust-analyzer-src": "rust-analyzer-src_2"
}, },
"locked": { "locked": {
"lastModified": 1727764514, "lastModified": 1727937235,
"narHash": "sha256-tvN9v5gTxLI5zOKsNvYl1aUxIitHm8Nj3vKdXNfJo50=", "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "a9d2e5fa8d77af05240230c9569bbbddd28ccfaf", "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -250,11 +250,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727792253, "lastModified": 1727962016,
"narHash": "sha256-IZ0GC5DHkSkY3A0nj93ZxjyKSCTWNDSqPoDaxtNceMc=", "narHash": "sha256-aTbSKp4bxhrgdGQar0U8nGTED05XJ7tZCiP1KUUrxic=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-firefox-nightly", "repo": "flake-firefox-nightly",
"rev": "8c0147744bfcf1b0cbdbff1d7b67c9768973c6e7", "rev": "daf490548ed0bc2cc8b61dc3619549ccf1055cec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -337,11 +337,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726153070, "lastModified": 1727826117,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -599,11 +599,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1727744745, "lastModified": 1727975286,
"narHash": "sha256-10PtZHgDq7S5n8ez0iT9eLWvAlEDtEi572yFzidLW/0=", "narHash": "sha256-NXHi7FWTV0eRO60Fy6Xfvy+fU8pjnaZWCiFr1dqQfxM=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "57ec3b7330de3f5a7b37e766a758f13fdf3c0da5", "rev": "02b6f1488a4a1438b268f87d96c474a946ea3e5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -644,11 +644,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727383923, "lastModified": 1727817100,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d", "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -774,11 +774,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1727714556, "lastModified": 1727900725,
"narHash": "sha256-l4cPDA3xGtGdQmdSCAO2VyWg9xwW6//KwDYefdWtovQ=", "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "5c6c300abfea2539ffad9bcbf857325eec5ab765", "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2",
"revCount": 5285, "revCount": 5287,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@@ -1159,11 +1159,11 @@
"umu": "umu" "umu": "umu"
}, },
"locked": { "locked": {
"lastModified": 1727574085, "lastModified": 1727833150,
"narHash": "sha256-vwERoi5pcO39raf92QMS6BjujfbRiHWA0rOb/XlQlmc=", "narHash": "sha256-IzgILnjvFkpurNNnDVSwsSs2vOnPgvYm9kIic3PKnuM=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "6401744e317693efe56495a863322894767277fd", "rev": "24d805b445e3ec994f06fa071cf23b350b45a5f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1206,11 +1206,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727317334, "lastModified": 1727922070,
"narHash": "sha256-O/X5IuT3TYNc0nkbQPOC9pRUieIC36yOSvAhvviYMLY=", "narHash": "sha256-aSbskm7MkBaW0/6Lom9WWwjbVdLD5gPoNxQdqHMOwl4=",
"owner": "nixpak", "owner": "nixpak",
"repo": "nixpak", "repo": "nixpak",
"rev": "9b4088659ba26a43189c56d30b27ccafdfa77f26", "rev": "40675efdce879dd0ae220f3fc117efad05565e92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1252,11 +1252,11 @@
}, },
"nixpkgs-small": { "nixpkgs-small": {
"locked": { "locked": {
"lastModified": 1727781656, "lastModified": 1727924886,
"narHash": "sha256-U50eBuNb3LToPx8ny5q8oVwu1IqV6VtuGcexKCpxpcQ=", "narHash": "sha256-cc2OLWcyuaIwm06W/FP5xf40U9QKGZQJp5Oxlhc22/4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd22e978f12cced6956318a7e013d9b7f9538788", "rev": "c98ddb920493f24dd57ea34a18dafdbd16eeace0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1411,11 +1411,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1727634051, "lastModified": 1727802920,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1427,11 +1427,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1727795932, "lastModified": 1727973876,
"narHash": "sha256-qfHikL1eQ5C7n5n+vk6bE0T3QjxcoGO20ePgKfpsVCc=", "narHash": "sha256-MG4whkoN7YF/eiUA20Tcip6agMXk1BfTwf44SwUml9w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "6df3e5a1ccb28201bbd6a4f3d9bf03343ca0b720", "rev": "23b332974fcbf9fb906b4aaec1794f5c3222613e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1518,11 +1518,11 @@
"rust-analyzer-src_2": { "rust-analyzer-src_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727706011, "lastModified": 1727778987,
"narHash": "sha256-xxgUHwwJ+1xQQoUWvLDo807IZ0MDldkfr9N1G4fvNJU=", "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "28830ff2f1158ee92f4852ef3ec35af0935d1562", "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1788,11 +1788,11 @@
}, },
"locked": { "locked": {
"dir": "packaging/nix", "dir": "packaging/nix",
"lastModified": 1727227288, "lastModified": 1727823491,
"narHash": "sha256-82fIhNN93zk0vmc5rltsbYJlD96AHzEFY2q1KizLP0A=", "narHash": "sha256-UTjBMSXi0zRwqJD3ig6vH7kDrgtw9dSYFYcPNJ+u65A=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "5cc1c3f23e2ecc9e03267c097e990d1702416852", "rev": "081b45bc5f697b69861899fc5fb8a756ed353736",
"revCount": 730, "revCount": 731,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/" "url": "https://github.com/Open-Wine-Components/umu-launcher/"

19
hosts/cnix/modules.nix
View File

@@ -2,8 +2,12 @@
modules = { modules = {
boot = { boot = {
loader = { loader = {
default.enable = false; default = {
lanzaboote.enable = true; enable = false;
};
lanzaboote = {
enable = true;
};
}; };
kernel = { kernel = {
variant = "cachyos"; variant = "cachyos";
@@ -139,7 +143,9 @@
}; };
greetd = { greetd = {
enable = true; enable = true;
gnomeKeyring.enable = false; gnomeKeyring = {
enable = false;
};
autologin = { autologin = {
enable = false; enable = false;
user = "cnst"; user = "cnst";
@@ -195,7 +201,9 @@
}; };
misc = { misc = {
enable = true; enable = true;
desktop.enable = true; desktop = {
enable = true;
};
}; };
npm = { npm = {
enable = true; enable = true;
@@ -206,6 +214,9 @@
yubikey = { yubikey = {
enable = true; enable = true;
}; };
zsh = {
enable = true;
};
}; };
}; };
} }

3
hosts/cnixpad/modules.nix
View File

@@ -200,6 +200,9 @@
obsidian = { obsidian = {
enable = true; enable = true;
}; };
zsh = {
enable = true;
};
}; };
}; };
} }

6
hosts/toothpc/modules.nix
View File

@@ -198,6 +198,12 @@
yubikey = { yubikey = {
enable = false; enable = false;
}; };
obsidian = {
enable = false;
};
zsh = {
enable = true;
};
}; };
}; };
} }

7
system/boot/default.nix
View File

@@ -1,7 +0,0 @@
{
boot.loader = {
systemd-boot.enable = true;
systemd-boot.graceful = true;
efi.canTouchEfiVariables = false;
};
}

24
system/boot/lanzaboote/default.nix
View File

@@ -1,24 +0,0 @@
{
pkgs,
lib,
inputs,
...
}:
# lanzaboote config
{
imports = [
inputs.lanzaboote.nixosModules.lanzaboote
];
boot = {
lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
};
# we let lanzaboote install systemd-boot
loader.systemd-boot.enable = lib.mkForce false;
};
environment.systemPackages = [pkgs.sbctl];
}

1
system/etc/default.nix
View File

@@ -5,6 +5,5 @@
./fonts ./fonts
./security ./security
./xdg ./xdg
./zsh
]; ];
} }

1
system/etc/zram/default.nix
View File

@@ -1 +0,0 @@
{zramSwap.enable = true;}

1
system/etc/zsh/default.nix
View File

@@ -1 +0,0 @@
{ programs.zsh.enable = true; }

1
system/modules/default.nix
View File

@@ -49,5 +49,6 @@
"${systemModules}/utils/npm" "${systemModules}/utils/npm"
"${systemModules}/utils/obsidian" "${systemModules}/utils/obsidian"
"${systemModules}/utils/yubikey" "${systemModules}/utils/yubikey"
"${systemModules}/utils/zsh"
]; ];
} }

15
system/modules/utils/zsh/default.nix Normal file
View File

@@ -0,0 +1,15 @@
{
config,
lib,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.utils.zsh;
in {
options = {
modules.utils.zsh.enable = mkEnableOption "Enables android tools";
};
config = mkIf cfg.enable {
programs.zsh.enable = cfg.enable;
};
}