daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-13 19:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:bfd738d9429cbaf32bdadeff1a1b1e8d1c185207
Branches Tags
daylin:main
daylin:flake-lock
daylin:algiz
daylin:master
..
compare: daylin:8e9cb0566b4df6d40296737f3a54d29a118c8387
Branches Tags
daylin:main
daylin:flake-lock
daylin:algiz
daylin:master

3 commits
bfd738d942 ... 8e9cb0566b

Author SHA1 Message Date
Daylin Morgan
8e9cb0566b
don't check cache that won't have main anyways 2024-07-03 11:06:36 -05:00
Daylin Morgan
fbd0f6afee
flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=2fa57f2dc4909be697d003a22ce6870039e4db9b' (2024-07-02)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=8bb75a223db3ea9471d05d74fbed3328334a9f78' (2024-07-02)
• Updated input 'lix':
    '24852355d8.tar.gz?narHash=sha256-xQVoaW3fMehnfaHEA%2BPvfsUEioTWs8NSkDv%2B7sSeHZI%3D' (2024-07-02)
  → '45ac449d39.tar.gz?narHash=sha256-iFIP240ZElHfAhv9xjSeYuHV0%2BPmL0yac6AaE80/Fdk%3D' (2024-07-02)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8' (2024-07-01)
  → 'github:nixos/nixpkgs/0aeab749216e4c073cece5d34bc01b79e717c3e0' (2024-07-02)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/64553807b64c630f57d6a3a09afc1e9fbc33995e' (2024-07-02)
  → 'github:nix-community/nixpkgs-wayland/151f1d593de549318a7ca729b2b391139501cc07' (2024-07-03)
• Updated input 'roc':
    'github:roc-lang/roc/97639cca7dd31ef2818b8f074792398294196952' (2024-07-02)
  → 'github:roc-lang/roc/f69d39dffce472fba35681dbc8b920b3d9bf7319' (2024-07-03)
• Updated input 'stable':
    'github:nixos/nixpkgs/4a1e673523344f6ccc84b37f4413ad74ea19a119' (2024-06-29)
  → 'github:nixos/nixpkgs/28f8f3531ebdbea069995c20bd946a295699f275' (2024-07-01)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/3655ededc2f6b3286c5018953664fc02db56158d' (2024-07-02)
  → 'github:Cloudef/zig2nix/3392ec240cc8c68816ba291eb75f7867fdd0f321' (2024-07-03)
 2024-07-03 10:53:16 -05:00
Daylin Morgan
0704db6405
more refactoring 2024-07-03 10:53:16 -05:00
9 changed files with 79 additions and 66 deletions
Show stats Expand all files Collapse all files

46
flake.lock
View file

@ -305,11 +305,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1719915468, "lastModified": 1719949580,
"narHash": "sha256-vSutSKzLH63dCwvyrLg1wJmbgjH351/++9RQY3S3TYo=", "narHash": "sha256-HDZpI+/LR4fh6TCqByoZrP5/cN3iSiDO0JqG/yKWDWQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "2fa57f2dc4909be697d003a22ce6870039e4db9b", "rev": "8bb75a223db3ea9471d05d74fbed3328334a9f78",
"revCount": 4902, "revCount": 4904,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -498,11 +498,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719929527, "lastModified": 1719959194,
"narHash": "sha256-xQVoaW3fMehnfaHEA+PvfsUEioTWs8NSkDv+7sSeHZI=", "narHash": "sha256-iFIP240ZElHfAhv9xjSeYuHV0+PmL0yac6AaE80/Fdk=",
"rev": "24852355d8975dcc786ddc4d5853043a52e4c78c", "rev": "45ac449d3970bc6abc4c04e0b3a3b6768a9cb753",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/24852355d8975dcc786ddc4d5853043a52e4c78c.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/45ac449d3970bc6abc4c04e0b3a3b6768a9cb753.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -679,11 +679,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1719918908, "lastModified": 1719994905,
"narHash": "sha256-GJHzx9LUG2P6hnNvQ+nqWXrQMZDttYaH7RA66ad3mhU=", "narHash": "sha256-4uGu2yW4yBGwoBj9awKvaTPcgKQhpXkVSzlaV1wcm74=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "64553807b64c630f57d6a3a09afc1e9fbc33995e", "rev": "151f1d593de549318a7ca729b2b391139501cc07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +742,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1719826879, "lastModified": 1719931832,
"narHash": "sha256-xs7PlULe8O1SAcs/9e/HOjeUjBrU5FNtkAF/bSEcFto=", "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8", "rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -851,11 +851,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1719885190, "lastModified": 1719966224,
"narHash": "sha256-T0kI9FuR0kAj6vqKNI8JODTEnKtImPfl/pihEtv6ND0=", "narHash": "sha256-808HOv+WTv/QhTlkC0eu/KS0vV0652+8XdR0ySOrRUI=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "97639cca7dd31ef2818b8f074792398294196952", "rev": "f69d39dffce472fba35681dbc8b920b3d9bf7319",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -911,11 +911,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1719663039, "lastModified": 1719837636,
"narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "narHash": "sha256-sTya/Vhqtdi7Kxx/eVldJRGTPKcyGgFG3ZugOqcbmiE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "rev": "28f8f3531ebdbea069995c20bd946a295699f275",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1150,11 +1150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719882878, "lastModified": 1719969585,
"narHash": "sha256-2cmKpkEPzoEJkTP9V1fTqpPYI0oAFIH/NFB0bMzrToo=", "narHash": "sha256-/7C9r01KUCGkZH3L3o/hUpKYjwlO8JRQkPDV63/Jh6Q=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "3655ededc2f6b3286c5018953664fc02db56158d", "rev": "3392ec240cc8c68816ba291eb75f7867fdd0f321",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -56,13 +56,13 @@
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
"https://nixpkgs-wayland.cachix.org" "https://nixpkgs-wayland.cachix.org"
"https://daylin.cachix.org" "https://daylin.cachix.org"
"https://cache.lix.systems" # "https://cache.lix.systems"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
"daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" # "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
]; ];
}; };
} }

