BROKEN: INFINITE RECURSION

flake: overlay lib
home: nixpkgs disable nixpkgs config
2024-08-19 06:50:35 -07:00 · 2024-08-19 06:27:10 -07:00 · 2024-08-19 06:16:59 -07:00 · 2024-08-19 06:16:59 -07:00 · 2024-08-19 06:16:59 -07:00 · 2024-08-19 06:02:44 -07:00
15 changed files with 203 additions and 415 deletions
--- a/flake.nix
+++ b/flake.nix
@ -50,14 +50,6 @@
              hostname = "snowhawk";
              system = "x86_64-linux";
            }
-            {
-              hostname = "sprite";
-              system = "aarch64-linux";
-            }
-            {
-              hostname = "nixos";
-              system = "x86_64-linux";
-            }
          ];

      homeConfigurations =
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@ -15,8 +15,8 @@ in
 {
  imports = getModules ./.;

-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ self.overlays.default ];
+  # nixpkgs.config.allowUnfree = true;
+  # nixpkgs.overlays = [ self.overlays.default ];

  snowhawk.user.enable = lib.mkDefault true;
  snowhawk.tmux.enable = lib.mkDefault true;
--- a/home/modules/xivlauncher.nix
+++ b/home/modules/xivlauncher.nix
@ -19,6 +19,12 @@ in
        (writeShellScriptBin "iinact" ''
          ${pkgs.brave}/bin/brave --new-window "http://proxy.iinact.com/overlay/skyline/?OVERLAY_WS=ws://127.0.0.1:10501/ws"
        '')
