yorick
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nix flake update

master
Yorick van Pelt 2023-07-20 15:29:02 +02:00
parent eca493154e
commit dd3fcc85b2
Signed by: yorick
GPG Key ID: D8D3CC6D951384DE
8 changed files with 99 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
flake.lock
View File

@ -9,11 +9,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684153753, "lastModified": 1689334118,
"narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "db5637d10f797bb251b94ef9040b237f4702cde3", "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -69,11 +69,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1685870127, "lastModified": 1689844330,
"narHash": "sha256-7RxP74sT0h3qN4EQefG/hBF96Zhb954tsYKniPBWwmI=", "narHash": "sha256-7KPk/0IA8sPdNBbH/vJQayijcGpzwnlR/e0EX99m9qM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "70db17480e76d556cc5363c1ba22cd591c83fa76", "rev": "c243dcc7ea5fa3f1ccc781e8d7867e62e2525c06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -99,11 +99,11 @@
}, },
"flake-compat_2": { "flake-compat_2": {
"locked": { "locked": {
"lastModified": 1680531544, "lastModified": 1688025799,
"narHash": "sha256-8qbiDTYb1kGaDADRXTItpcMKQ1TeQVkuof6oEwHUvVA=", "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "95e78dc12268c5e4878621845c511077f3798729", "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680392223, "lastModified": 1688466019,
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,11 +139,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1689068808,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +157,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1689068808,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +174,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1689068808,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,16 +215,18 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685885003, "lastModified": 1687871164,
"narHash": "sha256-+OB0EvZBfGvnlTGg6mtyUCqkMnUp9DkmRUU4d7BZBVE=", "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "607d8fad96436b134424b9935166a7cd0884003e", "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "home-manager", "owner": "nix-community",
"type": "indirect" "ref": "release-23.05",
"repo": "home-manager",
"type": "github"
} }
}, },
"lib-aggregate": { "lib-aggregate": {
@ -233,11 +235,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1685621386, "lastModified": 1689509371,
"narHash": "sha256-QxSbJ/deTW8r9DCveOr5N/TpiUqBAmGXsKdqmnVNW8s=", "narHash": "sha256-ESRIO7E8PfKF5cL2ymdrQrvj8LORET24Wbpl0XMzhog=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "5b7f85fd4ee671b013f2c1935abf4cb5499ad3b5", "rev": "d75813d1b691b829a5b459bc676e2b1d71d2c15e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,11 +254,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1685435187, "lastModified": 1689318580,
"narHash": "sha256-2tSrjl16iHdG6FYMNKS+MdsIDrCWXuKQ0XRWcdbMdFg=", "narHash": "sha256-ccMZzE0Du6I7RtAuDZbERsBZRGnFcwXTAnSQqGd7mOY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "a0e0808280535bc22ffde7d34ecad11014edd6a9", "rev": "f88571cfc9132e8f2768aa41d57f5f471941d4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,11 +274,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685764721, "lastModified": 1689479461,
"narHash": "sha256-CIy1iwQTEKfZRrid4gBLA+r/LPGA9IUFo0lKJVyECGI=", "narHash": "sha256-Ak+PTYdmfOQEmcOsOEnrwqdP0HP20PLraRwpjSAzSeE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "669ca1f2e2bc401abab6b837ae9c51503edc9b49", "rev": "22fa44b7f14684d184733fb26a628f3878ff7aaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,11 +294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677562139, "lastModified": 1686315622,
"narHash": "sha256-J39FdMjECbWGSXVHmEdyGBD2aRYGhg9bWEPf1/ZR47k=", "narHash": "sha256-ccqZqY6wUFot0ewyNKQUrMR6IEliGza+pjKoSVMXIeM=",
"owner": "serokell", "owner": "serokell",
"repo": "nix-npm-buildpackage", "repo": "nix-npm-buildpackage",
"rev": "d45296118cae672982f192451dd3e19fa6c2d068", "rev": "991a792bccd611842f6bc1aa99fe80380ad68d44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -328,11 +330,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1684899633, "lastModified": 1689320556,
"narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -352,11 +354,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1685482651, "lastModified": 1687462267,
"narHash": "sha256-x3W/EZftpdDzJw5dus6i3efIBBbGWFqWXEVfA3kcyyU=", "narHash": "sha256-rNSputjn/0HEHHnsKfQ8mQVEPVchcBw7DsbND7Wg8dk=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "acc7791ee9f47f62529a874d8b46f09b5bce2ce0", "rev": "24128c3052090311688b09a400aa408ba61c6ee5",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -368,11 +370,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1685801374, "lastModified": 1689680872,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "rev": "08700de174bc6235043cb4263b643b721d936bdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +416,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1685561605, "lastModified": 1689469483,
"narHash": "sha256-LqEu1IWP8UWKxwwrpPtp1/p+JRCaUI0hl8e4hht5YdI=", "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "75aeea15ee4971c52c56bbbee84066e74d53d858", "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -429,11 +431,11 @@
}, },
"nixpkgs-mozilla": { "nixpkgs-mozilla": {
"locked": { "locked": {
"lastModified": 1684487559, "lastModified": 1687771476,
"narHash": "sha256-SZcJEM+NnLr8ctzeQf1BGAqBHzJ3jn+tdSeO7lszIJc=", "narHash": "sha256-TSpqz6qYVRoqkEdOCawEQ4/cWt/4pracmvw17HK1tgE=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "e6ca26fe8b9df914d4567604e426fbc185d9ef3e", "rev": "3a44b8783514e7d6db4b63df96071b6c2b014b07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,16 +446,16 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1685758009, "lastModified": 1689680872,
"narHash": "sha256-IT4Z5WGhafrq+xbDTyuKrRPRQ1f+kVOtE+4JU1CHFeo=", "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eaf03591711b46d21abc7082a8ebee4681f9dbeb", "rev": "08700de174bc6235043cb4263b643b721d936bdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -468,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685650687, "lastModified": 1689848188,
"narHash": "sha256-RhZ2Ih8t0Q0RFfBp3+/a65ncGwaeYsDVEFWbjdv5jOU=", "narHash": "sha256-WL1/3ywLEE/jmL2iIhCuscfuHQQo7MJpDFibjREkJrI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "217783e46fd199a033af8d488551c77b7019c752", "rev": "3b4758299ae17d01e5f073180cd3be3e6f0c73c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,11 +485,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1681347147, "lastModified": 1688951312,
"narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=", "narHash": "sha256-0oG4uv60m5+oOMqgYYQ3ao3OK3YP3n3t7nWFtuyR/uQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a9d9175ecc48ecd033062fa09b1834d13ae9c69", "rev": "2a5f6cac357616d2596167d0631b4ca729e9a3ea",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View File

@ -2,6 +2,7 @@
description = "Yoricks dotfiles"; description = "Yoricks dotfiles";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla"; nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
@ -32,7 +33,7 @@
config = { config = {
# todo remove, copilot.vim depends on it # todo remove, copilot.vim depends on it
permittedInsecurePackages = [ permittedInsecurePackages = [
"nodejs-slim-16.20.0" "nodejs-slim-16.20.1"
]; ];
allowUnfree = true; allowUnfree = true;
# chromium.vaapiSupport = true; # chromium.vaapiSupport = true;
@ -98,7 +99,7 @@
}; };
})) // { })) // {
overlays.default = nixpkgs.lib.composeManyExtensions [ overlays.default = nixpkgs.lib.composeManyExtensions [
nixpkgs-wayland.overlay #nixpkgs-wayland.overlay
nixpkgs-mozilla.overlay nixpkgs-mozilla.overlay
emacs-overlay.overlay emacs-overlay.overlay
agenix.overlays.default agenix.overlays.default
@ -108,6 +109,8 @@
(final: prev: { (final: prev: {
flake-inputs = inputs; flake-inputs = inputs;
nix-npm-buildpackage = nix-npm-buildpackage.legacyPackages."${final.system}"; nix-npm-buildpackage = nix-npm-buildpackage.legacyPackages."${final.system}";
inherit (nixpkgs-wayland.packages.${final.system}) wldash;
}) })
(import ./nixos/overlay.nix) (import ./nixos/overlay.nix)
]; ];

15
home-manager/desktop.nix
View File

@ -118,6 +118,11 @@ in {
bg = bg.desktop; bg = bg.desktop;
max_render_time = "4"; max_render_time = "4";
}; };
output."HYC CO., LTD. Unknown" = {
position = "0 0";
bg = bg.desktop;
max_render_time = "4";
};
output."HYC CO., LTD. DUAL-DVI" = { output."HYC CO., LTD. DUAL-DVI" = {
position = "0 0"; position = "0 0";
bg = bg.desktop; bg = bg.desktop;
@ -236,7 +241,11 @@ in {
enable = true; enable = true;
indicator = true; indicator = true;
}; };
systemd.user.services.kdeconnect-indicator.Unit.After = [ "waybar.service" ]; programs.obs-studio = {
enable = true;
plugins = [ pkgs.obs-studio-plugins.wlrobs ];
};
# systemd.user.services.kdeconnect-indicator.Unit.After = [ "waybar.service" ];
home.packages = with pkgs; [ home.packages = with pkgs; [
gtk-engine-murrine gtk-engine-murrine
hicolor-icon-theme hicolor-icon-theme
@ -252,8 +261,6 @@ in {
grim grim
element-desktop-wayland element-desktop-wayland
libreoffice libreoffice
obs-studio
obs-wlrobs
fixed_slack fixed_slack
slurp slurp
sway-contrib.grimshot sway-contrib.grimshot
@ -267,7 +274,7 @@ in {
# zoom-us # zoom-us
bin.y-cal-widget bin.y-cal-widget
obsidian obsidian
xwaylandvideobridge #xwaylandvideobridge
]; ];
xdg.desktopEntries.element = { xdg.desktopEntries.element = {

3
nixos/machines/blackadder/default.nix
View File

@ -43,6 +43,9 @@ in
judith = { judith = {
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = sshkeys.judith; openssh.authorizedKeys.keys = sshkeys.judith;
# packages = with pkgs; [
# git cmake gnumake gcc python3 python3.pkgs.pip screen vim
# ];
}; };
}; };

1
nixos/machines/frumar/default.nix
View File

@ -87,6 +87,7 @@
enable = true; enable = true;
openFirewall = true; openFirewall = true;
}; };
systemd.services.plex.after = [ "data-plexmedia.mount" ];
services.iperf3 = { services.iperf3 = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;

1
nixos/machines/pennyworth/default.nix
View File

@ -93,7 +93,6 @@ in {
proxy_buffering off; proxy_buffering off;
''; '';
}; };
"media.yori.cc" = sslforward "http://${vpn.ips.frumar}:32001";
}; };
networking.firewall.allowedUDPPorts = [ 31790 ]; # wg networking.firewall.allowedUDPPorts = [ 31790 ]; # wg
networking.firewall.allowedTCPPorts = [ 60307 ]; # weechat relay networking.firewall.allowedTCPPorts = [ 60307 ]; # weechat relay

