mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-11-12 18:43:15 -06:00
Compare commits
No commits in common. "8e9cb0566b4df6d40296737f3a54d29a118c8387" and "bfd738d9429cbaf32bdadeff1a1b1e8d1c185207" have entirely different histories.
8e9cb0566b
...
bfd738d942
9 changed files with 66 additions and 79 deletions
46
flake.lock
46
flake.lock
|
|
@ -305,11 +305,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719949580,
|
||||
"narHash": "sha256-HDZpI+/LR4fh6TCqByoZrP5/cN3iSiDO0JqG/yKWDWQ=",
|
||||
"lastModified": 1719915468,
|
||||
"narHash": "sha256-vSutSKzLH63dCwvyrLg1wJmbgjH351/++9RQY3S3TYo=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "8bb75a223db3ea9471d05d74fbed3328334a9f78",
|
||||
"revCount": 4904,
|
||||
"rev": "2fa57f2dc4909be697d003a22ce6870039e4db9b",
|
||||
"revCount": 4902,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -498,11 +498,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1719959194,
|
||||
"narHash": "sha256-iFIP240ZElHfAhv9xjSeYuHV0+PmL0yac6AaE80/Fdk=",
|
||||
"rev": "45ac449d3970bc6abc4c04e0b3a3b6768a9cb753",
|
||||
"lastModified": 1719929527,
|
||||
"narHash": "sha256-xQVoaW3fMehnfaHEA+PvfsUEioTWs8NSkDv+7sSeHZI=",
|
||||
"rev": "24852355d8975dcc786ddc4d5853043a52e4c78c",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/45ac449d3970bc6abc4c04e0b3a3b6768a9cb753.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/24852355d8975dcc786ddc4d5853043a52e4c78c.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -679,11 +679,11 @@
|
|||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719994905,
|
||||
"narHash": "sha256-4uGu2yW4yBGwoBj9awKvaTPcgKQhpXkVSzlaV1wcm74=",
|
||||
"lastModified": 1719918908,
|
||||
"narHash": "sha256-GJHzx9LUG2P6hnNvQ+nqWXrQMZDttYaH7RA66ad3mhU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "151f1d593de549318a7ca729b2b391139501cc07",
|
||||
"rev": "64553807b64c630f57d6a3a09afc1e9fbc33995e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -742,11 +742,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1719931832,
|
||||
"narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=",
|
||||
"lastModified": 1719826879,
|
||||
"narHash": "sha256-xs7PlULe8O1SAcs/9e/HOjeUjBrU5FNtkAF/bSEcFto=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0",
|
||||
"rev": "b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -851,11 +851,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719966224,
|
||||
"narHash": "sha256-808HOv+WTv/QhTlkC0eu/KS0vV0652+8XdR0ySOrRUI=",
|
||||
"lastModified": 1719885190,
|
||||
"narHash": "sha256-T0kI9FuR0kAj6vqKNI8JODTEnKtImPfl/pihEtv6ND0=",
|
||||
"owner": "roc-lang",
|
||||
"repo": "roc",
|
||||
"rev": "f69d39dffce472fba35681dbc8b920b3d9bf7319",
|
||||
"rev": "97639cca7dd31ef2818b8f074792398294196952",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -911,11 +911,11 @@
|
|||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1719837636,
|
||||
"narHash": "sha256-sTya/Vhqtdi7Kxx/eVldJRGTPKcyGgFG3ZugOqcbmiE=",
|
||||
"lastModified": 1719663039,
|
||||
"narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "28f8f3531ebdbea069995c20bd946a295699f275",
|
||||
"rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1150,11 +1150,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719969585,
|
||||
"narHash": "sha256-/7C9r01KUCGkZH3L3o/hUpKYjwlO8JRQkPDV63/Jh6Q=",
|
||||
"lastModified": 1719882878,
|
||||
"narHash": "sha256-2cmKpkEPzoEJkTP9V1fTqpPYI0oAFIH/NFB0bMzrToo=",
|
||||
"owner": "Cloudef",
|
||||
"repo": "zig2nix",
|
||||
"rev": "3392ec240cc8c68816ba291eb75f7867fdd0f321",
|
||||
"rev": "3655ededc2f6b3286c5018953664fc02db56158d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -56,13 +56,13 @@
|
|||
"https://hyprland.cachix.org"
|
||||
"https://nixpkgs-wayland.cachix.org"
|
||||
"https://daylin.cachix.org"
|
||||
# "https://cache.lix.systems"
|
||||
"https://cache.lix.systems"
|
||||
];
|
||||
extra-trusted-public-keys = [
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
||||
"daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
|
||||
# "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
||||
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,31 @@
|
|||
{ enableAttrs, ... }:
|
||||
{ pkgs, enabled, ... }:
|
||||
{
|
||||
oizys =
|
||||
(enableAttrs [
|
||||
"vpn"
|
||||
"desktop"
|
||||
"hyprland"
|
||||
"chrome"
|
||||
"docker"
|
||||
"nix-ld"
|
||||
"vbox"
|
||||
"backups"
|
||||
])
|
||||
// {
|
||||
languages = [
|
||||
"misc"
|
||||
"nim"
|
||||
"node"
|
||||
"nushell"
|
||||
"python"
|
||||
"roc"
|
||||
"tex"
|
||||
"zig"
|
||||
];
|
||||
};
|
||||
oizys = {
|
||||
desktop = enabled;
|
||||
hyprland = enabled;
|
||||
chrome = enabled;
|
||||
docker = enabled;
|
||||
nix-ld = enabled;
|
||||
vbox = enabled;
|
||||
vpn = enabled;
|
||||
backups = enabled;
|
||||
languages = [
|
||||
"misc"
|
||||
"nim"
|
||||
"node"
|
||||
"nushell"
|
||||
"python"
|
||||
"roc"
|
||||
"tex"
|
||||
"zig"
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
zk
|
||||
quarto
|
||||
cachix
|
||||
];
|
||||
|
||||
services.restic.backups.gdrive = {
|
||||
user = "daylin";
|
||||
|
|
@ -34,5 +37,8 @@
|
|||
];
|
||||
};
|
||||
|
||||
users.users.daylin.extraGroups = [ "audio" ];
|
||||
users.users.daylin.extraGroups = [
|
||||
"docker"
|
||||
"audio"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
zk
|
||||
quarto
|
||||
cachix
|
||||
graphviz
|
||||
nix-du
|
||||
];
|
||||
}
|
||||
|
|
@ -16,7 +16,6 @@ let
|
|||
mkDefaultOizysModule
|
||||
mkOizysModule
|
||||
enabled
|
||||
enableAttrs
|
||||
;
|
||||
inherit (lib.filesystem) listFilesRecursive;
|
||||
|
||||
|
|
@ -44,7 +43,6 @@ let
|
|||
mkDefaultOizysModule
|
||||
mkOizysModule
|
||||
enabled
|
||||
enableAttrs
|
||||
hostName
|
||||
;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
cfg = config.oizys.languages;
|
||||
zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.default.bin;
|
||||
zls = inputs.zls.outputs.packages.${pkgs.system}.default.overrideAttrs {
|
||||
nativeBuildInputs = [ zig ];
|
||||
nativeBuildInputs = [zig];
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ in
|
|||
];
|
||||
|
||||
options.oizys.desktop.enable = mkEnableOption "is desktop";
|
||||
options.oizys.docker.enable = mkEnableOption "enable docker support";
|
||||
config = {
|
||||
networking.hostName = hostName;
|
||||
time.timeZone = "US/Central";
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkOption mkIf types optional;
|
||||
inherit (lib) mkOption mkIf types;
|
||||
cfg = config.users.defaultUser;
|
||||
isDocker = config.oizys.docker.enable;
|
||||
isDesktop = config.oizys.desktop.enable;
|
||||
in
|
||||
{
|
||||
options.users.defaultUser = mkOption {
|
||||
|
|
@ -24,8 +22,10 @@ in
|
|||
isNormalUser = true;
|
||||
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [ "wheel" ] ++ optional isDesktop "audio" ++ optional isDocker "docker";
|
||||
|
||||
extraGroups = [
|
||||
"wheel" # sudo
|
||||
"docker"
|
||||
];
|
||||
initialHashedPassword = "$2b$05$mGMrDFzf2cXLaoOlVQbGvOBV7UZlDt9dLg9Xqxutb/uHpjF5VrTBO";
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKkezPIhB+QW37G15ZV3bewydpyEcNlYxfHLlzuk3PH9"
|
||||
|
|
|
|||
|
|
@ -1,16 +1,10 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
mkOizysModule,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkIf;
|
||||
cfg = config.oizys.docker;
|
||||
in
|
||||
{
|
||||
config = mkIf cfg.enable {
|
||||
virtualisation.docker.enable = true;
|
||||
environment.systemPackages = with pkgs; [ lazydocker ];
|
||||
};
|
||||
mkOizysModule config "docker" {
|
||||
virtualisation.docker.enable = true;
|
||||
environment.systemPackages = with pkgs; [ lazydocker ];
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue