diff --git a/common.nix b/common.nix index 3f8212e..c7cd1be 100644 --- a/common.nix +++ b/common.nix @@ -33,6 +33,7 @@ with builtins; { config = { allowUnfree = true; permittedInsecurePackages = [ + "electron-27.3.11" "nodejs-16.20.0" ]; }; diff --git a/flake.lock b/flake.lock index f419783..47c7a76 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1722148092, - "narHash": "sha256-5QS64rfIFDzU1jmZrOK6wyZOCi6Vn/90apWRI6Hy+xk=", + "lastModified": 1722320953, + "narHash": "sha256-DfGaJtgrzcwPQYLTvjL1KaVIjpvi85b2MpM6yEGvJzM=", "owner": "nix-community", "repo": "fenix", - "rev": "b39d8959f286dc7b9da91ae92f6af56de0169e87", + "rev": "483df76def3e5010d709aa3a0418ba2088503994", "type": "github" }, "original": { @@ -104,16 +104,15 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1721054193, - "narHash": "sha256-xonM9t7oZ8YiwcEXuVlhs+8FsMSXI42djzUgpDt1n/w=", - "owner": "pascalkuthe", + "lastModified": 1722305447, + "narHash": "sha256-2jG85FHBhKeoF8vNUkCHflrliuC8HCaMOzmERct9imc=", + "owner": "helix-editor", "repo": "helix", - "rev": "386fa371d708f8e91a83762dfc7a58971681e091", + "rev": "ce809fb9ef4c5af59b5401419a2e8ae6964c8229", "type": "github" }, "original": { - "owner": "pascalkuthe", - "ref": "inline-diagnostics", + "owner": "helix-editor", "repo": "helix", "type": "github" } @@ -125,11 +124,11 @@ ] }, "locked": { - "lastModified": 1722119539, - "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", + "lastModified": 1722321190, + "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", + "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", "type": "github" }, "original": { @@ -141,27 +140,22 @@ "lix": { "flake": false, "locked": { - "lastModified": 1714955862, - "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", - "ref": "refs/tags/2.90-beta.1", - "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", - "revCount": 15501, - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "lastModified": 1722357433, + "narHash": "sha256-bv8oI8t46KXY6elO4n0R9P3SPBLtuJFMYm0oDxLD/90=", + "rev": "97a389b0bee7baf2d445121afa6ec84bef3a4bd7", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/97a389b0bee7baf2d445121afa6ec84bef3a4bd7.tar.gz" }, "original": { - "ref": "refs/tags/2.90-beta.1", - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" } }, "lix-module": { "inputs": { "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], + "lix": "lix", "nixpkgs": [ "nixpkgs" ] @@ -183,7 +177,7 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1701030348, + "lastModified": 1709065070, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" @@ -211,11 +205,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -241,11 +235,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1722179153, - "narHash": "sha256-ZJ75T0GWpLI4hoaL+YxueHD2pXG+VYpYtPJdwbkERVs=", + "lastModified": 1722309256, + "narHash": "sha256-Eqlu/hisMWE51b9YeKqehNaHLPhZOmkFkrx+VzI5YcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dcfb2878c687e5eb5fcbc5116969c45c85be34e2", + "rev": "3fcada1050e3820241590679838954bacf7d38f8", "type": "github" }, "original": { @@ -260,7 +254,6 @@ "fenix": "fenix", "helix-inline-diags": "helix-inline-diags", "home-manager": "home-manager", - "lix": "lix", "lix-module": "lix-module", "mac-brcm-fw": "mac-brcm-fw", "nixos-hardware": "nixos-hardware", @@ -272,11 +265,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1722099723, - "narHash": "sha256-61f+rvQAObm/TuBEqYFNUTngm/wXcuNhGtQbAmfZVvY=", + "lastModified": 1722262053, + "narHash": "sha256-KxjkPVn9rQqYam6DhiN/V2NcMXtYW25maxkJoiVMpmE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a46788318cce3b62e14606f70a14896b223ee5ec", + "rev": "a021b85be57d34b1eed687fcafd5d5ec64b2d853", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 52c8181..fa735be 100644 --- a/flake.nix +++ b/flake.nix @@ -6,19 +6,14 @@ nixpkgs-stable.url = "nixpkgs/nixos-23.11"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; helix-inline-diags = { - url = "github:pascalkuthe/helix/inline-diagnostics"; + url = "github:helix-editor/helix"; inputs = { crane.follows = "crane"; nixpkgs.follows = "nixpkgs"; }; }; - lix = { - url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; - flake = false; - }; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module"; - inputs.lix.follows = "lix"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { @@ -63,8 +58,7 @@ crane-lib = crane.lib.${system}; rs-toolchain = with fenix.packages.${system}; combine [ - default.toolchain - rust-analyzer + complete.toolchain ]; # rs-platform = pkgs.makeRustPlatform { # cargo = rs-toolchain; diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index 79de2e1..248d870 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -9,6 +9,7 @@ }: { nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" + "electron-27.3.11" ]; imports = [ # Include the results of the hardware scan. diff --git a/modules/desktop-environment/audio.nix b/modules/desktop-environment/audio.nix index ca23387..e0ca3ed 100644 --- a/modules/desktop-environment/audio.nix +++ b/modules/desktop-environment/audio.nix @@ -16,10 +16,9 @@ playerctl pulseaudioFull - easyeffects cava helvum ]; hardware.pulseaudio.enable = pkgs.lib.mkForce false; - sound.mediaKeys.enable = true; + # sound.mediaKeys.enable = true; } diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 152db4e..63daa0d 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -115,7 +115,7 @@ in xfce.thunar xfce.tumbler xfce.thunar-archive-plugin - gnome.file-roller + file-roller # media/file viewers vlc mpv @@ -136,7 +136,7 @@ in gitg gpick qdirstat - ffmpeg_5 + ffmpeg_7-full # external libnotify