+
+        # (lib.mkIf cfg.textools.enable pkgs.wrapWine {
+        #   # https://gist.github.com/helpful-fox-senko-san/6238143f5c7352ab44e62c5a0f7f7642
+        #   name = "textools";
+        #   tricks = [ "dotnet48" "dxvk" ];
+        # })
      ] ++ map (name: (writeShellScriptBin name launchffxiv)) [ "ff14" "xivlauncher" ];
    };
 }
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@ -1,135 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running `nixos-help`).
-
-{ pkgs, inputs, ... }:
-
-{
-  imports = [
-    inputs.home-manager.nixosModules.default
-    ../../modules
-  ];
-
-  # TODO: fix bootloader
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  fonts.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-  ];
-
-  # Set your time zone.
-  time.timeZone = "America/Los_Angeles";
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the XFCE Desktop Environment.
-  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.budgie.enable = true;
-
-  # Configure keymap in X11
-  services.xserver = {
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  services.envfs.enable = true;
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-    auto-optimise-store = true;
-  };
-
-  programs.nix-ld.enable = true;
-  # programs.nix-ld.libraries = with pkgs; [
-  # 
-  # ];
-
-  # Define a user account. Don't forget to set a password with `passwd`.
-  users.users.ravenshade = {
-    isNormalUser = true;
-    description = "Zynh Ludwig";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      fish
-      ripgrep
-      lazygit
-      unzip
-      fzf
-      tree
-
-      xclip
-
-      rustup
-      gnumake
-      zig
-      gcc
-      go
-      python3
-      nodejs_22
-      # dotnet-sdk_8
-    ];
-  };
-
-  # Enable automatic login for the user.
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "ravenshade";
-  };
-
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    users = { "ravenshade" = import ./home.nix; };
-    # backupFileExtension = "backup";
-  };
-
-  # programs.hyprland.enable = true;
-  # environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-  environment.systemPackages = with pkgs; [
-    neovim
-    curl
-    git
-    killall
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
-}
--- a/hosts/nixos/hardware-configuration.nix
+++ b/hosts/nixos/hardware-configuration.nix
@ -1,31 +0,0 @@
-# Do not modify this file!  It was generated by 'nixos-generate-config'
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ lib, ... }:
-
-{
-  imports = [ ];
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/439bb7c9-9b00-4899-944b-d0606f4c90db";
-      fsType = "ext4";
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s3.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  virtualisation.virtualbox.guest.enable = true;
-}
--- a/hosts/nixos/home.nix
+++ b/hosts/nixos/home.nix
@ -1,30 +0,0 @@
-{ pkgs, inputs, ... }:
-
-{
-  imports = [
-    ../../home/modules
-  ];
-
-  snowhawk.neovim = {
-    enable = true;
-    package = inputs.neovim-overlay.packages.${pkgs.system}.default;
-  };
-  snowhawk.alacritty.enable = true;
-  snowhawk.theme.enable = true;
-  snowhawk.projects.enable = true;
-
-  xsession.numlock.enable = true;
-
-  home.packages = with pkgs; [
-    nix-output-monitor
-    (writeShellScriptBin "rebuild" ''
-      sudo nixos-rebuild switch --log-format internal-json -v |& nom --json
-    '')
-  ];
-
-  home.file = { };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-  home.stateVersion = "23.11";
-}
--- a/hosts/sprite/configuration.nix
+++ b/hosts/sprite/configuration.nix
@ -1,137 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running `nixos-help`).
-
-{ pkgs, inputs, ... }:
-
-{
-  imports = [
-    inputs.home-manager.nixosModules.default
-    ../../modules
-  ];
-
-  # TODO: fix bootloader
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  fonts.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-  ];
-
-  # Set your time zone.
-  time.timeZone = "America/Los_Angeles";
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the XFCE Desktop Environment.
-  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.budgie.enable = true;
-
-  # Configure keymap in X11
-  services.xserver = {
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  services.envfs.enable = true;
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-    auto-optimise-store = true;
-  };
-
-  programs.nix-ld.enable = true;
-  # programs.nix-ld.libraries = with pkgs; [
-  # 
-  # ];
-
-  # Define a user account. Don't forget to set a password with `passwd`.
-  users.users.ravenshade = {
-    isNormalUser = true;
-    description = "Zynh Ludwig";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      fish
-      ripgrep
-      lazygit
-      unzip
-      fzf
-      tree
-
-      nix-output-monitor
-
-      xclip
-
-      rustup
-      gnumake
-      zig
-      gcc
-      go
-      python3
-      nodejs_22
-      # dotnet-sdk_8
-    ];
-  };
-
-  # Enable automatic login for the user.
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "ravenshade";
-  };
-
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    users = { "ravenshade" = import ./home.nix; };
-    # backupFileExtension = "backup";
-  };
-
-  # programs.hyprland.enable = true;
-  # environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-  environment.systemPackages = with pkgs; [
-    neovim
-    curl
-    git
-    killall
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
-}
--- a/hosts/sprite/hardware-configuration.nix
+++ b/hosts/sprite/hardware-configuration.nix
@ -1,34 +0,0 @@
-{ lib, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" "usb_storage" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/fa4ed906-f26b-40ec-859c-81813151c33a";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/31B8-8850";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  networking.hostName = "sprite";
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s1.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-}
--- a/hosts/sprite/home.nix
+++ b/hosts/sprite/home.nix
@ -1,27 +0,0 @@
-{ pkgs, inputs, ... }:
-
-{
-  imports = [
-    ../../home/modules
-  ];
-
-  snowhawk.neovim = {
-    enable = true;
-    package = inputs.neovim-overlay.packages.${pkgs.system}.default;
-  };
-  snowhawk.alacritty.enable = true;
-  snowhawk.theme.enable = true;
-  snowhawk.projects.enable = true;
-
-  xsession.numlock.enable = true;
-
-  home.packages = with pkgs; [
-    (writeShellScriptBin "rebuild" ''
-      sudo nixos-rebuild switch --log-format internal-json -v |& nom --json
-    '')
-  ];
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-  home.stateVersion = "23.11";
-}
--- a/lib/builders.nix
+++ b/lib/builders.nix
@ -1,10 +1,17 @@
 { nixpkgs, self, ... }@inputs:

 let
-  lib = nixpkgs.lib.extend (import ../lib);
+  makePkgs = system: (import nixpkgs {
+    inherit system;
+
+    config.allowUnfree = true;
+    overlays = [ self.overlays.default ];
+  });
+
+  lib = nixpkgs.lib;

  inherit (inputs.home-manager.lib) homeManagerConfiguration;
