From 5a3c67053c533af4c43ed6cd138b7b89e3bb0ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 14 Apr 2024 18:05:13 +0100 Subject: [PATCH] add ffmpeg and mendeley --- flake.lock | 60 +++++++++++++++++----------------- nixos/boxes/foryog/default.nix | 13 +------- nixos/gui/default.nix | 2 +- nixos/home-manager/cli.nix | 5 +-- 4 files changed, 35 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 857915cf..17a35c73 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1712325259, - "narHash": "sha256-9PipXYv1Ek1oi0WrGZYtlvnjoYS20QdSLLpJ+nHEbjE=", + "lastModified": 1712947906, + "narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=", "owner": "nix-community", "repo": "disko", - "rev": "fbbac1aee6eae60c32b47e95447c4a3ec59d9773", + "rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712310787, - "narHash": "sha256-v6VWGeAxpvsw+ezK5Zdcy/bDtK34ilsZCzvU7jT1ecc=", + "lastModified": 1713054897, + "narHash": "sha256-1RpjL4Erczw5Q1szSd543w+F1jsj5bXp2a74cpiyqIg=", "owner": "helix-editor", "repo": "helix", - "rev": "a2ee2e66f2725fbd2d595d43c58ebf43ef9e9383", + "rev": "9df1266376323b3dae07e48bd1e64463d3aec1dd", "type": "github" }, "original": { @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1712317700, - "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=", + "lastModified": 1713077896, + "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", "owner": "nix-community", "repo": "home-manager", - "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f", + "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712324865, - "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=", + "lastModified": 1712909959, + "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", + "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "type": "github" }, "original": { @@ -324,11 +324,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1712326628, - "narHash": "sha256-nBt269/aYBEMnU0d0JtgdE6b+XYvOPc/iqaekMGbRsc=", + "lastModified": 1713084354, + "narHash": "sha256-QKtRsAcq/7CplQGXwTgJUgaI6E+E7fmZ7+r+n+E9p4E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a2d89a642706646cc8318cfc5344b5ef38eef4b", + "rev": "32d9e07959a285ff73ffcd55a7be694649d585c0", "type": "github" }, "original": { @@ -340,11 +340,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -356,11 +356,11 @@ }, "nixpkgs-rust-analyzer": { "locked": { - "lastModified": 1712326628, - "narHash": "sha256-nBt269/aYBEMnU0d0JtgdE6b+XYvOPc/iqaekMGbRsc=", + "lastModified": 1713084354, + "narHash": "sha256-QKtRsAcq/7CplQGXwTgJUgaI6E+E7fmZ7+r+n+E9p4E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a2d89a642706646cc8318cfc5344b5ef38eef4b", + "rev": "32d9e07959a285ff73ffcd55a7be694649d585c0", "type": "github" }, "original": { @@ -372,11 +372,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1712168706, - "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", + "lastModified": 1712867921, + "narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", + "rev": "51651a540816273b67bc4dedea2d37d116c5f7fe", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nur": { "locked": { - "lastModified": 1712320566, - "narHash": "sha256-F/NR0Xf/AU21Nbtrni+6i+7C4dBKg9MNg7qrOmPRy6M=", + "lastModified": 1713081784, + "narHash": "sha256-t0RoW0DTQQ8MaQ6DXbkOZtPapv9rNZa5UYwOan5Th/k=", "owner": "nix-community", "repo": "NUR", - "rev": "9ac97db2225dd90fc37c91fb6c91f2a10d331783", + "rev": "34dd0b90d8075657d7816e31f3955fcc958e22f7", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1711855048, - "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=", + "lastModified": 1713066950, + "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10", + "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87", "type": "github" }, "original": { diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix index b5099690..df4df977 100644 --- a/nixos/boxes/foryog/default.nix +++ b/nixos/boxes/foryog/default.nix @@ -41,18 +41,7 @@ programs.ccache.enable = true; hardware.opengl.extraPackages = with pkgs; [ libva ]; programs.steam.enable = true; - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "spotify" - "steam" - "steam-original" - "steam-runtime" - "steam-run" - "vscode-extension-ms-vscode-cpptools" - "vscode-with-extensions" - "vscode" - "veracrypt" - ]; + nixpkgs.config.allowUnfree = true; home-manager.users.cyryl = { ... }: { imports = [ ../../home-manager/programs/kitty.nix ]; diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 0cb92a76..039752bb 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -28,7 +28,6 @@ eog evince fontconfig - freecad ghidra-bin gimp glxinfo @@ -41,6 +40,7 @@ libreoffice logseq mediainfo + mendeley mindforger modem-manager-gui nautilus diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix index 5dbd9293..500bd0bc 100644 --- a/nixos/home-manager/cli.nix +++ b/nixos/home-manager/cli.nix @@ -23,6 +23,7 @@ esptool exercism fd + ffmpeg file fontconfig fossil @@ -36,10 +37,10 @@ jpeginfo jq nix-du - nixfmt nix-index - nixpkgs-fmt nix-top + nixfmt + nixpkgs-fmt nmap nvd ripgrep-all