flake.lock: Update

Flake lock file updates:

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/f801d15947e151a8129ff82c99abb208e4767322' (2024-02-29)
  → 'github:hyprwm/Hyprland/2a08f2ba84ead47bd13aae5797d0d71b2e11b612' (2024-03-03)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/16884001b26e6955ff4b88b4dfe4c8986e20f153' (2024-01-25)
  → 'github:hyprwm/contrib/2d4ece4a008feefddc194bde785b1d39f987b5a7' (2024-03-02)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ebe6e807793e7c9cc59cf81225fdee1a03413811' (2024-02-29)
  → 'github:nixos/nixpkgs/458b097d81f90275b3fdf03796f0563844926708' (2024-03-02)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/80c30658b9c38af1fac51eb3fc6f423a1f0ae36d' (2024-02-29)
  → 'github:nix-community/nixpkgs-wayland/ea91a1d89e6f237d2369ad0de846785965cbef0b' (2024-03-02)
• Updated input 'pinix':
    'github:remi-dupre/pinix/83d58d64ebbb68532a0c23646ecd987d95dc0581' (2024-02-18)
  → 'github:remi-dupre/pinix/6f7dc0fccb0e48176629d061b07576d092a5d09c' (2024-03-02)

flake.lock

@@ -18,7 +18,6 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -42,11 +41,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1709126324,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -60,7 +59,6 @@
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ],
         "systems": "systems",
@@ -68,11 +66,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1708723504,
+        "lastModified": 1709425896,
-        "narHash": "sha256-m6kU6+bfUpwPPdo7+tglg65OXkQ3Q5cyT6ojCue3uaw=",
+        "narHash": "sha256-r/Tsr+BfgaiJIWTwWrrxHzTmNGEIi8HzYDGO3kFJmx8=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "bdbd8d965d4f1a13129c72505bb556445ce0bc90",
+        "rev": "2a08f2ba84ead47bd13aae5797d0d71b2e11b612",
         "type": "github"
       },
       "original": {
@@ -85,16 +83,15 @@
     "hyprland-contrib": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1706198673,
+        "lastModified": 1709391291,
-        "narHash": "sha256-bHlxFd+3QHy6eXtTzzhwVNcyxBSOxTvBuJGNUzI4C4M=",
+        "narHash": "sha256-NJwAgXRKLVuO3YLkGxXIanLvTKN+cJsYwbLoWOa7ODk=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "16884001b26e6955ff4b88b4dfe4c8986e20f153",
+        "rev": "2d4ece4a008feefddc194bde785b1d39f987b5a7",
         "type": "github"
       },
       "original": {
@@ -106,12 +103,10 @@
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "inputs",
           "hyprland",
           "systems"
         ]
@@ -133,17 +128,20 @@
     "hyprlang": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "hyprland",
           "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1708005943,
+        "lastModified": 1708787654,
-        "narHash": "sha256-9TT3xk++LI5/SPYgjYX34xZ4ebR93c1uerIq+SE/ues=",
+        "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "aeb3e012adc7b3235335c540b214b82267c2b983",
+        "rev": "0fce791ba2334aca183f2ed42399518947550d0d",
         "type": "github"
       },
       "original": {
@@ -152,66 +150,17 @@
         "type": "github"
       }
     },
