summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kj@orbekk.com>2022-09-24 10:15:36 -0400
committerKjetil Orbekk <kj@orbekk.com>2022-09-24 10:17:27 -0400
commitdaac9b932e9d0f76a4080f9c5283d2ba8e2ea5a7 (patch)
tree091de6c86e1baf5bc385e41c4954444d113b6439
parent633c9a6cf71855d691b1afa55cee9f9a5cca73e5 (diff)
Update
-rw-r--r--flake.lock111
-rw-r--r--flake.nix6
-rw-r--r--modules/desktop.nix2
-rw-r--r--modules/gaming.nix1
4 files changed, 23 insertions, 97 deletions
diff --git a/flake.lock b/flake.lock
index 17e2d23..0e33a63 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1652712410,
- "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=",
+ "lastModified": 1662241716,
+ "narHash": "sha256-urqPvSvvGUhkwzTDxUI8N1nsdMysbAfjmBNZaTYBZRU=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b",
+ "rev": "c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e",
"type": "github"
},
"original": {
@@ -24,11 +24,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1656757008,
- "narHash": "sha256-kqYEFrjSIUe9FSwZKaFGYu7s9/6+YiE9b418QLLnaPE=",
+ "lastModified": 1664015884,
+ "narHash": "sha256-U+oc5aF063T7i1NWqy9O+xqkqdAucAtEpBLds5Jb/zU=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "a189248df5e56b652483675fd1d35727b6cc7a59",
+ "rev": "583ad7baf08792c0edce8d6461a2e40be6c11115",
"type": "github"
},
"original": {
@@ -39,11 +39,11 @@
},
"flake-utils": {
"locked": {
- "lastModified": 1656065134,
- "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+ "lastModified": 1659877975,
+ "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+ "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@@ -52,31 +52,13 @@
"type": "github"
}
},
- "naersk": {
- "inputs": {
- "nixpkgs": "nixpkgs_4"
- },
- "locked": {
- "lastModified": 1636103400,
- "narHash": "sha256-6DRg/0P9oT5I/V02sloqGVHf8F6f+7DFoBZNPdr+hOI=",
- "owner": "nmattia",
- "repo": "naersk",
- "rev": "074d81b1a45145f076b2adf93184073fc9615397",
- "type": "github"
- },
- "original": {
- "owner": "nmattia",
- "repo": "naersk",
- "type": "github"
- }
- },
"nixos-hardware": {
"locked": {
- "lastModified": 1656702262,
- "narHash": "sha256-BdVdx6LoGgAeIYrHnzk+AgbtkaVlV3JNcC6+vltLuh0=",
+ "lastModified": 1663229557,
+ "narHash": "sha256-1uU4nsDLXKG0AHc/VCsNBAEPkTA/07juYhcEWRb1O1E=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "c5308381432cdbf14d5b1128747a2845f5c6871e",
+ "rev": "a0df6cd6e199df4a78c833c273781ea92fa62cfb",
"type": "github"
},
"original": {
@@ -104,11 +86,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1656461576,
- "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=",
+ "lastModified": 1663850217,
+ "narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c",
+ "rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
"type": "github"
},
"original": {
@@ -121,8 +103,8 @@
"nixpkgs_2": {
"locked": {
"lastModified": 0,
- "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
- "path": "/nix/store/z8fi1f38y14lmsyhnph1l98qr3r9x7wr-source",
+ "narHash": "sha256-Kqd6r9aNIzjYGhMFYATdKwRbXBCGLcdqAJMLr4I8LG0=",
+ "path": "/nix/store/l0zpkxzcinla9fr0rf9qy18gga43fxml-source",
"type": "path"
},
"original": {
@@ -132,11 +114,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1656589841,
- "narHash": "sha256-Kqd6r9aNIzjYGhMFYATdKwRbXBCGLcdqAJMLr4I8LG0=",
+ "lastModified": 1663855239,
+ "narHash": "sha256-A2B7rlFKmBikRwz/cmayWcTAhyIOdp2whjVCDGhg9Xw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dbb62c34bbb5cdf05f1aeab07638b24b0824d605",
+ "rev": "bcc68429a50c4ac051920c72c60e417202c19d79",
"type": "github"
},
"original": {
@@ -146,64 +128,13 @@
"type": "github"
}
},
- "nixpkgs_4": {
- "locked": {
- "lastModified": 0,
- "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
- "path": "/nix/store/z8fi1f38y14lmsyhnph1l98qr3r9x7wr-source",
- "type": "path"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "pms7003": {
- "inputs": {
- "naersk": "naersk",
- "nixpkgs": [
- "nixpkgs"
- ],
- "utils": "utils"
- },
- "locked": {
- "lastModified": 1636762722,
- "narHash": "sha256-gVqZYPxTj+tBehj7XxXO+Wo28fCD+FRLtECLguOKsyQ=",
- "owner": "orbekk",
- "repo": "pms7003",
- "rev": "6cfdfa59b8df4c0d1fddbdbbac30be78520de322",
- "type": "github"
- },
- "original": {
- "owner": "orbekk",
- "ref": "master",
- "repo": "pms7003",
- "type": "github"
- }
- },
"root": {
"inputs": {
"agenix": "agenix",
"emacs-overlay": "emacs-overlay",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
- "nixpkgs-unstable": "nixpkgs-unstable",
- "pms7003": "pms7003"
- }
- },
- "utils": {
- "locked": {
- "lastModified": 1634851050,
- "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
+ "nixpkgs-unstable": "nixpkgs-unstable"
}
}
},
diff --git a/flake.nix b/flake.nix
index 0243a8f..57bff5c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,21 +2,17 @@
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
- inputs.pms7003.url = "github:orbekk/pms7003/master";
- inputs.pms7003.inputs.nixpkgs.follows = "nixpkgs";
inputs.emacs-overlay.url = "github:nix-community/emacs-overlay";
inputs.agenix.url = "github:ryantm/agenix";
outputs =
- { self, nixpkgs, nixpkgs-unstable, nixos-hardware, pms7003, emacs-overlay, agenix }:
+ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, emacs-overlay, agenix }:
let
pkgs-module = { config, ... }:
let
cfg = config.nixpkgs;
- ppp = pms7003;
extra-packages = final: prev: {
- pms7003 = ppp.packages.${final.system}.pms7003;
agenix = agenix.defaultPackage.${final.system};
};
diff --git a/modules/desktop.nix b/modules/desktop.nix
index c3bf548..1789c01 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -99,7 +99,7 @@ in {
pavucontrol
rofi
rxvt_unicode-with-plugins
- unstable.signal-desktop
+ signal-desktop
sshfs-fuse
trayer
vlc
diff --git a/modules/gaming.nix b/modules/gaming.nix
index 7efed0c..61b089b 100644
--- a/modules/gaming.nix
+++ b/modules/gaming.nix
@@ -211,7 +211,6 @@ in {
steam
steam.run
obs-studio
- unstable.rpcs3
];
};
}