From 95415188b56c703b4a8c4d1f00947bf114c3f3d6 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Tue, 17 Dec 2024 11:13:38 -0600 Subject: [PATCH] removed small channel logic, declared inputs follows --- flake.lock | 223 +++++++++++------------------------ flake.nix | 57 +++++---- modules/shell/multimedia.nix | 2 +- 3 files changed, 104 insertions(+), 178 deletions(-) diff --git a/flake.lock b/flake.lock index 630b811..6e535c3 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1731959031, - "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", + "lastModified": 1734400729, + "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", + "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", "type": "github" }, "original": { @@ -36,17 +36,17 @@ "cpu-microcodes": { "flake": false, "locked": { - "lastModified": 1733678768, - "narHash": "sha256-Ar2rEPOEMr69BDdQsqsLbspHMZFIWfsL/6VjbhbrboA=", + "lastModified": 1734191706, + "narHash": "sha256-fdS2hRAgWEukflu2eOpCXe3cVg0L0lcRqdxbLOiMZg0=", "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "cec026c72d15f7f39b30e9e848bb6c41eab7b754", + "rev": "bebd9ed9a3c3c21996eb77373d3408296b0b9d3d", "type": "github" }, "original": { "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "cec026c72d15f7f39b30e9e848bb6c41eab7b754", + "rev": "bebd9ed9a3c3c21996eb77373d3408296b0b9d3d", "type": "github" } }, @@ -129,14 +129,16 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -161,11 +163,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734364709, + "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", "type": "github" }, "original": { @@ -190,11 +192,11 @@ ] }, "locked": { - "lastModified": 1733248371, - "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=", + "lastModified": 1733684019, + "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13", + "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", "type": "github" }, "original": { @@ -213,17 +215,19 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1734306854, - "narHash": "sha256-wcj5lg2AjUS5oH8ohhNT2g1cIA+9WnbE8ihW6R7Vi0Q=", + "lastModified": 1734453087, + "narHash": "sha256-z066gEEaPRLZiN6KI4celbT5OFt1vPvK/8F+xUUGFNo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "de3ad245dcbcd42c88e9afc48264bdb8f2356c15", + "rev": "e2c78c00e50a0835c3830c8a0cd82049dc5700b8", "type": "github" }, "original": { @@ -273,11 +277,11 @@ ] }, "locked": { - "lastModified": 1733472316, - "narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=", + "lastModified": 1733940128, + "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2", + "rev": "3833097e50473a152dd614d4b468886840b4ea78", "type": "github" }, "original": { @@ -302,11 +306,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1734364628, + "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", "type": "github" }, "original": { @@ -327,11 +331,11 @@ ] }, "locked": { - "lastModified": 1732288281, - "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", + "lastModified": 1734384247, + "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", + "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", "type": "github" }, "original": { @@ -352,11 +356,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1734384417, + "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", "type": "github" }, "original": { @@ -367,7 +371,7 @@ }, "jawz-scripts": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1734312686, @@ -386,15 +390,17 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "umu": "umu" }, "locked": { - "lastModified": 1734227443, - "narHash": "sha256-uGHvI5ZAyyFHWivClGk3Ohzn2Re94o/o2yGbFwxQGBk=", + "lastModified": 1734313951, + "narHash": "sha256-DCjhmX5dVn11J8Ss+5Py4yMh8k7a63HakMENccGZBr4=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "ea1ee2aec319b1262d067ffb539d94e010af9ca2", + "rev": "a5f8dee3f7e6864da0d69a227bc8a90a3cbf9d0f", "type": "github" }, "original": { @@ -405,18 +411,14 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, + "lastModified": 0, "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", - "type": "github" + "path": "/nix/store/vqhkmj60457j8nrw9vb94ln40rkic1p6-source", + "type": "path" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-lib": { @@ -431,22 +433,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, - "nixpkgs-small": { - "locked": { - "lastModified": 1734274429, - "narHash": "sha256-wl9o+8lyLxU182xws0yNo4odQNVaH8w7a7DzrcbZiSk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "539eaf79a5abc7efc5463dcc267d91e6ee4c3b49", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -464,50 +450,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 0, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", - "path": "/nix/store/vqhkmj60457j8nrw9vb94ln40rkic1p6-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1733935885, - "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1734119587, "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", @@ -523,50 +465,20 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": [ + "nixpkgs" + ], "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734311223, - "narHash": "sha256-Z4tO9UaMYP1BdIpVj2zEhbmDakeME18ZDQnbl/SEj8Y=", + "lastModified": 1734454139, + "narHash": "sha256-x+oXLV5NzK+gLy/VY1O5U5EIJzks6NCiv6Np2tZ368Y=", "owner": "nix-community", "repo": "nur", - "rev": "aad4a65913445ed9cb6496b79bcc75e303523208", + "rev": "5f37c66585d5c978b2f42ac5a23dd74f215a0b30", "type": "github" }, "original": { @@ -586,11 +498,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1734379367, + "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", "type": "github" }, "original": { @@ -605,8 +517,7 @@ "hyprland": "hyprland", "jawz-scripts": "jawz-scripts", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_5", - "nixpkgs-small": "nixpkgs-small", + "nixpkgs": "nixpkgs_2", "nur": "nur", "sops-nix": "sops-nix", "ucodenix": "ucodenix" @@ -614,7 +525,9 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1733965552, @@ -671,11 +584,11 @@ "cpu-microcodes": "cpu-microcodes" }, "locked": { - "lastModified": 1734096298, - "narHash": "sha256-oomfM3+C9DDqsDGCXLUmgCYureNbRh7BXCT1X7TZkRg=", + "lastModified": 1734353399, + "narHash": "sha256-d2Pc1JUcwRRI5nt5Jk5+teIjhLhUaq8i4r2FGuE5/bE=", "owner": "e-tho", "repo": "ucodenix", - "rev": "e88dfdc91f22093054a82443675bed1b556e20e0", + "rev": "a70edcafd9a93b8df1d32e664de921669420024e", "type": "github" }, "original": { @@ -737,11 +650,11 @@ ] }, "locked": { - "lastModified": 1733157064, - "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=", + "lastModified": 1734422917, + "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f", + "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b7c09b5..a8b4e8d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,34 @@ description = "JawZ NixOS flake setup"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; - nur.url = "github:nix-community/nur"; - ucodenix.url = "github:e-tho/ucodenix"; - nix-gaming.url = "github:fufexan/nix-gaming"; - hyprland.url = "github:hyprwm/Hyprland"; - home-manager.url = "github:nix-community/home-manager"; - sops-nix.url = "github:Mic92/sops-nix"; - jawz-scripts.url = "git+ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git"; + nur = { + url = "github:nix-community/nur"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + ucodenix = { + url = "github:e-tho/ucodenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-gaming = { + url = "github:fufexan/nix-gaming"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + jawz-scripts = { + url = "git+ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -17,25 +37,18 @@ let inherit (self) outputs; system = "x86_64-linux"; - makePkgs = - repo: - import repo { - inherit system; - config.allowUnfree = true; - }; + pkgs = import inputs.nixpkgs { + inherit system; + config.allowUnfree = true; + }; + overlayFile = import ./overlay.nix { inherit pkgs; }; + lib = inputs.nixpkgs.lib // inputs.home-manager.lib; createConfig = name: - let - useGUI = name == "workstation"; - nixpkgsSelect = if useGUI then inputs.nixpkgs else inputs.nixpkgs-small; - pkgs = nixpkgsSelect |> makePkgs; - overlayFile = import ./overlay.nix { inherit pkgs; }; - lib = nixpkgsSelect.lib // inputs.home-manager.lib; - in lib.nixosSystem { inherit system; specialArgs = { - inherit inputs outputs; + inherit inputs outputs pkgs; }; modules = [ { nixpkgs.overlays = [ overlayFile ]; } diff --git a/modules/shell/multimedia.nix b/modules/shell/multimedia.nix index 40bd256..aed4d83 100644 --- a/modules/shell/multimedia.nix +++ b/modules/shell/multimedia.nix @@ -16,7 +16,7 @@ yt-dlp # downloads videos from most video websites ffmpeg # not ffmpreg, the coolest video conversion tool! imagemagick # photoshop what?? - ffpb # make ffmpeg encoding... a bit fun + # ffpb # make ffmpeg encoding... a bit fun ; }; };