lib/default.nix

@@ -10,7 +10,6 @@ let
   #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
   supportedSystems = [ "x86_64-linux" ];
   forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; }));
-
   inheritFlakePkgs =
     pkgs: flakes:
     listToAttrs (

modules/desktop/gui.nix

@@ -13,10 +13,11 @@ in
     environment.systemPackages =
       [ (flake.pkg "f1multiviewer") ]
       ++ (with pkgs; [
-        pcmanfm
         wezterm
         alacritty
 
+        xfce.thunar
+
         inkscape
         gimp
 

modules/desktop/window-managers/hyprland.nix

@@ -62,12 +62,11 @@ mkOizysModule config "hyprland" {
   ];
   # using the below to autostart Hyprland
   # broke my keybindings that were working before  
-
-  services.getty = {
-    extraArgs = [ "--skip-login" ];
-    loginOptions = "-p -- ${config.oizys.user}";
-  };
-
+  # services.getty = {
+  #   extraArgs = [ "--skip-login" ];
+  #   loginOptions = "-p -- ${config.oizys.user}";
+  # };
+  #
   # environment.etc =
   #   let
   #     activate-snippet = ''

modules/networking/vpn.nix

@@ -21,7 +21,7 @@ mkOizysModule config "vpn" {
     #   updateResolvConf = true;
     # };
     #
-
+  
     mullvad-chi = {
       config = ''
         config /home/daylin/.config/openvpn/mullvad-chi/mullvad_us_chi.conf

overlays/default.nix

@@ -1,25 +1,16 @@
 { inputs, ... }:
 let
-  inherit (builtins)
-    map
-    filter
-    attrNames
-    readDir
-    ;
-  # execute and import all overlay files in the current
-  # directory with the given args
-  # overlays =
-  #    map
-  #     (f: (import (./. + "/${f}") { inherit inputs; }))
-  #     (filter (f: f != "default.nix") (attrNames (readDir ./.)));
-  overlays =
-    readDir ./.
-    |> attrNames
-    |> filter (f: f != "default.nix")
-    |> map (f: import (./. + "/${f}") { inherit inputs; });
+  defaultOverlays =
+    # execute and import all overlay files in the current
+    # directory with the given args
+    builtins.map
+      # execute and import the overlay file
+      (f: (import (./. + "/${f}") { inherit inputs; }))
+      # find all overlay files in the current directory
+      (builtins.filter (f: f != "default.nix") (builtins.attrNames (builtins.readDir ./.)));
 in
 {
-  nixpkgs.overlays = overlays ++ [
+  nixpkgs.overlays = defaultOverlays ++ [
     (final: _prev: {
       stable = import inputs.stable {
         system = final.system;

todo.md

@@ -2,8 +2,6 @@
 
 ## oizys
 
-- [ ] write a flake template that includes the systems boilerplate
-
 ## software
 
 - [ ] lid closed does not engage hyprlock?