diff --git a/flake.lock b/flake.lock index 967da3e..4b811f3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,82 +1,5 @@ { "nodes": { - "edit": { - "inputs": { - "fenix": "fenix", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748618316, - "narHash": "sha256-NzkDNSFTVwoXX37n/+u7z93aUdPFIeh8+P7QhX7M8cw=", - "path": "/home/alice/projects/edit", - "type": "path" - }, - "original": { - "path": "/home/alice/projects/edit", - "type": "path" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "edit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1748414334, - "narHash": "sha256-pWLq78fWssxiRAvLQZnxKupUogR25u+28XS4lfxMMoE=", - "owner": "nix-community", - "repo": "fenix", - "rev": "1c050d9008ff9e934f8bb5298c902259ea2cb3f7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -84,11 +7,11 @@ ] }, "locked": { - "lastModified": 1770476834, - "narHash": "sha256-cyxgVsNfHnJ4Zn6G1EOzfTXbjTy7Ds9zMOsZaX7VZWs=", + "lastModified": 1774007980, + "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", "owner": "nix-community", "repo": "home-manager", - "rev": "6cee0821577643e0b34e2c5d9a90d0b1b5cdca70", + "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", "type": "github" }, "original": { @@ -99,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1774018263, + "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "2d4b4717b2534fad5c715968c1cece04a172b365", "type": "github" }, "original": { @@ -115,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -130,76 +53,9 @@ }, "root": { "inputs": { - "edit": "edit", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "tepid-client-services": "tepid-client-services" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1748389118, - "narHash": "sha256-5QJCzMtA2lBFNGou2dbFrGgWXxfL2O92oJoUnqeoNjI=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "4f7af13637a77ce1dc21e58fcd3f635efbfb43a7", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tepid-client-services": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769531178, - "narHash": "sha256-DOtk2BdGMdaJ6wQeMwDz6OA+pQ3BWvcfCRRLvbu4c/M=", - "path": "/home/alice/projects/tepid-client-services/", - "type": "path" - }, - "original": { - "path": "/home/alice/projects/tepid-client-services/", - "type": "path" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index eaa9a56..11a2873 100644 --- a/flake.nix +++ b/flake.nix @@ -15,15 +15,15 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - edit = { - url = "path:/home/alice/projects/edit"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # edit = { + # url = "path:/home/alice/projects/edit"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; - tepid-client-services = { - url = "path:/home/alice/projects/tepid-client-services/"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # tepid-client-services = { + # url = "path:/home/alice/projects/tepid-client-services/"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; @@ -33,9 +33,7 @@ nixpkgs, # lix-module, home-manager, - nixos-hardware, - edit, - tepid-client-services + nixos-hardware }: let system = "x86_64-linux"; @@ -55,7 +53,7 @@ name = hostname; value = nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { inherit edit tepid-client-services; }; + # specialArgs = { inherit ; }; modules = defaultModules ++ modules; }; }; diff --git a/scripts/changebrightness.sh b/scripts/changebrightness.sh index 8472193..8d0c1f0 100644 --- a/scripts/changebrightness.sh +++ b/scripts/changebrightness.sh @@ -4,7 +4,8 @@ bright=`brightnessctl g` state=-1 # thresh=(0 1 3 5 9 15 27 48 84 147 255) # generated using floor(256^x-1) # thresh=(0 26 51 77 102 128 153 179 204 230 255) # generated using floor(256*x-1) -thresh=(0 19 39 60 81 103 126 151 180 214 255) # generated using floor(64^x+192*x-1) +# thresh=(0 19 39 60 81 103 126 151 180 214 255) # generated using floor(64^x+192*x-1) +thresh=(0 4916 9836 14762 19708 24703 29827 35296 41673 50444 65535) # generated using floor(64^x+192*x-1) for i in ${!thresh[@]}; do if [[ $bright -ge ${thresh[$i]} ]]