chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updating

Browse source 
This time it required some extra tweaking. In particular I believe I
need to make sure not to use nixpkgs.config anywhere
This commit is contained in:
Chris Cochrun 2023-11-08 06:22:59 -06:00
parent a32286fc67
commit 5df4c373d6
6 changed files with 57 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

96
flake.lock generated
View file

@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1692476235,
"narHash": "sha256-NGUDp/24HCIVWE0xZNHIdzz3q2WDk7MQz1wC7ub/e2U=",
"lastModified": 1696926085,
"narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=",
"owner": "Kirottu",
"repo": "anyrun",
"rev": "76af3eb198f376303194c31a83f2399a043acf1b",
"rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216",
"type": "github"
},
"original": {
@ -46,11 +46,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1696410469,
"narHash": "sha256-N8gQTrqQVW+d3bUcWKkfKPKvctMH3SzkzkFtysruPc4=",
"lastModified": 1699378729,
"narHash": "sha256-WH3CEdPqp1wQeE5hi0yik+MwwSQelFUZCnB3Iqwa1wE=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "61ba9eca21db0a7e8a6471d11f3f6f74b79a70ba",
"rev": "4f81073c44bfa46c97cdd739345e6dc05494c69a",
"type": "github"
},
"original": {
@ -130,11 +130,11 @@
]
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"lastModified": 1696343447,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github"
},
"original": {
@ -219,11 +219,11 @@
]
},
"locked": {
"lastModified": 1696409884,
"narHash": "sha256-hz3i4wFJHoTIAEI19oF1fiPn6TpV+VuTSOrSHUoJMgs=",
"lastModified": 1699368917,
"narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8aef005d44ee726911e9f793495bb40f2fbf5a05",
"rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3",
"type": "github"
},
"original": {
@ -242,11 +242,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1696428369,
"narHash": "sha256-kvWGF6xz/5ioVyb2i8BLa3DuOEse3Itv/yVkBjSXPhY=",
"lastModified": 1699368836,
"narHash": "sha256-lAFB3TC2jej9DcOcIAkVVPf35V/LaeG/cP1sYks1t4M=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "1b99a69dc11c3c8266559c3c20b2f4dac6621dcc",
"rev": "47654a84c2dc68d478d044fd0589ec5cc96dbc66",
"type": "github"
},
"original": {
@ -287,16 +287,16 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1696160392,
"narHash": "sha256-+QmnLjuBbrLyij50Lx/UWKA6MmGS1CAbctuobr3Ni/w=",
"lastModified": 1698688760,
"narHash": "sha256-VuHPeAho57EheieFdWUBQwnB6o9EHSvJLStFs05766U=",
"owner": "chriscochrun",
"repo": "church-presenter",
"rev": "7bdd8225cba276fc06cee734fb71692c90e3f31e",
"repo": "lumina",
"rev": "4cb57b0b96e73e2f3eab1141b66d61820d8a51b0",
"type": "gitlab"
},
"original": {
"owner": "chriscochrun",
"repo": "church-presenter",
"repo": "lumina",
"type": "gitlab"
}
},
@ -326,11 +326,11 @@
"nixpkgs-unstable": "nixpkgs-unstable"
},
"locked": {
"lastModified": 1694874702,
"narHash": "sha256-MxtybZ/6Absj9dr3hSL/ILtCjQ5phoHHUuyc8BK+yTw=",
"lastModified": 1698064538,
"narHash": "sha256-Z0WK2+b2jkhGT74N1K0is9LKVqcP3N+5s8aPRfIJ9bk=",
"owner": "fort-nix",
"repo": "nix-bitcoin",
"rev": "eaea0f120dcbf0a3f5f0d1ebc964ff98207896fc",
"rev": "8a8f32a4fa8fa4d97bea60c19d587a4523d10a2a",
"type": "github"
},
"original": {
@ -342,11 +342,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1696161939,
"narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=",
"lastModified": 1699159446,
"narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532",
"rev": "627bc9b88256379578885a7028c9e791c29fb581",
"type": "github"
},
"original": {
@ -358,11 +358,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1694767346,
"narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
"lastModified": 1698134075,
"narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
"rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github"
},
"original": {
@ -389,11 +389,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1696323343,
"narHash": "sha256-u7WLUrh5eb+6SBYwtkaGL2ryHpLcHzmLml+a+VqKJWE=",
"lastModified": 1699291058,
"narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3b79cc4bcd9c09b5aa68ea1957c25e437dc6bc58",
"rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
"type": "github"
},
"original": {
@ -421,11 +421,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1694760568,
"narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
"lastModified": 1697915759,
"narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e",
"rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
"type": "github"
},
"original": {
@ -467,11 +467,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1694753796,
"narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=",
"lastModified": 1697851979,
"narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "360a7d31c30abefdc490d203f80e3221b7a24af2",
"rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
"type": "github"
},
"original": {
@ -483,11 +483,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1696193975,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
"lastModified": 1699099776,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github"
},
"original": {
@ -650,18 +650,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1696410538,
"narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=",
"lastModified": 1697909146,
"narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc",
"rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc",
"rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2",
"type": "gitlab"
}
},
@ -681,11 +681,11 @@
]
},
"locked": {
"lastModified": 1694628480,
"narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=",
"lastModified": 1697981233,
"narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2",
"rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -31,7 +31,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
libre-presenter = {
url = "gitlab:chriscochrun/church-presenter";
url = "gitlab:chriscochrun/lumina";
};
# nixified-ai = {
# url = "github:nixified-ai/flake";

3
modules/base.nix
View file

@ -15,7 +15,8 @@ with lib;
auto-optimise-store = true;
};
};
nixpkgs.config.allowUnFree = true;
# nixpkgs.config.allowUnFree = true;
# pkgs.config.allowUnfree = true;
system.autoUpgrade = {
enable = true;

1
modules/emacs.nix
View file

@ -24,6 +24,7 @@ with lib;
all-the-icons
doom-modeline
doom-themes
melpaPackages.mini-echo
rainbow-delimiters
smartparens
paredit

4
pkgs/desktop-packages.nix
View file

@ -116,14 +116,14 @@ with lib;
networkmanager_dmenu
plasma5Packages.qt5ct
lxappearance
spotdl
# spotdl
# (kdenlive.override {
# mlt = mlt.override {
# ffmpeg = ffmpeg-full;
# };
# })
kdenlive
glaxnimate
# glaxnimate
mediainfo
libmediainfo
minetest

6
systems/syl/configuration.nix
View file

@ -23,9 +23,9 @@
hardware.uinput.enable = true;
hardware.bluetooth.enable = true;
nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
};
# nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
# };
services.xserver.videoDrivers = ["intel"];
hardware.opengl = {