Compare commits

...

3 commits

14 changed files with 52 additions and 66 deletions

View file

@ -35,7 +35,9 @@
},
"f1multiviewer": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1722171639,
@ -334,7 +336,7 @@
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"systems": "systems",
"xdph": "xdph"
},
@ -356,7 +358,7 @@
},
"hyprland-contrib": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1720709712,
@ -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,7 +712,7 @@
"flake-compat": "flake-compat_2",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1722530466,
@ -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": {
@ -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",

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";

View file

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

View file

@ -2,7 +2,7 @@
pkgs,
config,
lib,
flake,
flake,
...
}:
let

View file

@ -3,7 +3,7 @@
config,
mkOizysModule,
enabled,
flake,
flake,
...
}:

View file

@ -3,7 +3,7 @@
config,
enabled,
mkDefaultOizysModule,
flake,
flake,
...
}:
mkDefaultOizysModule config "cli" {

View file

@ -2,7 +2,7 @@
config,
lib,
pkgs,
flake,
flake,
...
}:
let

View file

@ -2,7 +2,7 @@
config,
lib,
inputs,
flake,
flake,
...
}:
let

View file

@ -1,7 +1,7 @@
{
config,
lib,
flake,
flake,
...
}:
let

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;

View file

@ -3,7 +3,7 @@
pkgs,
lib,
enabled,
flake,
flake,
...
}:
let

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";

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"

View file

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