daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-29 11:30:43 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:dfb825e72d465b4be9c590394981f75202e7cb9f
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:b33633cd3c54b7653810e921206d6f6377ea3847
Branches Tags
daylin:flake-lock
daylin:main

3 commits
dfb825e72d ... b33633cd3c

Author SHA1 Message Date
Daylin Morgan
b33633cd3c
deadnix 2024-03-13 10:42:36 -05:00
Daylin Morgan
6ad1950f5e
don't echo needlessly 2024-03-13 10:37:48 -05:00
Daylin Morgan
c26350a67f
revert back to nixpkgs-unstable 2024-03-13 10:32:53 -05:00
8 changed files with 11 additions and 21 deletions
Show stats Expand all files Collapse all files

12
flake.lock
View file

@ -285,17 +285,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1710254816, "lastModified": 1710313540,
"narHash": "sha256-kBLnEm464FvFdyqkqDn2FdhYWqMjoM+62OwLD+d4NDE=", "narHash": "sha256-HtTTpGe0azsEJVaT9RvbGFGB4idUneraLiUTxFb3ABM=",
"owner": "wegank", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51d879e6533624bd124a60adf8aa3c304a7f9523", "rev": "4008381882569ab4773f2ba0d7b7bbde8f665672",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "wegank", "owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51d879e6533624bd124a60adf8aa3c304a7f9523",
"type": "github" "type": "github"
} }
}, },

7
flake.nix
View file

@ -8,12 +8,7 @@
.oizysFlake {}; .oizysFlake {};
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
# nixpkgs.url = "github:nixos/nixpkgs/032162631dbfefa15898fc5ddd8daef484fd6d53";
# nixpkgs.url = "github:nixos/nixpkgs/d5decf6e964b50425195ea8fd831931bb10b064f";
# nixpkgs.url = "github:nixos/nixpkgs/bfa8b30043892dc2b660d403faa159bab7b65898";
nixpkgs.url = "github:wegank/nixpkgs/51d879e6533624bd124a60adf8aa3c304a7f9523";
stable.url = "github:nixos/nixpkgs/nixos-23.11"; stable.url = "github:nixos/nixpkgs/nixos-23.11";
hyprland.url = "github:hyprwm/Hyprland/main"; hyprland.url = "github:hyprwm/Hyprland/main";

2
lib/default.nix
View file

@ -6,7 +6,7 @@
lib = nixpkgs.lib.extend (import ./extended.nix); lib = nixpkgs.lib.extend (import ./extended.nix);
inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs; inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs;
inherit (lib) hasSuffix nixosSystem genAttrs isNixFile; inherit (lib) nixosSystem genAttrs isNixFile;
inherit (lib.filesystem) listFilesRecursive; inherit (lib.filesystem) listFilesRecursive;
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];

2
modules/languages/default.nix
View file

@ -1,11 +1,9 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: let }: let
inherit (lib) mkOption types literalExpression mdDoc; inherit (lib) mkOption types literalExpression mdDoc;
cfg = config.oizys.languages;
in { in {
imports = [./nim.nix ./tex.nix ./misc.nix ./node.nix ./python.nix]; imports = [./nim.nix ./tex.nix ./misc.nix ./node.nix ./python.nix];
options.oizys.languages = mkOption { options.oizys.languages = mkOption {

2
modules/languages/tex.nix
View file

@ -4,7 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (lib) mkIf mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
in { in {
config = mkIfIn "tex" cfg { config = mkIfIn "tex" cfg {

1
modules/virtualization/virtualbox.nix
View file

@ -1,7 +1,6 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: let }: let
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;

4
oizys/oizys.nim
View file

@ -161,11 +161,9 @@ when isMainModule:
for kind, key, val in p.getopt(): for kind, key, val in p.getopt():
case kind case kind
of cmdArgument: of cmdArgument:
echo key
subcmd = key subcmd = key
of cmdLongOption, cmdShortOption: of cmdLongOption, cmdShortOption:
if key == "": if key == "": break
break
parseFlag c, kind, key, val parseFlag c, kind, key, val
of cmdEnd: of cmdEnd:
discard discard

2
overlays/default.nix
View file

@ -12,7 +12,7 @@
in { in {
nixpkgs.overlays = defaultOverlays ++ [ nixpkgs.overlays = defaultOverlays ++ [
( (
final: prev: { final: _prev: {
stable = import inputs.stable { system = final.system; stable = import inputs.stable { system = final.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };