From 8e98525b2e31654d2d7baf879bd386989502ef39 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 7 Mar 2023 09:41:00 -0600 Subject: [PATCH] some other updates for kaladin --- awesome/rules.fnl | 2 +- flake.lock | 86 ++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 16 ++++----- 3 files changed, 94 insertions(+), 10 deletions(-) diff --git a/awesome/rules.fnl b/awesome/rules.fnl index 83f9c2d..a4c862f 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -41,7 +41,7 @@ :floating true :raise true ;; :height (dpi 1200) - :width (dpi 1400) + :width (dpi 2200) :screen 1 :sticky true :placement awful.placement.centered diff --git a/flake.lock b/flake.lock index a08320a..8813d32 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "cargo2nix": { "inputs": { "flake-compat": "flake-compat_2", @@ -319,6 +335,21 @@ "type": "github" } }, + "nixpkgs-22_11": { + "locked": { + "lastModified": 1669558522, + "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1675918889, @@ -415,6 +446,21 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1669542132, + "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a115bb9bd56831941be3776c8a94005867f316a7", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "emacs": "emacs", @@ -424,7 +470,8 @@ "libre-presenter": "libre-presenter", "nix-bitcoin": "nix-bitcoin", "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable", + "simple-nixos-mailserver": "simple-nixos-mailserver" } }, "rust-overlay": { @@ -476,6 +523,28 @@ "type": "github" } }, + "simple-nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "nixpkgs": "nixpkgs_6", + "nixpkgs-22_11": "nixpkgs-22_11", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1671659164, + "narHash": "sha256-DbpT+v1POwFOInbrDL+vMbYV3mVbTkMxmJ5j50QnOcA=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "bc667fb6afc45f6cc2d118ab77658faf2227cffd", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "ref": "nixos-22.11", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "utils": { "locked": { "lastModified": 1667395993, @@ -491,6 +560,21 @@ "type": "github" } }, + "utils_2": { + "locked": { + "lastModified": 1605370193, + "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 54ed0e7..c2763c9 100644 --- a/flake.nix +++ b/flake.nix @@ -39,14 +39,14 @@ config = { allowUnfree = true; }; overlays = [ emacs.overlays.default - (self: super: { - ffmpeg_5-full = super.ffmpeg_5-full.overrideAttrs (old: { - postFixup = '' - addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so - addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so - ''; - }); - }) + # (self: super: { + # ffmpeg_5-full = super.ffmpeg_5-full.overrideAttrs (old: { + # postFixup = '' + # addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so + # addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so + # ''; + # }); + # }) (self: super: { awesome = super.awesome.overrideAttrs (old: rec {