34
hosts/othalan/default.nix
View file

@ -1,14 +1,17 @@
{ pkgs, enabled, ... }: { enableAttrs, ... }:
{ {
oizys = { oizys =
desktop = enabled; (enableAttrs [
hyprland = enabled; "vpn"
chrome = enabled; "desktop"
docker = enabled; "hyprland"
nix-ld = enabled; "chrome"
vbox = enabled; "docker"
vpn = enabled; "nix-ld"
backups = enabled; "vbox"
"backups"
])
// {
languages = [ languages = [
"misc" "misc"
"nim" "nim"
@ -21,12 +24,6 @@
]; ];
}; };
environment.systemPackages = with pkgs; [
zk
quarto
cachix
];
services.restic.backups.gdrive = { services.restic.backups.gdrive = {
user = "daylin"; user = "daylin";
repository = "rclone:g:archives/othalan"; repository = "rclone:g:archives/othalan";
@ -37,8 +34,5 @@
]; ];
}; };
users.users.daylin.extraGroups = [ users.users.daylin.extraGroups = [ "audio" ];
"docker"
"audio"
];
} }

10
hosts/othalan/pkgs.nix Normal file
View file

@ -0,0 +1,10 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
zk
quarto
cachix
graphviz
nix-du
];
}

2
lib/default.nix
View file

@ -16,6 +16,7 @@ let
mkDefaultOizysModule mkDefaultOizysModule
mkOizysModule mkOizysModule
enabled enabled
enableAttrs
; ;
inherit (lib.filesystem) listFilesRecursive; inherit (lib.filesystem) listFilesRecursive;
@ -43,6 +44,7 @@ let
mkDefaultOizysModule mkDefaultOizysModule
mkOizysModule mkOizysModule
enabled enabled
enableAttrs
hostName hostName
; ;
}; };

1
modules/oizys.nix
View file

@ -40,6 +40,7 @@ in
]; ];
options.oizys.desktop.enable = mkEnableOption "is desktop"; options.oizys.desktop.enable = mkEnableOption "is desktop";
options.oizys.docker.enable = mkEnableOption "enable docker support";
config = { config = {
networking.hostName = hostName; networking.hostName = hostName;
time.timeZone = "US/Central"; time.timeZone = "US/Central";

10
modules/users/default.nix
View file

@ -5,8 +5,10 @@
... ...
}: }:
let let
inherit (lib) mkOption mkIf types; inherit (lib) mkOption mkIf types optional;
cfg = config.users.defaultUser; cfg = config.users.defaultUser;
isDocker = config.oizys.docker.enable;
isDesktop = config.oizys.desktop.enable;
in in
{ {
options.users.defaultUser = mkOption { options.users.defaultUser = mkOption {
@ -22,10 +24,8 @@ in
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = [ "wheel" ] ++ optional isDesktop "audio" ++ optional isDocker "docker";
"wheel" # sudo
"docker"
];
initialHashedPassword = "$2b$05$mGMrDFzf2cXLaoOlVQbGvOBV7UZlDt9dLg9Xqxutb/uHpjF5VrTBO"; initialHashedPassword = "$2b$05$mGMrDFzf2cXLaoOlVQbGvOBV7UZlDt9dLg9Xqxutb/uHpjF5VrTBO";
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKkezPIhB+QW37G15ZV3bewydpyEcNlYxfHLlzuk3PH9" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKkezPIhB+QW37G15ZV3bewydpyEcNlYxfHLlzuk3PH9"

10
modules/virtualization/docker.nix
View file

@ -1,10 +1,16 @@
{ {
pkgs, pkgs,
config, config,
mkOizysModule, lib,
... ...
}: }:
mkOizysModule config "docker" { let
inherit (lib) mkIf;
cfg = config.oizys.docker;
in
{
config = mkIf cfg.enable {
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
environment.systemPackages = with pkgs; [ lazydocker ]; environment.systemPackages = with pkgs; [ lazydocker ];
};
} }