7
nixos/roles/workstation.nix
View File

@ -66,8 +66,11 @@
alsa.support32Bit = true; # todo: support32bit? alsa.support32Bit = true; # todo: support32bit?
pulse.enable = true; pulse.enable = true;
}; };
# attempted to get bluetooth battery indicator # bluetooth battery indicator
hardware.bluetooth.package = pkgs.bluez5-experimental; hardware.bluetooth = {
package = pkgs.bluez5-experimental;
settings.General.Experimental = true;
};
xdg.portal = { xdg.portal = {
enable = true; enable = true;
wlr.enable = true; wlr.enable = true;

9
pkgs/default.nix
View File

@ -44,6 +44,15 @@
xwaylandvideobridge = self.callPackage ./xwaylandvideobridge.nix {}; xwaylandvideobridge = self.callPackage ./xwaylandvideobridge.nix {};
timesync = self.flake-inputs.timesync.packages.${self.system}.default; timesync = self.flake-inputs.timesync.packages.${self.system}.default;
wl-clipboard = super.wl-clipboard.overrideAttrs (o: { wl-clipboard = super.wl-clipboard.overrideAttrs (o: {
# todo (upgrade): remove version override on nixos-23.11
src = super.fetchFromGitHub {
owner = "bugaevc";
repo = "wl-clipboard";
rev = "61d5fa34b4722a1fb3ce7a83e2dbc413ffef863f";
sha256 = "sha256-RxBW4In2ATAJ4v/cppXwwbNP6V9WgEI7GkHA6CHYQ24=";
};
version = "2023-05-03";
# todo: upstream
patches = (o.patches or []) ++ [ patches = (o.patches or []) ++ [
(self.fetchpatch { (self.fetchpatch {
url = "https://puck.moe/up/zapap-suhih.patch"; url = "https://puck.moe/up/zapap-suhih.patch";