From 7c682a57623f7c56f73c1f39357eba1cc5af40a0 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 10 Nov 2022 20:06:35 -0600 Subject: [PATCH] lint --- configuration.nix | 80 ++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/configuration.nix b/configuration.nix index 3872267..33128ae 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,46 +7,58 @@ ]; nix.package = pkgs.nixUnstable; + nixpkgs.config.allowUnfree = true; nix.extraOptions = '' experimental-features = nix-command flakes ''; + + # todo import from a different file + + nixpkgs.overlays = [ (self: super: { - wavebox = super.wavebox.overrideAttrs (old: { - version = "10.107.10"; - src = super.fetchurl { - url = "https://download.wavebox.app/stable/linux/tar/Wavebox_10.107.10-2.tar.gz"; - sha256 = "sha256-cbcAmnq9rJlQy6Y+06G647R72HWcK97KgSsYgusSB58="; + wavebox = super.wavebox.overrideAttrs + (old: { + version = "10.107.10"; + src = super.fetchurl { + url = "https://download.wavebox.app/stable/linux/tar/Wavebox_10.107.10-2.tar.gz"; + sha256 = "sha256-cbcAmnq9rJlQy6Y+06G647R72HWcK97KgSsYgusSB58="; + }; + nativeBuildInputs = with pkgs; [ + autoPatchelfHook + makeWrapper + qt5.wrapQtAppsHook + ]; + buildInputs = with pkgs.xorg; [ + libXdmcp + libXScrnSaver + libXtst + libXdamage + ] ++ + (with pkgs; [ + alsa-lib + gtk3 + nss + mesa + ]); + postFixup = '' + # make xdg-open overrideable at runtime + makeWrapper $out/opt/wavebox/wavebox $out/bin/wavebox \ + --suffix PATH : ${super.xdg-utils}/bin + ''; + }); + picom = super.picom.overrideAttrs (o: { + src = pkgs.fetchFromGitHub { + repo = "picom"; + owner = "ibhagwan"; + rev = "44b4970f70d6b23759a61a2b94d9bfb4351b41b1"; + sha256 = "0iff4bwpc00xbjad0m000midslgx12aihs33mdvfckr75r114ylh"; }; - nativeBuildInputs = with pkgs; [ - autoPatchelfHook - makeWrapper - qt5.wrapQtAppsHook - ]; - buildInputs = with pkgs.xorg; [ - libXdmcp - libXScrnSaver - libXtst - libXdamage - ] ++ - (with pkgs; [ - alsa-lib - gtk3 - nss - mesa - ]); - postFixup = '' - # make xdg-open overrideable at runtime - makeWrapper $out/opt/wavebox/wavebox $out/bin/wavebox \ - --suffix PATH : ${super.xdg-utils}/bin - ''; }); - } + }) - - ) ]; # networking.hostName = "nixos"; # Define your hostname. @@ -60,6 +72,7 @@ environment.shells = with pkgs; [ zsh ]; # overwrite demo as default login + services.xserver.enable = true; services.xserver.displayManager.autoLogin.enable = lib.mkForce false; services.xserver.windowManager.qtile.enable = true; @@ -94,8 +107,8 @@ wezterm eww rofi - picom dunst + picom (python3.withPackages (p: with p; @@ -118,14 +131,11 @@ fonts.fonts = with pkgs; [ - font-awesome noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra - dejavu_fonts - last-resort - (nerdfonts.override { fonts = [ "FiraCode" ]; }) + (nerdfonts.override { fonts = [ "FiraCode" "FiraMono" ]; }) ];