Compare commits

..

1 commit

Author SHA1 Message Date
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

View file

@ -35,9 +35,7 @@
},
"f1multiviewer": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1722171639,
@ -336,16 +334,16 @@
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"systems": "systems",
"xdph": "xdph"
},
"locked": {
"lastModified": 1722633380,
"narHash": "sha256-rVyikfYJjkSB7990fLwABjrhVM4UOmci7rxYpRT/6dI=",
"lastModified": 1722551504,
"narHash": "sha256-/N8voFoU8ALTK8C1esM6MM+lj9zZGCG4lbvH0mNBQUE=",
"ref": "refs/heads/main",
"rev": "4141e6755022edc19cd37cd7ad077a93b3bae5bd",
"revCount": 5045,
"rev": "09bb5658b7fa6c0dc4e2744797e51ad4dd25af42",
"revCount": 5041,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland/"
@ -358,14 +356,14 @@
},
"hyprland-contrib": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1722636442,
"narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=",
"lastModified": 1720709712,
"narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6",
"rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade",
"type": "github"
},
"original": {
@ -534,11 +532,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1722617984,
"narHash": "sha256-fA9PkQ8gKHSezxWyZeQhq/SMe1t6xw7KKFroTT5g9UQ=",
"rev": "32ca194ebfa3610c8099e5713ee7d5cbb8fb125c",
"lastModified": 1722551136,
"narHash": "sha256-40BiZ6tzjnhrVAdVboAqSRN0IYKcXFKuTmeacTDNLJU=",
"rev": "8b69d1336804b08d01b6ec2a49709062b6c96d2b",
"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": {
"type": "tarball",
@ -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,14 +710,14 @@
"flake-compat": "flake-compat_2",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1722615008,
"narHash": "sha256-wyCU/X6LhNfJgWAJ6fmYdIZBpHeEBJOUiGOR0dF0Ln0=",
"lastModified": 1722530466,
"narHash": "sha256-9YvLtuLAA+LVmfrvlOsynHkS0DRCYnHFEp72NfXFVnc=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "81312ea66c72ae96a7ecb07a2480c3702636e687",
"rev": "0bbe640011f1350933109f5450b15f9bd1fb5e9f",
"type": "github"
},
"original": {
@ -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": {
@ -857,11 +885,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1722644251,
"narHash": "sha256-oyJYxs9W6MgWKQF3GfAPZeXKe9vqnmcWZC2LgiMEan0=",
"lastModified": 1722523856,
"narHash": "sha256-hjdIYAuQMWLtlxxj9GpgnfFgmGJhxDDYXnBvEVeNXG8=",
"owner": "roc-lang",
"repo": "roc",
"rev": "08019951beb71fdd79c735907e3fd03ed5f13a4f",
"rev": "790eabd933e13b0836c6ec243c77f873a5956966",
"type": "github"
},
"original": {
@ -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",
@ -1135,11 +1163,11 @@
]
},
"locked": {
"lastModified": 1722600600,
"narHash": "sha256-bRpvmyAvt4OFbQJlmAURyW1To8nlRjNcQJdbOyI1MLE=",
"lastModified": 1721995783,
"narHash": "sha256-GLI+3yaZn6hHvv6wnYJHGqPfX6G3tXJNrTi7qYV9u94=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "4c95bb8378ca31cc06eba0a9ee0c04851221c193",
"rev": "d9099d32bb395be5ed7eeb12ea0145d476632bd1",
"type": "github"
},
"original": {
@ -1156,11 +1184,11 @@
]
},
"locked": {
"lastModified": 1722561698,
"narHash": "sha256-IlBYZ4/eIKJ8UE2quJYzH9bExfP0csUXtKAq42KoApo=",
"lastModified": 1722475688,
"narHash": "sha256-b9q/NoJ3I5LtXVvxxjxNRxDEVMd+1daVldCyAYH7aCU=",
"owner": "Cloudef",
"repo": "zig2nix",
"rev": "d254c2968b28823edddbddf527064774de6598fa",
"rev": "b368a9170c6d6727375d2f43baf2565280e86019",
"type": "github"
},
"original": {
@ -1180,11 +1208,11 @@
"zig-overlay": "zig-overlay"
},
"locked": {
"lastModified": 1722643784,
"narHash": "sha256-edckr/cu1D4LpTwudjk756I45sHIMdNGJtXWKxOrjH4=",
"lastModified": 1722209386,
"narHash": "sha256-GAzXTJUJJIXrAlHkInSDwlnVQPL5BV1Enbj3R4ipGFk=",
"owner": "zigtools",
"repo": "zls",
"rev": "312b7dc9710b615488ce78f1f7b47e766939fc36",
"rev": "eba1489b6ffa6db7f0eaefce6e06d53cd9066f7b",
"type": "github"
},
"original": {

View file

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

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/${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;

View file

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

View file

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

View file

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

View file

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