Update flake

This commit is contained in:
Invariantspace 2024-09-22 00:44:00 -07:00
parent 01999335ea
commit 8d0d943d4e
No known key found for this signature in database
GPG key ID: EBC4A20067373921
5 changed files with 74 additions and 96 deletions

View file

@ -106,7 +106,7 @@ in {
background_opacity = "0.96"; background_opacity = "0.96";
remember_window_size = "no"; remember_window_size = "no";
}; };
theme = "Tokyo Night Moon"; themeFile = "tokyo_night_moon";
}; };
plasma = { plasma = {
enable = osConfig.services.desktopManager.plasma6.enable; enable = osConfig.services.desktopManager.plasma6.enable;

123
flake.lock generated
View file

@ -19,11 +19,11 @@
"candy-icons": { "candy-icons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723591882, "lastModified": 1724623392,
"narHash": "sha256-XAB+Ai7r5n/125mmkc/J0J1aPjFgQGeRPT+vc2LP6cE=", "narHash": "sha256-0wsSjK8WrwM/yh40a76cYblbv52tdJGTKAdxNU43frc=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "eba39aed603a255ed756ed601e87349561217ef0", "rev": "b92b133d0ad7ed5b5e376bd00216a05652277209",
"revCount": 1211, "revCount": 1217,
"type": "git", "type": "git",
"url": "https://github.com/EliverLara/candy-icons" "url": "https://github.com/EliverLara/candy-icons"
}, },
@ -37,11 +37,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1726325969, "lastModified": 1726842196,
"narHash": "sha256-Mlw7009cdFry9OHpS6jy294lXhb+gcRa0iS2hYhkC6s=", "narHash": "sha256-u9h03JQUuQJ607xmti9F9Eh6E96kKUAGP+aXWgwm70o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3632080c41d7a657995807689a08ef6c4bcb2c72", "rev": "51994df8ba24d5db5459ccf17b6494643301ad28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,11 +141,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1725885300, "lastModified": 1726905744,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,11 +159,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1726308872, "lastModified": 1726985855,
"narHash": "sha256-d4vwO5N4RsLnCY7k5tY9xbdYDWQsY3RDMeUoIa4ms2A=", "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6c1a461a444e6ccb3f3e42bb627b510c3a722a57", "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +199,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1726115155, "lastModified": 1726982842,
"narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", "narHash": "sha256-ePXZ+VRceMVy8T0Cg6vCuF1l73ko+n2sgeG6od4u2/E=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", "rev": "d71bcb4cbc45b7a4a79cb5188fe3d2adcc52d520",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,17 +242,16 @@
"sweet-ambar-blue-dark": "sweet-ambar-blue-dark", "sweet-ambar-blue-dark": "sweet-ambar-blue-dark",
"sweet-folders": "sweet-folders", "sweet-folders": "sweet-folders",
"sweet-kde": "sweet-kde", "sweet-kde": "sweet-kde",
"wallpaper-engine-plasma5-plugin": "wallpaper-engine-plasma5-plugin",
"wallpaper-engine-plasma6-plugin": "wallpaper-engine-plasma6-plugin", "wallpaper-engine-plasma6-plugin": "wallpaper-engine-plasma6-plugin",
"yorha-grub-theme": "yorha-grub-theme", "yorha-grub-theme": "yorha-grub-theme",
"yorha-sound-theme": "yorha-sound-theme" "yorha-sound-theme": "yorha-sound-theme"
}, },
"locked": { "locked": {
"lastModified": 1723604710, "lastModified": 1726450467,
"narHash": "sha256-/h5FHkEDl8YCwSUqxeoS29ZAo4FOZWHcRBKZKi+zpiE=", "narHash": "sha256-+FyQrMB+WvLZZrWHeKXwH2dbBle+Fo+4UsHmPWljh8c=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b7bde14d75173b987b6b6be016434c18c2bd09a1", "rev": "246483e3d922e3769b9d28e842e30a84140fcdd1",
"revCount": 25, "revCount": 26,
"type": "git", "type": "git",
"url": "https://forgejo.invariantspace.com/macronova/nix-custom" "url": "https://forgejo.invariantspace.com/macronova/nix-custom"
}, },
@ -348,11 +347,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1726755586,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,11 +363,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1723991338, "lastModified": 1726755586,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba", "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -395,11 +394,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1723362943, "lastModified": 1726243404,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d", "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -411,11 +410,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1726062873, "lastModified": 1726755586,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +478,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1725914634, "lastModified": 1726955367,
"narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", "narHash": "sha256-+RNT92e6I4s4q/SLdzlMrPQrxalOmNwnEt6zcYo4j84=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "60becd0e994e25b372c8d0500fc944396f6c1085", "rev": "7fb80fea2373c3cc9f05a84204ad0b3233464b17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -500,11 +499,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1725513492, "lastModified": 1726745158,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +533,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1726218807, "lastModified": 1726524647,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,11 +549,11 @@
"sweet-ambar-blue": { "sweet-ambar-blue": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723587745, "lastModified": 1725663625,
"narHash": "sha256-IdOwZM+r9yiWaNnobVGtMjGLGHjQHH0sf/yCFUxIT+0=", "narHash": "sha256-H6TEFHxGK/W39eR95v6dwBu7XyzsvajpD/Vn28fc0aI=",
"ref": "Ambar-Blue", "ref": "Ambar-Blue",
"rev": "e133a6b40b0a5d5c8c2163de9b36150b285d15f2", "rev": "2a5fc9cb672ecfd1f2a6f1f1d289a665891336f0",
"revCount": 294, "revCount": 297,
"type": "git", "type": "git",
"url": "https://github.com/EliverLara/Sweet" "url": "https://github.com/EliverLara/Sweet"
}, },
@ -567,11 +566,11 @@
"sweet-ambar-blue-dark": { "sweet-ambar-blue-dark": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723587757, "lastModified": 1725663779,
"narHash": "sha256-qrbf1vrFgCxM8p5zAZvYCeoZlG6Mfy9UUbLx9PKUiKM=", "narHash": "sha256-ffQGwPhXHOZDhC/F1Enj0zMzbaXRkVbUkok3KfWZycY=",
"ref": "Ambar-Blue-Dark", "ref": "Ambar-Blue-Dark",
"rev": "b96bed2f0a22c4431f944489bb37a45bc16e9300", "rev": "ea071eb2979cd2bc5f9f2a352ab8534279d3c77e",
"revCount": 378, "revCount": 381,
"type": "git", "type": "git",
"url": "https://github.com/EliverLara/Sweet" "url": "https://github.com/EliverLara/Sweet"
}, },
@ -644,24 +643,6 @@
"type": "github" "type": "github"
} }
}, },
"wallpaper-engine-plasma5-plugin": {
"flake": false,
"locked": {
"lastModified": 1710844534,
"narHash": "sha256-zVXvyUiigqIOKBKBv82SyjrEnoCNrc+o9Rkc8JXQt98=",
"ref": "refs/heads/main",
"rev": "34f7f01acba3bc8f94d478032cf86aef06b02d26",
"revCount": 572,
"submodules": true,
"type": "git",
"url": "https://github.com/catsout/wallpaper-engine-kde-plugin"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://github.com/catsout/wallpaper-engine-kde-plugin"
}
},
"wallpaper-engine-plasma6-plugin": { "wallpaper-engine-plasma6-plugin": {
"flake": false, "flake": false,
"locked": { "locked": {

View file

@ -3,10 +3,7 @@
lib, lib,
... ...
}: { }: {
boot = { boot.loader.grub.zfsSupport = true;
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
loader.grub.zfsSupport = true;
};
services.zfs = { services.zfs = {
autoScrub.enable = true; autoScrub.enable = true;

View file

@ -1,8 +1,5 @@
{config, ...}: { {...}: {
boot = { boot.loader.grub.zfsSupport = true;
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
loader.grub.zfsSupport = true;
};
services.zfs = { services.zfs = {
autoScrub.enable = true; autoScrub.enable = true;

View file

@ -7,21 +7,24 @@
userName = config.constants.userName; userName = config.constants.userName;
jovianPkgs = pkgs.extend inputs.jovian.overlays.default; jovianPkgs = pkgs.extend inputs.jovian.overlays.default;
in { in {
home-manager.users.${userName} = { home-manager.users.${userName} = {config, ...}: {
home.packages = with jovianPkgs; [ home = {
feishin file.".local/share/fonts".source = config.lib.file.mkOutOfStoreSymlink "/run/current-system/sw/share/X11/fonts";
lutris packages = with jovianPkgs; [
maliit-keyboard feishin
(retroarch.override { lutris
cores = with libretro; [ maliit-keyboard
pcsx2 (retroarch.override {
ppsspp cores = with libretro; [
]; pcsx2
}) ppsspp
ryujinx ];
winetricks })
wineWowPackages.stagingFull ryujinx
]; winetricks
wineWowPackages.stagingFull
];
};
}; };
jovian = { jovian = {
devices.steamdeck = { devices.steamdeck = {