mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-25 00:10:44 -06:00
Compare commits
No commits in common. "861433055a56bb25074b19b9fd9de93f7034be53" and "7922dc210e8bb20f7ce0e6cef711dd385d084ebe" have entirely different histories.
861433055a
...
7922dc210e
14 changed files with 66 additions and 52 deletions
70
flake.lock
70
flake.lock
|
|
@ -35,9 +35,7 @@
|
|||
},
|
||||
"f1multiviewer": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722171639,
|
||||
|
|
@ -336,7 +334,7 @@
|
|||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"systems": "systems",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
|
|
@ -358,7 +356,7 @@
|
|||
},
|
||||
"hyprland-contrib": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720709712,
|
||||
|
|
@ -572,7 +570,7 @@
|
|||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -660,7 +658,7 @@
|
|||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722253092,
|
||||
|
|
@ -678,15 +676,15 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1722185531,
|
||||
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1718530797,
|
||||
"narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
|
||||
"rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -712,7 +710,7 @@
|
|||
"flake-compat": "flake-compat_2",
|
||||
"lib-aggregate": "lib-aggregate",
|
||||
"nix-eval-jobs": "nix-eval-jobs",
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722530466,
|
||||
|
|
@ -729,6 +727,22 @@
|
|||
}
|
||||
},
|
||||
"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=",
|
||||
|
|
@ -744,7 +758,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1722087241,
|
||||
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
|
||||
|
|
@ -760,7 +774,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1722415718,
|
||||
"narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
|
||||
|
|
@ -776,7 +790,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1720781449,
|
||||
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
|
||||
|
|
@ -792,7 +806,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1722421184,
|
||||
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
|
||||
|
|
@ -808,11 +822,25 @@
|
|||
"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"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"pixi-source": "pixi-source"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -880,7 +908,7 @@
|
|||
"lix-module": "lix-module",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||
"pixi": "pixi",
|
||||
"roc": "roc",
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -38,14 +38,8 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
pixi = {
|
||||
url = "github:daylinmorgan/pixi-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
f1multiviewer = {
|
||||
url = "github:daylinmorgan/f1multiviewer-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
pixi.url = "github:daylinmorgan/pixi-flake";
|
||||
f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
|
||||
tsm = {
|
||||
url = "github:daylinmorgan/tsm?dir=nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
"nim"
|
||||
"node" # for docker langservers
|
||||
"python"
|
||||
"nushell"
|
||||
];
|
||||
rune.motd = enabled;
|
||||
|
||||
docker = enabled;
|
||||
backups = enabled;
|
||||
nix-ld = enabled;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
flake,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
config,
|
||||
mkOizysModule,
|
||||
enabled,
|
||||
flake,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
config,
|
||||
enabled,
|
||||
mkDefaultOizysModule,
|
||||
flake,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
mkDefaultOizysModule config "cli" {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
flake,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
config,
|
||||
lib,
|
||||
inputs,
|
||||
flake,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
flake,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ mkOizysModule config "vpn" {
|
|||
services.openvpn.servers = {
|
||||
express-ny = {
|
||||
config = ''
|
||||
config /home/${config.oizys.user}/.config/openvpn/express-ny/config.ovpn
|
||||
auth-user-pass /home/${config.oizys.user}/.config/openvpn/express-ny/credentials
|
||||
config /home/daylin/.config/openvpn/express-ny/config.ovpn
|
||||
auth-user-pass /home/daylin/.config/openvpn/express-ny/credentials
|
||||
'';
|
||||
autoStart = false;
|
||||
updateResolvConf = true;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
enabled,
|
||||
flake,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkEnableOption mkOption;
|
||||
inherit (lib) mkEnableOption;
|
||||
in
|
||||
{
|
||||
imports = with self.nixosModules; [
|
||||
|
|
@ -39,15 +39,8 @@ in
|
|||
restic
|
||||
];
|
||||
|
||||
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";
|
||||
};
|
||||
options.oizys.desktop.enable = mkEnableOption "is desktop";
|
||||
options.oizys.docker.enable = mkEnableOption "enable docker support";
|
||||
config = {
|
||||
networking.hostName = hostName;
|
||||
time.timeZone = "US/Central";
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ mkOizysModule config "backups" {
|
|||
# workaround for now `mkdir ~/.conda && touch ~/.conda/environments.txt`
|
||||
|
||||
extraBackupArgs = [
|
||||
"--exclude-file /home/${config.oizys.user}/.config/restic/excludes.txt"
|
||||
"--exclude-file /home/${config.oizys.user}/.conda/environments.txt"
|
||||
"--exclude-file /home/daylin/.config/restic/excludes.txt"
|
||||
"--exclude-file /home/daylin/.conda/environments.txt"
|
||||
"--verbose"
|
||||
"--one-file-system"
|
||||
"--tag systemd.timer"
|
||||
|
|
|
|||
1
todo.md
1
todo.md
|
|
@ -16,4 +16,3 @@
|
|||
> kernel: ucsi_acpi USBC000:00: error -EINVAL: PPM init failed
|
||||
|
||||
<!-- generated with <3 by daylinmorgan/todo -->
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue