flake.lock

@@ -65,22 +65,6 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -197,24 +181,6 @@
       "inputs": {
         "systems": "systems_7"
       },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_7": {
-      "inputs": {
-        "systems": "systems_8"
-      },
       "locked": {
         "lastModified": 1705309234,
         "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@@ -568,31 +534,6 @@
         "type": "github"
       }
     },
-    "nixgl": {
-      "inputs": {
-        "flake-utils": [
-          "roc",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "roc",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1710868679,
-        "narHash": "sha256-V1o2bCZdeYKP/0zgVp4EN0KUjMItAMk6J7SvCXUI5IU=",
-        "owner": "guibou",
-        "repo": "nixGL",
-        "rev": "d709a8abcde5b01db76ca794280745a43c8662be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "guibou",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -829,30 +770,6 @@
         "type": "github"
       }
     },
-    "roc": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_4",
-        "nixgl": "nixgl",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1718174411,
-        "narHash": "sha256-rEJ/ElZyAHeS6kX8yVoqfM/s+vyCdOUJZbkueujfSzY=",
-        "owner": "roc-lang",
-        "repo": "roc",
-        "rev": "a6f1408b5c97e2f5eb3b62b0b481b6a29c958e83",
-        "type": "github"
-      },
-      "original": {
-        "owner": "roc-lang",
-        "repo": "roc",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "f1multiviewer": "f1multiviewer",
@@ -866,38 +783,12 @@
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "pixi": "pixi",
-        "roc": "roc",
         "stable": "stable",
         "tsm": "tsm",
         "zig2nix": "zig2nix",
         "zls": "zls"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": [
-          "roc",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "roc",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712369449,
-        "narHash": "sha256-tbWug3uXPlSm1j0xD80Y3xbP+otT6gLnQo1e/vQat48=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "41b3b080cc3e4b3a48e933b87fc15a05f1870779",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "stable": {
       "locked": {
         "lastModified": 1717880976,
@@ -1019,21 +910,6 @@
         "type": "github"
       }
     },
-    "systems_8": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1110,8 +986,8 @@
     },
     "zig-overlay": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_7",
+        "flake-utils": "flake-utils_6",
         "nixpkgs": [
           "zls",
           "nixpkgs"
@@ -1133,7 +1009,7 @@
     },
     "zig2nix": {
       "inputs": {
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1154,7 +1030,7 @@
     },
     "zls": {
       "inputs": {
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_5",
         "gitignore": "gitignore",
         "langref": "langref",
         "nixpkgs": [

flake.nix

@@ -28,16 +28,16 @@
 
     zig2nix.url = "github:Cloudef/zig2nix";
     zig2nix.inputs.nixpkgs.follows = "nixpkgs";
+
     zls.url = "github:zigtools/zls";
     zls.inputs.nixpkgs.follows = "nixpkgs";
 
-    roc.url = "github:roc-lang/roc";
-    roc.inputs.nixpkgs.follows = "nixpkgs";
-
     tsm.url = "github:daylinmorgan/tsm?dir=nix";
     tsm.inputs.nixpkgs.follows = "nixpkgs";
+
     hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
     hyprman.inputs.nixpkgs.follows = "nixpkgs";
+
     f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
     pixi.url = "github:daylinmorgan/pixi-flake";
   };

hosts/othalan/default.nix

@@ -15,7 +15,6 @@
       "node"
       "nushell"
       "python"
-      "roc"
       "tex"
       "zig"
     ];

modules/essentials.nix

@@ -7,7 +7,6 @@
 {
   imports = with self.nixosModules; [ git ];
   programs.zsh = enabled;
-  programs.fish = enabled;
   environment.systemPackages = with pkgs; [
     tmux
     unzip

modules/languages/default.nix

@@ -1,20 +1,22 @@
 { lib, ... }:
 let
-  inherit (builtins)
-  filter;
   inherit (lib)
-    isNixFile
     mkOption
     types
     literalExpression
     mdDoc
     ;
-    inherit (lib.filesystem)
-    listFilesRecursive;
 in
 {
-  imports = filter (f: (f != ./default.nix) && (isNixFile f)) (listFilesRecursive ./.);
+  imports = [
-
+    ./misc.nix
+    ./nim.nix
+    ./node.nix
+    ./nushell.nix
+    ./python.nix
+    ./tex.nix
+    ./zig.nix
+  ];
   options.oizys.languages = mkOption {
     type = with types; (listOf str);
     description = mdDoc ''

modules/languages/roc.nix

@@ -1,20 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-let
-  inherit (lib) mkIfIn;
-  cfg = config.oizys.languages;
-  rocPkgs = inputs.roc.packages.${pkgs.system};
-in
-{
-  config = mkIfIn "roc" cfg {
-    environment.systemPackages = with rocPkgs; [
-      full
-      lang-server
-    ];
-  };
-}

modules/nix.nix

@@ -32,11 +32,6 @@
   # nix-index didn't like this being enabled?
   programs.command-not-found.enable = false;
 
-  # I'm getting errors related to a non-existent nix-index?
-  programs.nix-index.enableZshIntegration = false;
-  programs.nix-index.enableBashIntegration =false;
-  programs.nix-index.enableFishIntegration = false;
-
   nix.settings = {
     trusted-users = [ "@wheel" ];
     accept-flake-config = true;

todo.md

@@ -1,20 +1,15 @@
 # oizys todo's
 
-
-## nix expr
-
-- [ ] find out why pixi on GHA is different from local (possibly from the fetch git step?)
-
-## software
-
 - [ ] lid closed does not engage hyprlock?
-- [ ] include langservers for enabled languages?
 
-## hardware
+- [ ] go back to latest kernel when VirtualBox Upgrade is merged
+  - [PR #311362](https://github.com/NixOS/nixpkgs/pull/311362)
 
 - [ ] monitor the presence of these kernel messages on `othalan`,
       possibly resolved with latest kernel, see above
   > kernel: ucsi_acpi USBC000:00: possible UCSI driver bug 2
   > kernel: ucsi_acpi USBC000:00: error -EINVAL: PPM init failed
 
+- [ ] find out why pixi on GHA is different from local (possibly from the fetch git step?)
+
 <!-- generated with <3 by daylinmorgan/todo -->