Compare commits

..

No commits in common. "b156aa63f9ccd59f31b8866bd2de9a153c21fc82" and "17045e81b2a6f7f6ce6f45f049e2b45e3bc92469" have entirely different histories.

6 changed files with 17 additions and 29 deletions

View file

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

View file

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

View file

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

View file

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

View file

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