-  inherit (nixpkgs.lib) nixosSystem;
+  inherit (lib) nixosSystem;
  inherit (lib.strings) optionalString;
  inherit (lib.attrsets) nameValuePair;
 in
@ -14,8 +21,9 @@ rec {
    nameValuePair
      hostname
      (nixosSystem {
-        inherit system;
-        specialArgs = { inherit inputs lib self; };
+        pkgs = makePkgs system;
+        specialArgs = { inherit inputs self; };
+
        modules = [
          ../hosts/${hostname}/hardware-configuration.nix
          ../hosts/${hostname}/configuration.nix
@ -39,11 +47,8 @@ rec {
    nameValuePair
      "${user}${hostStr}"
      (homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.${system};
-        extraSpecialArgs = {
-          inherit inputs self;
-          lib = lib.extend (_: _: inputs.home-manager.lib);
-        };
+        pkgs = makePkgs system;
+        extraSpecialArgs = { inherit inputs self; };

        modules = [
          ../hosts/${configHost}/home.nix
--- a/lib/default.nix
+++ b/lib/default.nix
@ -1,5 +1,7 @@
 final: prev:
-with prev;
+let
+  inherit (final) isFunction;
+in
 rec {
  # Ternary operator
  # Exaample:
--- a/modules/default.nix
+++ b/modules/default.nix
@ -14,5 +14,5 @@ in
  snowhawk.audio.enable = lib.mkDefault true;
  snowhawk.env.enable = lib.mkDefault true;
  snowhawk.sops.enable = lib.mkDefault true;
-  snowhawk.nixpkgs.enable = lib.mkDefault true;
+  snowhawk.nixpkgs.enable = lib.mkDefault false;
 }
--- a/pkgs/borderlessBrowser/borderlessBrowser
+++ b/pkgs/borderlessBrowser/borderlessBrowser
@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+
+set -eu
+
+function die {
+    supress_generic_error=1
+    if [ -v bin_ZENITY ] && [ ! -z "$bin_ZENITY" ]; then
+        "$bin_ZENITY" --error --text="$*"
+    else
+        echo "error: $*" 2>&2
+    fi
+}
+
+function absolute_binary {
+    bin="$(command -v "$@" 2>&-)"
+    if [ -z "$bin" ]; then
+        die "No such commands: $@"
+    fi
+    echo $bin | head -n 1
+}
+
+function cleanup {
+    if [ $? != 0 ] && [ ! -v supress_generic_error ]; then
+        die "Errors happened during runtime. See this script logs for details."
+    fi
+}
+
+trap cleanup EXIT
+
+CHROME_BINARIES=(chromium)
+
+if [ ! -v bin_ZENITY ]; then
+    bin_ZENITY="$(absolute_binary zenity)"
+fi
+
+if [ ! -v bin_CHROMIUM ]; then
+    bin_CHROMIUM="$(absolute_binary chromium)"
+fi
+
+if [ ! -v text_QUERY ]; then
+    text_QUERY="Link to be opened"
+fi
+
+if [ ! -v text_NOURL ]; then
+    text_NOURL="No URL specified"
+fi
+
+if [ $# -eq 0 ]; then
+    URL="$("$bin_ZENITY" --entry --text="$text_QUERY" || true)"
+else
+    URL="$@"
+fi
+
+if [ -z "$URL" ]; then
+    die $text_NOURL
+fi
+
+if [[ "$URL" =~ ^~ ]]; then
+    URL=$(echo $URL | sed -E s:^~\/?::)
+    URL="file://$HOME/$URL"
+fi
+
+if [[ "$URL" =~ ^\/ ]]; then
+    URL="file://$URL"
+fi
+
+if [[ ! "$URL" =~ ^(file|https?)?:\/\/ ]]; then
+    URL="https://$URL"
+fi
+
+echo final url: $URL
+
+chromeFlags=()
+
+if [ ! -v CHROME_DONT_BORDERLESS ]; then
+    chromeFlags+=(--app="$URL")
+else
+    chromeFlags+=("$URL")
+fi
+
+if [ ! -v profileToplevel ]; then
+    profileToplevel=~/.config/borderless-browser-profiles
+fi
+
+if [ -v CHROME_PROFILE ] && [[ "$CHROME_PROFILE" =~ ^[a-zA-Z_0-9-]*$ ]]; then
+    profileDir=$profileToplevel/$CHROME_PROFILE
+    chromeFlags+=(--user-data-dir="$profileDir")
+fi
+
+echo "${chromeFlags[@]}"
+"$bin_CHROMIUM" "${chromeFlags[@]}"
--- a/pkgs/borderlessBrowser/default.nix
+++ b/pkgs/borderlessBrowser/default.nix
@ -0,0 +1,83 @@
+{ lib
+, stdenvNoCC
+, chromium
+, gnome3
+, zenity ? gnome3.zenity
+, makeDesktopItem
+, copyDesktopItems
+, makeWrapper
+}:
+let
+  mkWebapp =
+    { name ? "webapp"
+    , desktopName ? "Web Application"
+    , browser ? lib.getExe chromium
+    , icon ? "applications-internet"
+    , url ? null
+    , queryText ? "Link to be opened"
+    , noURLSpecifiedText ? "No URL specified"
+    , profile ? null
+    , passthru ? { }
+    }:
+
+    let
+
+      makeWrapperArgs = [
+        "--set-default"
+        "text_QUERY"
+        queryText
+        "--set-default"
+        "text_NOURL"
+        noURLSpecifiedText
+        "--set"
+        "bin_CHROMIUM"
+        browser
+        "--set"
+        "bin_ZENITY"
+        (lib.getExe zenity)
+      ]
+      ++ (lib.optionals (profile != null) [ "--set" "CHROME_PROFILE" profile ])
+      ++ (lib.optionals (url != null) [ "--add-flags" url ])
+      ;
+
+    in
+    stdenvNoCC.mkDerivation (attrs: {
+      name = "webapp-${name}";
+
+      dontUnpack = true;
+
+      nativeBuildInputs = [ copyDesktopItems makeWrapper ];
+
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out/bin
+
+        makeWrapper ${./borderlessBrowser} $out/bin/$name ${lib.escapeShellArgs makeWrapperArgs}
+
+        runHook postInstall
+      '';
+
+      postFixup = ''
+        substituteInPlace $out/share/applications/$name.desktop --replace @bin@ $out/bin/$name
+      '';
+
+      desktopItems = [
+        (makeDesktopItem {
+          inherit (attrs) name;
+          inherit desktopName icon;
+          type = "Application";
+          exec = "@bin@";
+        })
+      ];
+
+      passthru = passthru // { inherit makeWrapperArgs; };
+    });
+
+in
+mkWebapp {
+  passthru = {
+    wrap = mkWebapp;
+  };
+}
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -3,6 +3,9 @@ let
  callDefaultPackage = path: prev.callPackage path { };
 in
 {
+  lib = prev.lib.extend import ../lib;
+
  wrapWine = callDefaultPackage ./wrapWine;
  writeXrandrScriptBin = callDefaultPackage ./writeXrandrScriptBin;
+  borderlessBrowser = callDefaultPackage ./writeXrandrScriptBin;
 }
Author	SHA1	Message	Date
Zynh Ludwig	41e1f7239a	BROKEN: INFINITE RECURSION	2024-08-19 06:50:35 -07:00
Zynh Ludwig	56d5b70499	flake: overlay lib	2024-08-19 06:27:10 -07:00
Zynh Ludwig	57d67276a0	home: nixpkgs disable nixpkgs config	2024-08-19 06:16:59 -07:00
Zynh Ludwig	659d9d7cf8	snowhawk: disable nixpkgs config	2024-08-19 06:16:59 -07:00
Zynh Ludwig	1294bb4972	builders: makePkgs	2024-08-19 06:16:59 -07:00
Zynh Ludwig	beb50655f6	xivlauncher: junk testing	2024-08-19 06:02:44 -07:00
Zynh Ludwig	97bb4b6327	pkgs: borderlessBrowser	2024-08-19 06:02:43 -07:00
Zynh Ludwig	de6a416958	flake: cleaning up vm hosts	2024-08-19 06:02:43 -07:00