diff options
Diffstat (limited to '')
| -rw-r--r-- | packages.nix | 44 | ||||
| -rw-r--r-- | packages/dwmblocks/pkg.nix | 4 | ||||
| -rw-r--r-- | packages/sidekick-dashboard/pkg.nix | 11 | ||||
| -rw-r--r-- | packages/st/pkg.nix | 4 | ||||
| -rw-r--r-- | packages/xmonad/pkg.nix | 8 |
5 files changed, 43 insertions, 28 deletions
diff --git a/packages.nix b/packages.nix index ecf3954..e763f4f 100644 --- a/packages.nix +++ b/packages.nix @@ -44,6 +44,7 @@ let nodePackages.typescript-language-server nodePackages.vscode-json-languageserver nodePackages.vscode-langservers-extracted + nodePackages.tsun # nodePackage.bash-language-server ]; @@ -54,7 +55,7 @@ let # ungoogled-chromium # Comm - #slack + # slack # signal-cli # signal-desktop @@ -66,17 +67,26 @@ let imagemagick ffmpeg-full feh + obs-studio + inkscape + + # Gaming + chiaki # Scheduling remind wyrd - #monero-gui + # qjackctl + # ardour + pavucontrol + easyeffects + lf dunst gotop tremc - # zathura # Broken on 9th April 2020 + zathura ]; utils = with pkgs; [ @@ -92,17 +102,16 @@ let file at bc - tty-clock + bat + fd + sad + mediainfo + poppler_utils + glow + # appimage-run # Audio - alsaUtils - pavucontrol - obs-studio - inkscape - - # qjackctl - #qsynth - # ardour + alsa-utils # X stuff picom @@ -119,18 +128,17 @@ let in { # Packages - environment.systemPackages = devPackages ++ customPackages ++ apps ++ utils; + environment.systemPackages = devPackages ++ customPackages ++ apps ++ utils ++ [ pkgs.steam-run ]; nixpkgs.config.permittedInsecurePackages = [ "ffmpeg-3.4.8" ]; - programs = { - adb.enable = true; - }; + programs.adb.enable = true; - #programs.steam.enable = true; - #hardware.steam-hardware.enable = true; + programs.steam.enable = true; + hardware.steam-hardware.enable = true; + programs.gamemode.enable = true; # Security wrappers security.wrappers = { diff --git a/packages/dwmblocks/pkg.nix b/packages/dwmblocks/pkg.nix index 41cfdf2..b140b88 100644 --- a/packages/dwmblocks/pkg.nix +++ b/packages/dwmblocks/pkg.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, libX11, pkgconfig }: +{ stdenv, pkgs, libX11, pkg-config }: with pkgs.lib; stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = ./source; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; diff --git a/packages/sidekick-dashboard/pkg.nix b/packages/sidekick-dashboard/pkg.nix index b38aa4c..0835db6 100644 --- a/packages/sidekick-dashboard/pkg.nix +++ b/packages/sidekick-dashboard/pkg.nix @@ -2,6 +2,10 @@ with pkgs.lib; let + useFakeHash = false; + commitHash = "f160ec9742cacd14f8853ea6d17dc4011f85156d"; + realSha256 = "sha256-LCFcX23dY7tFoXPgEHaD+U6g2X/9M4aE4TPfvhu6bLI="; + src = fetchFromGitHub { owner = "mozilla"; repo = "nixpkgs-mozilla"; @@ -20,8 +24,11 @@ rustPlatform.buildRustPackage rec { src = pkgs.fetchFromGitHub { owner = "phenax"; repo = "sidekick-dashboard"; - rev = "994450070a984448cb0b286fc729a92c6487c0c9"; - sha256 = "sha256-M4mbep/qxRsRxZdILxKY5ejRPVZ3Pm6nuToDCZky/A0="; + rev = commitHash; + sha256 = + if useFakeHash + then lib.fakeSha256 + else realSha256; }; cargoSha256 = "sha256-dgW2SlpKovw79wkdGcbVm6c8KqkbcZlvZCwCcdVBShw="; diff --git a/packages/st/pkg.nix b/packages/st/pkg.nix index 4604a99..cd95fa7 100644 --- a/packages/st/pkg.nix +++ b/packages/st/pkg.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, libX11, libXinerama, libXft, fontconfig, pkgconfig, ncurses }: +{ stdenv, pkgs, libX11, libXinerama, libXft, fontconfig, pkg-config, ncurses }: with pkgs.lib; stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = ./source; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXft fontconfig ncurses ]; diff --git a/packages/xmonad/pkg.nix b/packages/xmonad/pkg.nix index cf4aa04..65f964d 100644 --- a/packages/xmonad/pkg.nix +++ b/packages/xmonad/pkg.nix @@ -5,7 +5,7 @@ , haskellPackages }: let - xmobar_custom = haskellPackages.xmobar.overrideAttrs ( + xmobar-custom = haskellPackages.xmobar.overrideAttrs ( _: { configureFlags = [ "-fwith_xft" @@ -39,11 +39,11 @@ haskellPackages.mkDerivation rec { xmonad xmonad-contrib - xmobar_custom + xmobar-custom ]; librarySystemDepends = with pkgs; [ - pkgs.pkgconfig + pkgs.pkg-config xorg.libXext xorg.libXScrnSaver xorg.libXinerama @@ -52,7 +52,7 @@ haskellPackages.mkDerivation rec { xorg.libXrandr xorg.libXft xorg.libXpm - alsaLib + alsa-lib wirelesstools ]; } |