teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

chore: bump flake.lock, update overlays to unstable

Browse source 
• Updated input 'master':
    'github:nixos/nixpkgs/8e9d4495c78515277aa43d579610ef3750f59e2c' (2023-12-17)
  → 'github:nixos/nixpkgs/3b0e747000d10e26eaab44e2958bea2ee28c6de6' (2023-12-19)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/40c3c94c241286dd2243ea34d3aef8a488f9e4d0' (2023-12-15)
  → 'github:nixos/nixpkgs/1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f' (2023-12-17)
• Updated input 'unstable':
    'github:nixos/nixpkgs/a9bf124c46ef298113270b1f84a164865987a91c' (2023-12-11)
  → 'github:nixos/nixpkgs/91a00709aebb3602f172a0bf47ba1ef013e34835' (2023-12-17)
This commit is contained in:
teutat3s 2023-12-19 18:25:40 +01:00
parent 24bdc88d97
commit 998255e364
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -159,11 +159,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1702849480, "lastModified": 1703005342,
"narHash": "sha256-zksC+KERpS5yUlc3zNtrBfdXTJF3/GumTz5hlDyVwm4=", "narHash": "sha256-0bnxGLEg/0MLfRJ+CEip23i/nO34+nQddRA7g5EYF+Y=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8e9d4495c78515277aa43d579610ef3750f59e2c", "rev": "3b0e747000d10e26eaab44e2958bea2ee28c6de6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +242,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1702645756, "lastModified": 1702780907,
"narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +402,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1702312524, "lastModified": 1702830618,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c", "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
overlays/default.nix
View file

@ -11,30 +11,26 @@
(final: prev: (final: prev:
let let
unstable = import inputs.unstable { unstable = import inputs.unstable {
system = prev.system;
#config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
# "1password-cli"
# "1password"
# "slack"
#];
};
master = import inputs.master {
system = prev.system; system = prev.system;
config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [ config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
"slack" "slack"
]; ];
}; };
master = import inputs.master {
system = prev.system;
};
in in
{ {
direnv = unstable.direnv; direnv = unstable.direnv;
nix-direnv = unstable.nix-direnv; nix-direnv = unstable.nix-direnv;
qMasterPassword-wayland = master.qMasterPassword-wayland; qMasterPassword-wayland = unstable.qMasterPassword-wayland;
slack = master.slack; slack = unstable.slack;
signal-desktop = master.signal-desktop; signal-desktop = unstable.signal-desktop;
#vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;}; #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
}) })
(import ../pkgs) (import ../pkgs)
(import ./blesh.nix) (import ./blesh.nix)
(import ./element-desktop.nix)
(import ./mdbook-multilang.nix inputs) (import ./mdbook-multilang.nix inputs)
(import ./nix-index.nix) (import ./nix-index.nix)
(import ./prr.nix) (import ./prr.nix)

3
overlays/element-desktop.nix Normal file
View file

@ -0,0 +1,3 @@
final: prev: {
element-desktop = prev.element-desktop.override { electron = prev.electron_28; };
}