diff --git a/files/.config/htop/htoprc b/files/.config/htop/htoprc index af0617e..85dd77c 120000 --- a/files/.config/htop/htoprc +++ b/files/.config/htop/htoprc @@ -1 +1 @@ -/nix/store/b892y8ysy3s7swvcfz493lz3cbc2mbi1-home-manager-files/.config/htop/htoprc \ No newline at end of file +/nix/store/ag80472rvb896igjl8zzg81irglq5340-home-manager-files/.config/htop/htoprc \ No newline at end of file diff --git a/files/nix-stuff/nixpkgs/modules/desktop.nix b/files/nix-stuff/nixpkgs/modules/desktop.nix index a7a4c15..e452a99 100644 --- a/files/nix-stuff/nixpkgs/modules/desktop.nix +++ b/files/nix-stuff/nixpkgs/modules/desktop.nix @@ -19,6 +19,7 @@ in (pkgs.callPackage ../packages/liquidctl.nix { }) (pkgs.callPackage ../packages/scr.nix { }) (pkgs.callPackage ../packages/boox.nix { }) + (pkgs.callPackage ../packages/mmutils.nix { }) cool-retro-term gromit-mpx diff --git a/files/nix-stuff/nixpkgs/packages/mmutils.nix b/files/nix-stuff/nixpkgs/packages/mmutils.nix new file mode 100644 index 0000000..e3c5366 --- /dev/null +++ b/files/nix-stuff/nixpkgs/packages/mmutils.nix @@ -0,0 +1,22 @@ +{ pkgs ? import { } }: +pkgs.stdenv.mkDerivation rec { + pname = "mmutils"; + version = "1.4.1"; + + src = pkgs.fetchFromGitHub { + owner = "pockata"; + repo = "mmutils"; + rev = "v${version}"; + sha256 = "08wlb278m5lr218c87yqashk7farzny51ybl5h6j60i7pbpm01ml"; + }; + + buildInputs = with pkgs; [ xorg.libxcb ]; + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A set of utilities to easily get xrandr monitor information"; + homepage = "https://github.com/pockata/mmutils"; + license = pkgs.lib.licenses.isc; + platforms = pkgs.lib.platforms.all; + }; +} diff --git a/files/nix-stuff/nixpkgs/packages/scr.nix b/files/nix-stuff/nixpkgs/packages/scr.nix index fedb08d..6fe78ee 100644 --- a/files/nix-stuff/nixpkgs/packages/scr.nix +++ b/files/nix-stuff/nixpkgs/packages/scr.nix @@ -1,34 +1,41 @@ { pkgs ? import { } }: -let - - scr = pkgs.fetchFromGitHub { +pkgs.stdenv.mkDerivation rec { + pname = "scr"; + version = "1.0"; + src = pkgs.fetchFromGitHub { owner = "6gk"; repo = "scr"; - rev = "4064159e291e59f4543a676b872c91fe049a3f1e"; + rev = "v${version}"; sha256 = "1pq0w3qpap6rsgxashphq5xlhvdyhryjaz7dh0l5rfmh7ydpzf12"; }; -in -pkgs.runCommand "scr" -{ buildInputs = with pkgs; [ slop ffmpeg dmenu xclip shotgun ]; } - '' - mkdir -p $out/bin - cp ${scr}/scr $out/bin/scr - sed -i "2 i export PATH=$PATH" $out/bin/scr - '' + + nativeBuildInputs = [ pkgs.makeWrapper ]; + installPhase = "install -m755 -D ./scr $out/bin/scr"; + postFixup = '' + wrapProgram "$out/bin/scr" --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ slop ffmpeg dmenu xclip shotgun ])} + ''; + meta = { + description = "a screenrecording / screenshotting script written in sh."; + homepage = "https://github.com/6gk/scr"; + license = pkgs.lib.licenses.mit; + platforms = pkgs.lib.platforms.all; + }; +} -#pkgs.stdenv.mkDerivation { -#name = "scr"; -#src = pkgs.fetchFromGitHub { +#let + +#scr = pkgs.fetchFromGitHub { #owner = "6gk"; #repo = "scr"; #rev = "4064159e291e59f4543a676b872c91fe049a3f1e"; #sha256 = "1pq0w3qpap6rsgxashphq5xlhvdyhryjaz7dh0l5rfmh7ydpzf12"; #}; - -#nativeBuildInputs = [ pkgs.makeWrapper ]; -#installPhase = "install -m755 -D ./scr $out/bin/scr"; -#postFixup = '' -#wrapProgram "$out/bin/scr" --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ slop ffmpeg dmenu xclip shotgun ])} -#''; -#} +#in +#pkgs.runCommand "scr" +#{ buildInputs = with pkgs; [ slop ffmpeg dmenu xclip shotgun ]; } +#'' +#mkdir -p $out/bin +#cp ${scr}/scr $out/bin/scr +#sed -i "2 i export PATH=$PATH" $out/bin/scr +#'' diff --git a/files/nix-stuff/nixpkgs/result b/files/nix-stuff/nixpkgs/result new file mode 120000 index 0000000..08d3936 --- /dev/null +++ b/files/nix-stuff/nixpkgs/result @@ -0,0 +1 @@ +/nix/store/jrvwf4624ic9sdkw5yag462w8c3lb9gn-options.json \ No newline at end of file