daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-19 22:57:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:8cbc1cab6532b80d49115d1d51d2e59bad3136f4
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:411ca211cc1c1fc0fcad62ef89a77c1ae3cff125
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

1 commit
8cbc1cab65 ... 411ca211cc

Author SHA1 Message Date
daylin-bot
411ca211cc flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=ab0a3268e04f2295ec4455be90ce8d0c2b107b8d&submodules=1' (2024-08-01)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=09bb5658b7fa6c0dc4e2744797e51ad4dd25af42&submodules=1' (2024-08-01)
• Updated input 'lix':
    '61a93d5308.tar.gz?narHash=sha256-IDr%2BfHKwmpaWi4hzD2RYLdiaGEFOrsFm%2BNeHKETxMhk%3D' (2024-08-01)
  → '8b69d13368.tar.gz?narHash=sha256-40BiZ6tzjnhrVAdVboAqSRN0IYKcXFKuTmeacTDNLJU%3D' (2024-08-01)
 2024-08-02 00:34:10 +00:00
14 changed files with 92 additions and 78 deletions
Show stats Expand all files Collapse all files

122
flake.lock
View file

@ -35,9 +35,7 @@
}, },
"f1multiviewer": { "f1multiviewer": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1722171639, "lastModified": 1722171639,
@ -336,16 +334,16 @@
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"systems": "systems", "systems": "systems",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1722633380, "lastModified": 1722551504,
"narHash": "sha256-rVyikfYJjkSB7990fLwABjrhVM4UOmci7rxYpRT/6dI=", "narHash": "sha256-/N8voFoU8ALTK8C1esM6MM+lj9zZGCG4lbvH0mNBQUE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "4141e6755022edc19cd37cd7ad077a93b3bae5bd", "rev": "09bb5658b7fa6c0dc4e2744797e51ad4dd25af42",
"revCount": 5045, "revCount": 5041,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -358,14 +356,14 @@
}, },
"hyprland-contrib": { "hyprland-contrib": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1722636442, "lastModified": 1720709712,
"narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=", "narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6", "rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +532,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722617984, "lastModified": 1722551136,
"narHash": "sha256-fA9PkQ8gKHSezxWyZeQhq/SMe1t6xw7KKFroTT5g9UQ=", "narHash": "sha256-40BiZ6tzjnhrVAdVboAqSRN0IYKcXFKuTmeacTDNLJU=",
"rev": "32ca194ebfa3610c8099e5713ee7d5cbb8fb125c", "rev": "8b69d1336804b08d01b6ec2a49709062b6c96d2b",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/32ca194ebfa3610c8099e5713ee7d5cbb8fb125c.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8b69d1336804b08d01b6ec2a49709062b6c96d2b.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -572,7 +570,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_6",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
@ -660,7 +658,7 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1722253092, "lastModified": 1722253092,
@ -678,15 +676,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722185531, "lastModified": 1718530797,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -712,14 +710,14 @@
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs", "nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1722615008, "lastModified": 1722530466,
"narHash": "sha256-wyCU/X6LhNfJgWAJ6fmYdIZBpHeEBJOUiGOR0dF0Ln0=", "narHash": "sha256-9YvLtuLAA+LVmfrvlOsynHkS0DRCYnHFEp72NfXFVnc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "81312ea66c72ae96a7ecb07a2480c3702636e687", "rev": "0bbe640011f1350933109f5450b15f9bd1fb5e9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -729,6 +727,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1712163089, "lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
@ -744,7 +758,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1722087241, "lastModified": 1722087241,
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
@ -760,7 +774,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1722415718, "lastModified": 1722415718,
"narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
@ -776,7 +790,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1720781449, "lastModified": 1720781449,
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
@ -792,7 +806,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1722421184, "lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
@ -808,11 +822,25 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": {
"locked": {
"lastModified": 1714076141,
"narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pixi": { "pixi": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_8",
"nixpkgs"
],
"pixi-source": "pixi-source" "pixi-source": "pixi-source"
}, },
"locked": { "locked": {
@ -857,11 +885,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722644251, "lastModified": 1722523856,
"narHash": "sha256-oyJYxs9W6MgWKQF3GfAPZeXKe9vqnmcWZC2LgiMEan0=", "narHash": "sha256-hjdIYAuQMWLtlxxj9GpgnfFgmGJhxDDYXnBvEVeNXG8=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "08019951beb71fdd79c735907e3fd03ed5f13a4f", "rev": "790eabd933e13b0836c6ec243c77f873a5956966",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -880,7 +908,7 @@
"lix-module": "lix-module", "lix-module": "lix-module",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"pixi": "pixi", "pixi": "pixi",
"roc": "roc", "roc": "roc",
@ -1135,11 +1163,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722600600, "lastModified": 1721995783,
"narHash": "sha256-bRpvmyAvt4OFbQJlmAURyW1To8nlRjNcQJdbOyI1MLE=", "narHash": "sha256-GLI+3yaZn6hHvv6wnYJHGqPfX6G3tXJNrTi7qYV9u94=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "4c95bb8378ca31cc06eba0a9ee0c04851221c193", "rev": "d9099d32bb395be5ed7eeb12ea0145d476632bd1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1156,11 +1184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722561698, "lastModified": 1722475688,
"narHash": "sha256-IlBYZ4/eIKJ8UE2quJYzH9bExfP0csUXtKAq42KoApo=", "narHash": "sha256-b9q/NoJ3I5LtXVvxxjxNRxDEVMd+1daVldCyAYH7aCU=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "d254c2968b28823edddbddf527064774de6598fa", "rev": "b368a9170c6d6727375d2f43baf2565280e86019",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1180,11 +1208,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722643784, "lastModified": 1722209386,
"narHash": "sha256-edckr/cu1D4LpTwudjk756I45sHIMdNGJtXWKxOrjH4=", "narHash": "sha256-GAzXTJUJJIXrAlHkInSDwlnVQPL5BV1Enbj3R4ipGFk=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "312b7dc9710b615488ce78f1f7b47e766939fc36", "rev": "eba1489b6ffa6db7f0eaefce6e06d53cd9066f7b",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View file

@ -38,14 +38,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
pixi = { pixi.url = "github:daylinmorgan/pixi-flake";
url = "github:daylinmorgan/pixi-flake"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
f1multiviewer = {
url = "github:daylinmorgan/f1multiviewer-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
tsm = { tsm = {
url = "github:daylinmorgan/tsm?dir=nix"; url = "github:daylinmorgan/tsm?dir=nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

2
hosts/algiz/default.nix
View file

@ -5,9 +5,9 @@
"nim" "nim"
"node" # for docker langservers "node" # for docker langservers
"python" "python"
"nushell"
]; ];
rune.motd = enabled; rune.motd = enabled;
docker = enabled; docker = enabled;
backups = enabled; backups = enabled;
nix-ld = enabled; nix-ld = enabled;

4
modules/networking/vpn.nix
View file

@ -13,8 +13,8 @@ mkOizysModule config "vpn" {
services.openvpn.servers = { services.openvpn.servers = {
express-ny = { express-ny = {
config = '' config = ''
config /home/${config.oizys.user}/.config/openvpn/express-ny/config.ovpn config /home/daylin/.config/openvpn/express-ny/config.ovpn
auth-user-pass /home/${config.oizys.user}/.config/openvpn/express-ny/credentials auth-user-pass /home/daylin/.config/openvpn/express-ny/credentials
''; '';
autoStart = false; autoStart = false;
updateResolvConf = true; updateResolvConf = true;

13
modules/oizys.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
inherit (lib) mkEnableOption mkOption; inherit (lib) mkEnableOption;
in in
{ {
imports = with self.nixosModules; [ imports = with self.nixosModules; [
@ -39,15 +39,8 @@ in
restic restic
]; ];
options.oizys = { options.oizys.desktop.enable = mkEnableOption "is desktop";
user = mkOption { options.oizys.docker.enable = mkEnableOption "enable docker support";
type = lib.types.string;
default = "daylin";
description = "main user account";
};
desktop.enable = mkEnableOption "is desktop";
docker.enable = mkEnableOption "enable docker support";
};
config = { config = {
networking.hostName = hostName; networking.hostName = hostName;
time.timeZone = "US/Central"; time.timeZone = "US/Central";

4
modules/storage/restic.nix
View file

@ -12,8 +12,8 @@ mkOizysModule config "backups" {
# workaround for now `mkdir ~/.conda && touch ~/.conda/environments.txt` # workaround for now `mkdir ~/.conda && touch ~/.conda/environments.txt`
extraBackupArgs = [ extraBackupArgs = [
"--exclude-file /home/${config.oizys.user}/.config/restic/excludes.txt" "--exclude-file /home/daylin/.config/restic/excludes.txt"
"--exclude-file /home/${config.oizys.user}/.conda/environments.txt" "--exclude-file /home/daylin/.conda/environments.txt"
"--verbose" "--verbose"
"--one-file-system" "--one-file-system"
"--tag systemd.timer" "--tag systemd.timer"

1
todo.md
View file

@ -16,4 +16,3 @@
> kernel: ucsi_acpi USBC000:00: error -EINVAL: PPM init failed > kernel: ucsi_acpi USBC000:00: error -EINVAL: PPM init failed
<!-- generated with <3 by daylinmorgan/todo --> <!-- generated with <3 by daylinmorgan/todo -->