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

Compare commits

base: daylin:411ca211cc1c1fc0fcad62ef89a77c1ae3cff125
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: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

4 commits
411ca211cc ... 8cbc1cab65

Author SHA1 Message Date
daylin-bot
8cbc1cab65 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=4141e6755022edc19cd37cd7ad077a93b3bae5bd&submodules=1' (2024-08-02)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/65d42dcbfde2229a75ccdb195c318dfe241f9ade?narHash=sha256-78j/cY%2BAXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ%3D' (2024-07-11)
  → 'github:hyprwm/contrib/9d67858b437d4a1299be496d371b66fc0d3e01f6?narHash=sha256-%2B7IS0n3/F0I5j6ZbrVlLcIIPHY3o%2B/vLAqg/G48sG%2Bw%3D' (2024-08-02)
• Updated input 'lix':
    '61a93d5308.tar.gz?narHash=sha256-IDr%2BfHKwmpaWi4hzD2RYLdiaGEFOrsFm%2BNeHKETxMhk%3D' (2024-08-01)
  → '32ca194ebf.tar.gz?narHash=sha256-fA9PkQ8gKHSezxWyZeQhq/SMe1t6xw7KKFroTT5g9UQ%3D' (2024-08-02)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/0bbe640011f1350933109f5450b15f9bd1fb5e9f?narHash=sha256-9YvLtuLAA%2BLVmfrvlOsynHkS0DRCYnHFEp72NfXFVnc%3D' (2024-08-01)
  → 'github:nix-community/nixpkgs-wayland/81312ea66c72ae96a7ecb07a2480c3702636e687?narHash=sha256-wyCU/X6LhNfJgWAJ6fmYdIZBpHeEBJOUiGOR0dF0Ln0%3D' (2024-08-02)
• Updated input 'roc':
    'github:roc-lang/roc/790eabd933e13b0836c6ec243c77f873a5956966?narHash=sha256-hjdIYAuQMWLtlxxj9GpgnfFgmGJhxDDYXnBvEVeNXG8%3D' (2024-08-01)
  → 'github:roc-lang/roc/08019951beb71fdd79c735907e3fd03ed5f13a4f?narHash=sha256-oyJYxs9W6MgWKQF3GfAPZeXKe9vqnmcWZC2LgiMEan0%3D' (2024-08-03)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/b368a9170c6d6727375d2f43baf2565280e86019?narHash=sha256-b9q/NoJ3I5LtXVvxxjxNRxDEVMd%2B1daVldCyAYH7aCU%3D' (2024-08-01)
  → 'github:Cloudef/zig2nix/d254c2968b28823edddbddf527064774de6598fa?narHash=sha256-IlBYZ4/eIKJ8UE2quJYzH9bExfP0csUXtKAq42KoApo%3D' (2024-08-02)
• Updated input 'zls':
    'github:zigtools/zls/eba1489b6ffa6db7f0eaefce6e06d53cd9066f7b?narHash=sha256-GAzXTJUJJIXrAlHkInSDwlnVQPL5BV1Enbj3R4ipGFk%3D' (2024-07-28)
  → 'github:zigtools/zls/312b7dc9710b615488ce78f1f7b47e766939fc36?narHash=sha256-edckr/cu1D4LpTwudjk756I45sHIMdNGJtXWKxOrjH4%3D' (2024-08-03)
• Updated input 'zls/zig-overlay':
    'github:mitchellh/zig-overlay/d9099d32bb395be5ed7eeb12ea0145d476632bd1?narHash=sha256-GLI%2B3yaZn6hHvv6wnYJHGqPfX6G3tXJNrTi7qYV9u94%3D' (2024-07-26)
  → 'github:mitchellh/zig-overlay/4c95bb8378ca31cc06eba0a9ee0c04851221c193?narHash=sha256-bRpvmyAvt4OFbQJlmAURyW1To8nlRjNcQJdbOyI1MLE%3D' (2024-08-02)
 2024-08-03 00:32:37 +00:00
Daylin Morgan
861433055a
add nushell to algiz 2024-08-02 11:23:21 -05:00
Daylin Morgan
d76e97a31f
deduplicate some nixpkgs 2024-08-02 10:26:22 -05:00
Daylin Morgan
097e1a1e35
add user config setting for use in hardcoded paths 2024-08-02 10:26:18 -05:00
14 changed files with 78 additions and 92 deletions
Show stats Expand all files Collapse all files

122
flake.lock
View file

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

10
flake.nix
View file

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

2
hosts/algiz/default.nix
View file

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

4
modules/networking/vpn.nix
View file

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

13
modules/oizys.nix
View file

@ -5,7 +5,7 @@
...
}:
let
inherit (lib) mkEnableOption;
inherit (lib) mkEnableOption mkOption;
in
{
imports = with self.nixosModules; [
@ -39,8 +39,15 @@ in
restic
];
options.oizys.desktop.enable = mkEnableOption "is desktop";
options.oizys.docker.enable = mkEnableOption "enable docker support";
options.oizys = {
user = mkOption {
type = lib.types.string;
default = "daylin";
description = "main user account";
};
desktop.enable = mkEnableOption "is desktop";
docker.enable = mkEnableOption "enable docker support";
};
config = {
networking.hostName = hostName;
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`
extraBackupArgs = [
"--exclude-file /home/daylin/.config/restic/excludes.txt"
"--exclude-file /home/daylin/.conda/environments.txt"
"--exclude-file /home/${config.oizys.user}/.config/restic/excludes.txt"
"--exclude-file /home/${config.oizys.user}/.conda/environments.txt"
"--verbose"
"--one-file-system"
"--tag systemd.timer"

1
todo.md
View file

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