From 7ec27350298d4baa6b07064e43433f1c6b20055b Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sun, 8 Sep 2024 13:08:26 -0600 Subject: [PATCH] flake update && jellyfin lock removed --- flake.lock | 115 ++++++++++++++++++++++------------------------------ flake.nix | 7 +--- overlay.nix | 3 +- 3 files changed, 52 insertions(+), 73 deletions(-) diff --git a/flake.lock b/flake.lock index 51d4ade..84b48b7 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1725024810, - "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { @@ -77,29 +77,13 @@ "type": "github" } }, - "jellyfin": { - "locked": { - "lastModified": 1719516056, - "narHash": "sha256-fk+tniEoJmXVfLQjhKWjAl/Z+cExI00h66PrmQHujI0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c82ad1b10b310442e685bc150199747fdee92095", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c82ad1b10b310442e685bc150199747fdee92095", - "type": "github" - } - }, "master": { "locked": { - "lastModified": 1725405699, - "narHash": "sha256-XNwZMspHYr8FNcEyq9s/E0fRsVcQvT+Gujw2vk2ojcg=", + "lastModified": 1725821660, + "narHash": "sha256-FY+8ZVou1vY1/4T9U8C5PR/A+6WveGc+DX0nWwTtRJo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "344e3016dc155ac5ca981d628948ef994bec9921", + "rev": "8588b1599e97c318949300fe973c3b5ffee7406e", "type": "github" }, "original": { @@ -116,11 +100,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1725154929, - "narHash": "sha256-AONhBZQgiJb/teEJF7PV6EpyLLpF2ddSbY7HJNdFSxw=", + "lastModified": 1725759635, + "narHash": "sha256-ud4X/spA6YV0po5UgKOA7R2qHl/pimWHzgs0NXPgh84=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "76446e879c956930a7f5f6f1d0440b3df67e0dda", + "rev": "ec0bcaccd0026422f35d0ef17e91cff61bdcc805", "type": "github" }, "original": { @@ -139,15 +123,15 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724271552, - "narHash": "sha256-xn0dC4M3mfItxP+s3/v3Hz/CSKp74VH/gMfufKxl9/4=", - "owner": "Mic92", + "lastModified": 1725635983, + "narHash": "sha256-haSfwdurfltqQ/7YEmDcmWLnWwvAgelIHnXsHG34P1k=", + "owner": "lilyinstarlight", "repo": "nix-update", - "rev": "737121eccb67542e8c004c64da833fede2e80c64", + "rev": "ed54a7546affb3f8c9c3e10a6fa6fdb21756ec8f", "type": "github" }, "original": { - "owner": "Mic92", + "owner": "lilyinstarlight", "repo": "nix-update", "type": "github" } @@ -163,11 +147,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725378328, - "narHash": "sha256-Yohx+vneB71yrDcELds1Bcd/TIdp3mI85ivhbsOGATU=", + "lastModified": 1725750857, + "narHash": "sha256-AMMyY/PR3nIEQh41qPyBsGm0OJIcA7tn7Ggw1nT1Zao=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "b5e43cc6ced74afc64a54260ac6319124b79d684", + "rev": "adfdee861bb4943e1e32c930d045593806f88339", "type": "github" }, "original": { @@ -178,11 +162,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725099143, - "narHash": "sha256-CHgumPZaC7z+WYx72WgaLt2XF0yUVzJS60rO4GZ7ytY=", + "lastModified": 1725534445, + "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5629520edecb69630a3f4d17d3d33fc96c13f6fe", + "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", "type": "github" }, "original": { @@ -194,23 +178,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1725407940, + "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "type": "github" }, "original": { @@ -222,11 +206,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "type": "github" }, "original": { @@ -238,11 +222,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1725693463, + "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "68e7dce0a6532e876980764167ad158174402c6f", "type": "github" }, "original": { @@ -255,7 +239,6 @@ "root": { "inputs": { "home-manager": "home-manager", - "jellyfin": "jellyfin", "master": "master", "nix-gaming": "nix-gaming", "nixos-cosmic": "nixos-cosmic", @@ -272,11 +255,11 @@ ] }, "locked": { - "lastModified": 1725243956, - "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", + "lastModified": 1725589472, + "narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", + "rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e", "type": "github" }, "original": { @@ -293,11 +276,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1725201042, - "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", + "lastModified": 1725765163, + "narHash": "sha256-rfd2c47iVSFI6bRYy5l8wRijRBaYDeU7dM8XCDUGqlA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", + "rev": "b68757cd2c3fa66d6ccaa0d046ce42a9324e0070", "type": "github" }, "original": { @@ -337,11 +320,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1724179424, - "narHash": "sha256-2r2y1p9YQuaWCxuFj45MVRqJ/uWglhzY5O9BW1jRXcg=", + "lastModified": 1725408497, + "narHash": "sha256-wyJPWwHzHpFwc9XP9nM/Lpbvahusp2NcUtWXlErGi1g=", "ref": "refs/heads/main", - "rev": "dd3105e4ceef83bdc9d7437139f9475325e2a66d", - "revCount": 700, + "rev": "2d3c948a51bc1d2880a90bf985947f9afc89e8d1", + "revCount": 713, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -355,11 +338,11 @@ }, "unstable": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3d9f8ec..05d7082 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,6 @@ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.05"; unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; master.url = "github:nixos/nixpkgs?ref=master"; - jellyfin.url = - "github:nixos/nixpkgs?rev=c82ad1b10b310442e685bc150199747fdee92095"; home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -21,7 +19,7 @@ }; }; - outputs = { self, nixpkgs, unstable, master, jellyfin, home-manager, sops-nix + outputs = { self, nixpkgs, unstable, master, home-manager, sops-nix , nixos-cosmic, ... }@inputs: let inherit (self) outputs; @@ -35,8 +33,7 @@ pkgs = makePkgs nixpkgs; pkgsU = makePkgs unstable; pkgsM = makePkgs master; - pkgsJ = makePkgs jellyfin; - overlays = [ (import ./overlay.nix { inherit pkgs pkgsU pkgsM pkgsJ; }) ]; + overlays = [ (import ./overlay.nix { inherit pkgs pkgsU pkgsM; }) ]; createConfig = name: { inherit system; specialArgs = { inherit inputs outputs; }; diff --git a/overlay.nix b/overlay.nix index 07452fa..94d0973 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgsU, pkgsM, pkgsJ }: +{ pkgs, pkgsU, pkgsM }: _self: super: { gnome = super.gnome.overrideScope (_gFinal: gPrev: { nautilus = gPrev.nautilus.overrideAttrs (nsuper: { @@ -21,7 +21,6 @@ _self: super: { nerdfonts = super.nerdfonts.override { fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ]; }; - inherit (pkgsJ) jellyfin; inherit (pkgsU) planify; inherit (pkgsU) gdtoolkit; inherit (pkgsU) ns-usbloader;