-    "hyprlang_2": {
-      "inputs": {
-        "nixpkgs": [
-          "inputs",
-          "hyprland",
-          "xdph",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1704287638,
-        "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "inputs": {
-      "inputs": {
-        "hyprland": "hyprland",
-        "hyprland-contrib": "hyprland-contrib",
-        "nix-eval-jobs": "nix-eval-jobs",
-        "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-wayland": "nixpkgs-wayland",
-        "pinix": "pinix"
-      },
-      "locked": {
-        "dir": "inputs",
-        "lastModified": 1708630766,
-        "narHash": "sha256-JSISiI8tWuOxh3RHPJyILkXRIh7tIHkrSOfZQ9zuGd8=",
-        "owner": "daylinmorgan",
-        "repo": "oizys",
-        "rev": "8df8d8ffc7ab0b23e9287b0a74f952ec3337b250",
-        "type": "github"
-      },
-      "original": {
-        "dir": "inputs",
-        "owner": "daylinmorgan",
-        "repo": "oizys",
-        "type": "github"
-      }
-    },
     "lib-aggregate": {
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1708258113,
+        "lastModified": 1709208631,
-        "narHash": "sha256-SYqkbLHSe4UxgcNwUHrMPnRmX/oJFzRILrpyn5dsJVE=",
+        "narHash": "sha256-n+SCii/GQR3zjaZzjhGAjrQQlF+xjaGEjWdpDb4wJ3U=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "42e4c0c8b04cecec07e796ce8efcb5378e93a319",
+        "rev": "1f03ac8dc3a54f68f55d36b5e7fc65afc302a3d7",
         "type": "github"
       },
       "original": {
@@ -225,7 +174,6 @@
         "flake-parts": "flake-parts",
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ],
         "treefmt-nix": "treefmt-nix"
@@ -247,7 +195,6 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -269,16 +216,15 @@
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1708225687,
+        "lastModified": 1708830466,
-        "narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=",
+        "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127",
+        "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
         "type": "github"
       },
       "original": {
@@ -289,11 +235,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708655239,
+        "lastModified": 1709356872,
-        "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
+        "narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a",
+        "rev": "458b097d81f90275b3fdf03796f0563844926708",
         "type": "github"
       },
       "original": {
@@ -305,11 +251,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1708217146,
+        "lastModified": 1708821942,
-        "narHash": "sha256-nGfEv7k78slqIR5E0zzWSx214d/4/ZPKDkObLJqVLVw=",
+        "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "e623008d8a46517470e6365505f1a3ce171fa46a",
+        "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b",
         "type": "github"
       },
       "original": {
@@ -323,20 +269,18 @@
         "flake-compat": "flake-compat",
         "lib-aggregate": "lib-aggregate",
         "nix-eval-jobs": [
-          "inputs",
           "nix-eval-jobs"
         ],
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1708457584,
+        "lastModified": 1709421307,
-        "narHash": "sha256-bcu7zHORoF+xtkmiRZR/Ipu9ZMR8CBg0m/gQmDEYcW8=",
+        "narHash": "sha256-8jG7XToXTQHYWBaaNRoALxcEPoE+yE5dKHvb2gErjOg=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "119087e7a51a320b699d97463f837b75dd5768fc",
+        "rev": "ea91a1d89e6f237d2369ad0de846785965cbef0b",
         "type": "github"
       },
       "original": {
@@ -348,16 +292,15 @@
     "pinix": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1708267018,
+        "lastModified": 1709390347,
-        "narHash": "sha256-/LA/IKbO7qgd5s/dWckcY2RQwyVZxvLH5gHzDzHXdO8=",
+        "narHash": "sha256-C7RDQ1xPktZGf8eSDUeZ2ZKetHtM2VJA0C10z0d8tkw=",
         "owner": "remi-dupre",
         "repo": "pinix",
-        "rev": "83d58d64ebbb68532a0c23646ecd987d95dc0581",
+        "rev": "6f7dc0fccb0e48176629d061b07576d092a5d09c",
         "type": "github"
       },
       "original": {
@@ -368,7 +311,13 @@
     },
     "root": {
       "inputs": {
-        "inputs": "inputs"
+        "hyprland": "hyprland",
+        "hyprland-contrib": "hyprland-contrib",
+        "nix-eval-jobs": "nix-eval-jobs",
+        "nix-index-database": "nix-index-database",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-wayland": "nixpkgs-wayland",
+        "pinix": "pinix"
       }
     },
     "systems": {
@@ -404,7 +353,6 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
-          "inputs",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -445,28 +393,28 @@
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
-          "inputs",
           "hyprland",
           "hyprland-protocols"
         ],
-        "hyprlang": "hyprlang_2",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
         "nixpkgs": [
-          "inputs",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "inputs",
           "hyprland",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1706521509,
+        "lastModified": 1708696469,
-        "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=",
+        "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8",
+        "rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,13 +1,49 @@
 {
   description = "nix begat oizys";
-  inputs.inputs.url = "github:daylinmorgan/oizys?dir=inputs";
+  outputs = inputs @ {self, ...}:
-  outputs = {
-    inputs,
-    self,
-  }:
     (import ./lib {
-      inherit (inputs) inputs;
+      inherit inputs;
       inherit self;
     })
     .oizysFlake {};
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+
+    hyprland.url = "github:hyprwm/Hyprland/main";
+    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+
+    hyprland-contrib.url = "github:hyprwm/contrib";
+    hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
+
+    nixpkgs-wayland = {
+      url = "github:nix-community/nixpkgs-wayland";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nix-eval-jobs.follows = "nix-eval-jobs";
+    };
+
+    nix-eval-jobs.url = "github:nix-community/nix-eval-jobs";
+    nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs";
+
+    pinix.url = "github:remi-dupre/pinix";
+    pinix.inputs.nixpkgs.follows = "nixpkgs";
+
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  nixConfig = {
+    extra-substituters = [
+      "https://hyprland.cachix.org"
+      "https://nixpkgs-wayland.cachix.org"
+      "https://daylin.cachix.org"
+      "https://cache.garnix.io"
+    ];
+    extra-trusted-public-keys = [
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
+      "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
+      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+    ];
+  };
 }

hosts/algiz/default.nix

@@ -8,11 +8,10 @@
     restic
   ];
 
-  languages = {
+  oizys.languages = [
-    nim = true;
+    "nim"
-    python = true;
+    "python"
-  };
+  ];
-  cli.enable = true;
 
   environment.systemPackages = with pkgs; [
     rclone

hosts/algiz/system.nix

@@ -1,5 +1,5 @@
-{mkRune, ...}: {
+{lib, ...}: {
-  users.motd = mkRune {
+  users.motd = lib.mkRune {
     number = "6";
     rune = "algiz";
   };

hosts/mannaz/default.nix

@@ -3,8 +3,8 @@
     nix-ld
   ];
 
-  desktop.enable = true;
+  oizys.desktop.enable = true;
-  cli.enable = true;
+
   # Enable the X11 windowing system.
   services.xserver = {
     enable = true;

hosts/mannaz/system.nix

@@ -1,10 +1,10 @@
 {
   config,
   pkgs,
-  mkRune,
+  lib,
   ...
 }: {
-  users.motd = mkRune {
+  users.motd = lib.mkRune {
     number = "2";
     rune = "mannaz";
   };

hosts/othalan/default.nix

@@ -10,16 +10,18 @@
     docker
   ];
 
-  cli.enable = true;
+  oizys = {
     desktop.enable = true;
-
+    vpn.enable = true;
-  languages = {
+    languages = [
-    misc = true;
+      "misc"
-    python = true;
+      "python"
-    nim = true;
+      "nim"
-    tex = true;
+      "tex"
-    node = true;
+      "node"
+    ];
   };
+  vivaldi.enable = true;
 
   environment.systemPackages = with pkgs; [
     zk
@@ -29,8 +31,6 @@
 
   programs.hyprland.enable = true;
 
-  services.vpn.enable = true;
-
   services.restic.backups.gdrive = {
     user = "daylin";
     repository = "rclone:g:archives/othalan";

hosts/othalan/system.nix

@@ -1,6 +1,6 @@
 {
   pkgs,
-  mkRune,
+  lib,
   ...
 }: {
   networking.networkmanager.enable = true;
@@ -27,7 +27,7 @@
     pamixer
   ];
 
-  services.getty.greetingLine = mkRune {
+  services.getty.greetingLine = lib.mkRune {
     rune = "othalan";
     runeKind = "ascii";
   };

inputs/flake.nix

@@ -1,42 +0,0 @@
-{
-  description = "oizys inputs";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-
-    hyprland.url = "github:hyprwm/Hyprland/main";
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
-
-    hyprland-contrib.url = "github:hyprwm/contrib";
-    hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
-
-    nixpkgs-wayland = {
-      url = "github:nix-community/nixpkgs-wayland";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nix-eval-jobs.follows = "nix-eval-jobs";
-    };
-
-    nix-eval-jobs.url = "github:nix-community/nix-eval-jobs";
-    nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs";
-
-    pinix.url = "github:remi-dupre/pinix";
-    pinix.inputs.nixpkgs.follows = "nixpkgs";
-
-    nix-index-database.url = "github:nix-community/nix-index-database";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  nixConfig = {
-    extra-substituters = [
-      "https://hyprland.cachix.org"
-      "https://nixpkgs-wayland.cachix.org"
-      "https://daylin.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
-      "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
-    ];
-  };
-  outputs = _: {};
-}

lib/default.nix

@@ -3,23 +3,17 @@
   self,
 }: let
   inherit (inputs) nixpkgs;
+  lib = nixpkgs.lib.extend (import ./extended.nix);
+
   inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs;
-  inherit (nixpkgs.lib) hasSuffix nixosSystem genAttrs;
+  inherit (lib) hasSuffix nixosSystem genAttrs isNixFile;
-  inherit (nixpkgs.lib.filesystem) listFilesRecursive;
+  inherit (lib.filesystem) listFilesRecursive;
 
   #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
-  supportedSystems = ["x86_64-linux" ];
+  supportedSystems = ["x86_64-linux"];
-  runes = import ../modules/runes;
 in rec {
   forAllSystems = f: genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system});
-  mkRune = {
-    rune,
-    number ? "6",
-    runeKind ? "braille",
-  }:
-    "[1;3${number}m\n" + runes.${rune}.${runeKind} + "\n";
 
-  isNixFile = path: hasSuffix ".nix" path;
   buildOizys = _:
     forAllSystems (
       pkgs: let
@@ -42,10 +36,9 @@ in rec {
         isNixFile
         (listFilesRecursive (../. + "/hosts/${hostname}"));
 
-      specialArgs = {inherit inputs mkRune self;};
+      specialArgs = {inherit inputs lib self;};
     };
   mapHosts = dir: mapAttrs (name: _: mkSystem name) (readDir dir);
-  buildHosts = _: mapHosts ../hosts;
 
   findModules = _: listToAttrs (findModulesList ../modules);
   # https://github.com/balsoft/nixos-config/blob/73cc2c3a8bb62a9c3980a16ae70b2e97af6e1abd/flake.nix#L109-L120
@@ -72,7 +65,7 @@ in rec {
 
   oizysFlake = _: {
     nixosModules = findModules {};
-    nixosConfigurations = buildHosts {};
+    nixosConfigurations = mapHosts ../hosts;
     packages = buildOizys {};
     formatter = forAllSystems (pkgs: pkgs.alejandra);
   };

lib/extended.nix

@@ -0,0 +1,14 @@
+final: prev: let
+  inherit (final) hasSuffix;
+  runes = import ../modules/runes;
+in {
+
+  isNixFile = path: hasSuffix ".nix" path;
+  mkIfIn = name: list: prev.mkIf (builtins.elem name list);
+  mkRune = {
+    rune,
+    number ? "6",
+    runeKind ? "braille",
+  }:
+    "[1;3${number}m\n" + runes.${rune}.${runeKind} + "\n";
+}

modules/common.nix

@@ -20,15 +20,13 @@
     hyprland
 
     gui
-    vscode
 
-    # langs
+    languages
-    python
+
-    misc
+    # programs
-    node
+    vivaldi
-    tex
+    vscode
-    nim
   ];
 
-  options.desktop.enable = lib.mkEnableOption "is desktop";
+  options.oizys.desktop.enable = lib.mkEnableOption "is desktop";
 }

modules/desktop/fonts.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.desktop;
+  cfg = config.oizys.desktop;
 in {
   config = mkIf cfg.enable {
     fonts.fontconfig.enable = true;

modules/desktop/gui.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.desktop;
+  cfg = config.oizys.desktop;
 in {
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
@@ -19,13 +19,6 @@ in {
 
       libreoffice-qt
       hunspell # spell check for libreoffice
-
-      (vivaldi.override {
-        commandLineArgs = [
-          "--force-dark-mode"
-        ];
-        proprietaryCodecs = true;
-      })
     ];
   };
 }

modules/desktop/window-managers/hyprland.nix

@@ -30,7 +30,7 @@ in {
       lock
       brightnessctl
       udiskie
-      eww-wayland
+      eww
 
       # notifications
       libnotify
@@ -44,6 +44,7 @@ in {
 
       catppuccin-cursors.mochaDark
       hyprpaper
+      swww
     ];
 
     nixpkgs.overlays = [

modules/development/cli.nix

@@ -4,10 +4,15 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkOption mkIf types;
-  cfg = config.cli;
+  cfg = config.oizys.cli;
 in {
-  options.cli.enable = mkEnableOption "cli";
+  options.oizys.cli.enable = mkOption {
+    default = true;
+    description = "Whether to enable cli.";
+    type = types.bool;
+  };
+
   config = mkIf cfg.enable {
     programs.direnv.enable = true;
     environment.sessionVariables = {

modules/editors/vscode.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.desktop;
+  cfg = config.oizys.desktop;
 in {
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

modules/langs/misc.nix

@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  cfg = config.languages;
-in {
-  options.languages.misc = mkEnableOption "go + rustup";
-  config = mkIf cfg.misc {
-    environment.systemPackages = with pkgs; [
-      go
-      rustup
-    ];
-  };
-}

modules/languages/default.nix

@@ -0,0 +1,24 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkOption types literalExpression mdDoc;
+  cfg = config.oizys.languages;
+in {
+  imports = [./nim.nix ./tex.nix ./misc.nix ./node.nix ./python.nix];
+  options.oizys.languages = mkOption {
+    type = with types; (listOf str);
+    description = lib.mdDoc ''
+      List of programming languages to enable.
+    '';
+    default = [];
+    example = literalExpression ''
+      [
+        "python"
+        "nim"
+      ]
+    '';
+  };
+}

modules/languages/misc.nix

@@ -0,0 +1,16 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIfIn;
+  cfg = config.oizys.languages;
+in {
+  config = mkIfIn "misc" cfg {
+    environment.systemPackages = with pkgs; [
+      go
+      rustup
+    ];
+  };
+}

modules/languages/nim.nix

@@ -4,11 +4,10 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkIfIn;
-  cfg = config.languages;
+  cfg = config.oizys.languages;
 in {
-  options.languages.nim = mkEnableOption "nim";
+  config = mkIfIn "nim" cfg {
-  config = mkIf cfg.nim {
     environment.systemPackages = with pkgs; [
       nim
 

modules/languages/node.nix

@@ -4,11 +4,10 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkIfIn;
-  cfg = config.languages;
+  cfg = config.oizys.languages;
 in {
-  options.languages.node = mkEnableOption "node";
+  config = mkIfIn "node" cfg {
-  config = mkIf cfg.node {
     environment.systemPackages = with pkgs; [
       nodejs
       nodePackages.pnpm

modules/languages/python.nix

@@ -4,11 +4,10 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkIfIn;
-  cfg = config.languages;
+  cfg = config.oizys.languages;
 in {
-  options.languages.python = mkEnableOption "python";
+  config = mkIfIn "python" cfg {
-  config = mkIf cfg.python {
     environment.systemPackages = let
       python = pkgs.python3.withPackages (ps: with ps; [pip]);
     in
@@ -24,8 +23,9 @@ in {
           exec ${python}/bin/python "$@"
         '')
 
-        # (python3.withPackages (ps: with ps; [pip]))
+        (python3.withPackages (ps: with ps; [pip]))
         micromamba
+        pixi
       ];
   };
 }

modules/languages/tex.nix

@@ -4,11 +4,10 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkIf mkIfIn;
-  cfg = config.languages;
+  cfg = config.oizys.languages;
 in {
-  options.languages.tex = mkEnableOption "tex";
+  config = mkIfIn "tex" cfg {
-  config = mkIf cfg.tex {
     environment.systemPackages = with pkgs; [
       texlive.combined.scheme-full
     ];

modules/networking/vpn.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.services.vpn;
+  cfg = config.oizys.vpn;
 in {
-  options.services.vpn.enable = mkEnableOption ''
+  options.oizys.vpn.enable = mkEnableOption ''
-    use openconnect vpn
+    Whether to enable openconnect for vpn connection.
   '';
 
   config = mkIf cfg.enable {

modules/nix.nix

@@ -37,11 +37,11 @@
     trusted-users = ["@wheel"];
     accept-flake-config = true;
 
-    substituters = [
+    # substituters = [
-      "https://daylin.cachix.org"
+    #   "https://daylin.cachix.org"
-    ];
+    # ];
-    trusted-public-keys = [
+    # trusted-public-keys = [
-      "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
+    #   "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
-    ];
+    # ];
   };
 }

modules/programs/vivaldi.nix

@@ -0,0 +1,33 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.vivaldi;
+in {
+  options.vivaldi.enable = mkEnableOption "enable vivaldi + extensions";
+  config = mkIf cfg.enable {
+    programs.chromium = {
+      enable = true;
+
+      extensions = [
+        "nngceckbapebfimnlniiiahkandclblb" # bitwarden
+        "gfbliohnnapiefjpjlpjnehglfpaknnc" # surfingkeys
+        "pbmlfaiicoikhdbjagjbglnbfcbcojpj" # simplify gmail
+        "oemmndcbldboiebfnladdacbdfmadadm" # pdf viewer
+        "clngdbkpkpeebahjckkjfobafhncgmne" # stylus
+      ];
+    };
+
+    environment.systemPackages = with pkgs; [
+      (vivaldi.override {
+        commandLineArgs = [
+          "--force-dark-mode"
+        ];
+        proprietaryCodecs = true;
+      })
+    ];
+  };
+}

oizys/oizys.nim

@@ -1,9 +1,8 @@
-import std/[os, osproc, tables, times, strutils, terminal]
+import std/[os, osproc, parseopt, times, strutils, terminal]
 from std/nativesockets import getHostname
 
 let summaryFile = getEnv("GITHUB_STEP_SUMMARY")
 
-
 proc info(args: varargs[string, `$`]) =
   stdout.styledWriteLine(
     fgCyan, "oizys", resetStyle, "|",
@@ -18,15 +17,18 @@ proc error(args: varargs[string, `$`]) =
     args.join("")
   )
 
-proc execQuit(cmd: string) =
-  quit (execCmd cmd)
-
 type
   OizysContext = object
     flake, host: string
+    extraArgs: seq[string]
     cache = "daylin"
     pinix: bool = true
 
+proc execQuit(c: OizysContext, args: varargs[string]) =
+  let cmd = (@args & c.extraArgs).join(" ")
+  info "exec: ", cmd
+  quit (execCmd cmd)
+
 proc newCtx(): OizysContext =
   result = OizysContext()
   result.flake = getEnv("FLAKE_PATH", getEnv("HOME") / "oizys")
@@ -48,11 +50,11 @@ proc systemFlakePath(c: OizysContext): string =
 
 proc build(c: OizysContext) =
   ## build nixos
-  execQuit c.cmd & " build " & c.systemFlakePath
+  execQuit c, c.cmd, "build", c.systemFlakePath
 
 proc dry(c: OizysContext) =
   ## poor man's nix flake check
-  execQuit c.cmd & " build " & c.systemFlakePath & " --dry-run"
+  execQuit c, c.cmd, "build", c.systemFlakePath, "--dry-run"
 
 proc cache(c: OizysContext) =
   let start = now()
@@ -77,7 +79,7 @@ proc cache(c: OizysContext) =
 
 proc nixosRebuild(c: OizysContext, subcmd: string) =
   let cmd = if c.pinix: "pixos-rebuild" else: "nixos-rebuild"
-  execQuit "sudo " & cmd & " " & subcmd & " " & " --flake " & c.flake
+  execQuit c, "sudo", cmd, subcmd, "--flake", c.flake
 
 proc boot(c: OizysContext) =
   ## nixos rebuild boot
@@ -119,7 +121,7 @@ proc runCmd(c: OizysContext, cmd: string) =
       quit 1
 
 
-proc parseFlag(c: var OizysContext, key, val: string) =
+proc parseFlag(c: var OizysContext, kind: CmdLineKind, key, val: string) =
   case key:
     of "h", "help":
       echo usage; quit 0
@@ -129,23 +131,31 @@ proc parseFlag(c: var OizysContext, key, val: string) =
       c.flake = val
     of "no-pinix":
       c.pinix = false
+    else:
+      c.extraArgs.add (if kind == cmdLongOption: "--" else: "-") & key
+      c.extraArgs.add val
 
 when isMainModule:
-  import std/parseopt
   var
     c = newCtx()
     subcmd: string
-  for kind, key, val in getopt(longNoVal = @["no-nom"]):
+  var p = initOptParser(
+    longNoVal = @["no-pinix", "help", ""], shortNoVal = {'h'}
+  )
+  for kind, key, val in p.getopt():
     case kind
     of cmdArgument:
+      echo key
       subcmd = key
     of cmdLongOption, cmdShortOption:
-      parseFlag c, key, val
+      if key == "":
+        break
+      parseFlag c, kind, key, val
     of cmdEnd:
       discard
   if subcmd == "":
     echo "please specify a command"
     echo usage; quit 1
-
+  c.extraArgs = p.remainingArgs
   check c
   runCmd c, subcmd

todo.md

@@ -1,5 +1,6 @@
 # oizys todo's
 
-<!-- nothing :) -->
+- [ ] add graceful fall back for oizys-cli if pinix isn't installed system-wide yet
+- [ ] trackdown wezterm bug... (try building from flake?)
 
 <!-- generated with <3 by daylinmorgan/todo -->