Compare commits

...
7 Commits
6 changed files with 55 additions and 50 deletions
Generated
+37 -37
View File
@@ -125,11 +125,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1786420971,
"narHash": "sha256-irKN0AY5fDS96h7z3Cjp3EB7OwTJU1SeWFb1GxnFu3E=",
"lastModified": 1788840136,
"narHash": "sha256-ej5jnQIfjbw4wwPzy8Y4ntG9F3asdF6YBkLqpYeGUxc=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "a56dfe072a448e664d208e9ed5f7f9dc9a720686",
"rev": "555b23e68256c5abfb8a85a385231830d1d7ad1f",
"type": "gitlab"
},
"original": {
@@ -174,11 +174,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1785627969,
"narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
"lastModified": 1788450739,
"narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
"rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
"type": "github"
},
"original": {
@@ -311,11 +311,11 @@
]
},
"locked": {
"lastModified": 1785119570,
"narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
"lastModified": 1788642154,
"narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
"rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab",
"type": "github"
},
"original": {
@@ -327,11 +327,11 @@
},
"import-tree": {
"locked": {
"lastModified": 1784254960,
"narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=",
"lastModified": 1788467110,
"narHash": "sha256-ljEMTXP/rH0tOvDzc9gzwww6KcHRPRnEHzd9lK48V7s=",
"owner": "vic",
"repo": "import-tree",
"rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69",
"rev": "eb1b52eaecc57f7c136d07ae8a93e724dfecac46",
"type": "github"
},
"original": {
@@ -349,11 +349,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1786414302,
"narHash": "sha256-FNGnUYud1D3BqE1JU2Uef+puLB2Rml7gKSdIGQOb550=",
"lastModified": 1788840747,
"narHash": "sha256-nZ6Yt+8u5NhPSP46VcYXEcu4cJpeOiR/K+lfyk3COVA=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "cacc8cd89550f0cbec7103f3db5e96d1a66c58e7",
"rev": "1e6052f5ecebddbbb2d372e0fe6f1b7bc4b95a9e",
"type": "github"
},
"original": {
@@ -383,11 +383,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1786437054,
"narHash": "sha256-I++HzBBAgQ17UaLVU6aSm1/7LDo6c9xr8rAbpByWywE=",
"lastModified": 1788860136,
"narHash": "sha256-MhPMOFV4pVkygWEbQ8t1De/uQ9cWF1u++tRe2L5tG48=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "6ed13b1d888d5cb07dbb0723eb1df86bbacd0b9c",
"rev": "62173785b9a18c78b4a15aca2623d02bceb9d077",
"type": "github"
},
"original": {
@@ -412,11 +412,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1785031560,
"narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
"lastModified": 1788057806,
"narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
"rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
"type": "github"
},
"original": {
@@ -442,11 +442,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1786247143,
"narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=",
"lastModified": 1788752844,
"narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "279b4a8275f032c566576b3f181fa0f27197f588",
"rev": "dc5d91f840324650bac8c379428c7037a416959a",
"type": "github"
},
"original": {
@@ -458,11 +458,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1786313170,
"narHash": "sha256-9BG7OgUWdu0ONDO5X2q6+K4bsuBITkX/3W4nNJu1Ito=",
"lastModified": 1788807765,
"narHash": "sha256-J9oC0bKnkXUrMegqRTXVkyDFJ0gn2U/Qpoo9HgGMQmA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fcb8fcd6bf2d0adecae5bd491afaaaf8311b758d",
"rev": "93108a538f079596c9a16c72cf03e9322782b6dd",
"type": "github"
},
"original": {
@@ -561,11 +561,11 @@
]
},
"locked": {
"lastModified": 1786375908,
"narHash": "sha256-G7qDAT98nywA4EFmJCwIRO5wKvDlBBN3BWpsOnjAto8=",
"lastModified": 1788337237,
"narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "d1337e05ba0a8e88a75d2c0e1595d82f3b3e2ac4",
"rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
"type": "github"
},
"original": {
@@ -582,11 +582,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1786252193,
"narHash": "sha256-a9SbkJWloPso00G4zIUkerd9n2qRyDYoDPeUc4O3ME8=",
"lastModified": 1788683578,
"narHash": "sha256-bERpuakmPAC2b36zgXy6OXh+SkZUjbaV+vV2sPmm6p8=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "a87616995724d27079b495ca07318512af799449",
"rev": "a4ef43fb13e3615f36e5a0935aabe8cc29363dc9",
"type": "github"
},
"original": {
@@ -635,11 +635,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1787486435,
"narHash": "sha256-eGq8eI1lYFwID8NSrQLbouNIDXZbvLAbqbZ9vvBUMa4=",
"lastModified": 1788884686,
"narHash": "sha256-wl0NGoryP5veIaRn6azmejz1JsTbwHlBU/MT/icTKQ4=",
"ref": "refs/heads/main",
"rev": "46e977acf5344bbf7b901df9e1b1aa69297ae8c7",
"revCount": 37,
"rev": "a827bd5eef0354f7e4fdca57383971ff6008b5d3",
"revCount": 42,
"type": "git",
"url": "https://git.jroeger.de/jonas/wordle-solver-rs"
},
+1 -1
View File
@@ -174,7 +174,7 @@
boot.plymouth.enable = true;
boot.initrd.systemd.enable = true;
boot.supportedFilesystems = ["ntfs"];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelPackages = pkgs.linuxPackages_7_1;
# Configure console keymap
console.keyMap = "de";
+4 -7
View File
@@ -269,13 +269,10 @@
))
(after! jj-mode
(map! :leader
(:prefix ("j" . "Jujutsu")
:desc "Log" "j" #'jj-log
:desc "Describe" "d" #'jj-describe
:desc "Abandon" "a" #'jj-abandon
:desc "New" "n" #'jj-new
(use-package! majutsu
:config (map! :leader
(:prefix ("j" . "majutsu")
:desc "Log" "j" #'majutsu-log
)))
+1 -1
View File
@@ -94,7 +94,7 @@
(package! tramp)
(package! graphviz-dot-mode)
(package! rainbow-delimiters)
(package! jj-mode :recipe (:host github :repo "bolivier/jj-mode.el"))
(package! majutsu :recipe (:host github :repo "0WD0/majutsu"))
(let ((package-dir (expand-file-name "packages.d" doom-user-dir)))
(when (file-directory-p package-dir)
+5 -1
View File
@@ -28,7 +28,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
pkg-config
];
#cargoHash = "sha256-3oMPREUWwKNEeaf8FdWHdjPMLU5xMSMzxKrmrhU+iko=";
checkFlags = [
"--skip"
"cli_should_start_server"
];
cargoLock.lockFile = "${finalAttrs.src}/Cargo.lock";
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
@@ -10,6 +10,8 @@ declare -rA presets=(
[storage-av1]="-c:v libsvtav1 -preset 6 -crf 28 -g 240 -svtav1-params tune=0:aq-mode=2 -c:a copy"
[storage-av1-1080p]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -c:v libsvtav1 -preset 6 -crf 28 -g 240 -svtav1-params tune=0:aq-mode=2 -c:a copy"
[storage-av1-nvenc]="-c:v av1_nvenc -cq 28 -preset slow -c:a copy"
[network-hevc]="-c:v libx265 -preset slower -crf 22 -x265-params aq-mode=3:aq-strength=1.0:psy-rd=1.8:psy-rdoq=1.0 -pix_fmt yuv420p -c:a aac -b:a 128k"
[network-hevc-faster]="-c:v libx265 -preset slow -crf 26 -x265-params aq-mode=3:aq-strength=1.0:psy-rd=1.8:psy-rdoq=1.0 -pix_fmt yuv420p -c:a aac -b:a 128k"
[network]="-c:v libx264 -preset slow -crf 22 -pix_fmt yuv420p -c:a aac -b:a 128k"
[network-1080p]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -c:v libx264 -preset slow -crf 22 -pix_fmt yuv420p -c:a aac -b:a 128k"
[whatsapp]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -c:v libx264 -preset slow -crf 30 -profile:v baseline -level 3.0 -pix_fmt yuv420p -r 25 -g 50 -c:a aac -b:a 160k -r:a 44100"
@@ -20,11 +22,13 @@ declare -rA containers=(
[instagram]="mp4"
[insta-4k]="mp4"
[network-hevc]="mp4"
[storage-hevc-faster]="mkv"
[storage-hevc]="mkv"
[storage-hevc-faster]="mp4"
[storage-hevc]="mp4"
[storage-av1]="mkv"
[storage-av1-1080p]="mkv"
[storage-av1-nvenc]="mkv"
[network-hevc]="mp4"
[network-hevc-faster]="mp4"
[network]="mp4"
[network-1080p]="mp4"
[whatsapp]="mp4"