Update, rdrview back · bwc9876.dev/nixos-config@289431d

+35 -35

flake.lock

··· 31 31 ] 32 32 }, 33 33 "locked": { 34 - "lastModified": 1754911567, 35 - "narHash": "sha256-vNEXLaaP+14l4/nDbYr/I0Nu6i4/rV+D90Cm21it0bY=", 34 + "lastModified": 1755511413, 35 + "narHash": "sha256-cBBF+nwGrSroN6ZewHPFaSThyCvwBxSZMdYEH8DxDx8=", 36 36 "owner": "catppuccin", 37 37 "repo": "nix", 38 - "rev": "0ba3e73e6ff1762c0f22e848babde42cc365bee3", 38 + "rev": "ca11a19d4e1d2ba5e6162f40cb71288551fd51dd", 39 39 "type": "github" 40 40 }, 41 41 "original": { ··· 202 202 ] 203 203 }, 204 204 "locked": { 205 - "lastModified": 1754878437, 206 - "narHash": "sha256-H307si6BGAkoxbWQ7Z4Hm1joQYlF1HnLcZxt0sRxFKw=", 205 + "lastModified": 1755521603, 206 + "narHash": "sha256-tsZtTJOWgQ3I2qPMi7YYT8ju7QRRyzYFByxOZ1BPiIU=", 207 207 "owner": "nix-community", 208 208 "repo": "flakelight", 209 - "rev": "fb0b426862b52f1ce1888a5957070194838a89ac", 209 + "rev": "06521a6725f85db6467c398651e49ba8238cb6e0", 210 210 "type": "github" 211 211 }, 212 212 "original": { ··· 286 286 ] 287 287 }, 288 288 "locked": { 289 - "lastModified": 1754886238, 290 - "narHash": "sha256-LTQomWOwG70lZR+78ZYSZ9sYELWNq3HJ7/tdHzfif/s=", 289 + "lastModified": 1755755322, 290 + "narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=", 291 291 "owner": "nix-community", 292 292 "repo": "home-manager", 293 - "rev": "0d492b89d1993579e63b9dbdaed17fd7824834da", 293 + "rev": "282b4c98de97da6667cb03de4f427371734bc39c", 294 294 "type": "github" 295 295 }, 296 296 "original": { ··· 328 328 ] 329 329 }, 330 330 "locked": { 331 - "lastModified": 1748294338, 332 - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", 331 + "lastModified": 1754860581, 332 + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", 333 333 "owner": "NuschtOS", 334 334 "repo": "ixx", 335 - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", 335 + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", 336 336 "type": "github" 337 337 }, 338 338 "original": { 339 339 "owner": "NuschtOS", 340 - "ref": "v0.0.8", 340 + "ref": "v0.1.1", 341 341 "repo": "ixx", 342 342 "type": "github" 343 343 } ··· 374 374 ] 375 375 }, 376 376 "locked": { 377 - "lastModified": 1754800038, 378 - "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", 377 + "lastModified": 1755404379, 378 + "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", 379 379 "owner": "nix-community", 380 380 "repo": "nix-index-database", 381 - "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", 381 + "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", 382 382 "type": "github" 383 383 }, 384 384 "original": { ··· 389 389 }, 390 390 "nixos-hardware": { 391 391 "locked": { 392 - "lastModified": 1754564048, 393 - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", 392 + "lastModified": 1755330281, 393 + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", 394 394 "owner": "NixOS", 395 395 "repo": "nixos-hardware", 396 - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", 396 + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", 397 397 "type": "github" 398 398 }, 399 399 "original": { ··· 404 404 }, 405 405 "nixpkgs": { 406 406 "locked": { 407 - "lastModified": 1754725699, 408 - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", 407 + "lastModified": 1755615617, 408 + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", 409 409 "owner": "NixOS", 410 410 "repo": "nixpkgs", 411 - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", 411 + "rev": "20075955deac2583bb12f07151c2df830ef346b4", 412 412 "type": "github" 413 413 }, 414 414 "original": { ··· 428 428 "systems": "systems_2" 429 429 }, 430 430 "locked": { 431 - "lastModified": 1754682350, 432 - "narHash": "sha256-4Dgf0cA/ZJtj9eTzG0yNMRBcd5fll3hhWx2WdwltAP8=", 431 + "lastModified": 1755741137, 432 + "narHash": "sha256-YnpE/fOL3H8cJZ9by/YmeNhIqOQdKuZRYA1L3+w6WsI=", 433 433 "owner": "nix-community", 434 434 "repo": "nixvim", 435 - "rev": "832de87d40f9a40430372552ab0b583680187cf3", 435 + "rev": "91a38e66240c338e683421a4ee3f525d329fc4ad", 436 436 "type": "github" 437 437 }, 438 438 "original": { ··· 472 472 ] 473 473 }, 474 474 "locked": { 475 - "lastModified": 1754301638, 476 - "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", 475 + "lastModified": 1755555503, 476 + "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", 477 477 "owner": "NuschtOS", 478 478 "repo": "search", 479 - "rev": "a60091045273484c040a91f5c229ba298f8ecc27", 479 + "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", 480 480 "type": "github" 481 481 }, 482 482 "original": { ··· 607 607 ] 608 608 }, 609 609 "locked": { 610 - "lastModified": 1754880555, 611 - "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", 610 + "lastModified": 1755743804, 611 + "narHash": "sha256-M6qT02voARH5e9eTXQBzpYIE/hAp6jPgBCyxLmw5uBM=", 612 612 "owner": "oxalica", 613 613 "repo": "rust-overlay", 614 - "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", 614 + "rev": "80322e975e27d834451d6b66e63f8abae9d74bf2", 615 615 "type": "github" 616 616 }, 617 617 "original": { ··· 641 641 }, 642 642 "locked": { 643 643 "dir": "nixos-config", 644 - "lastModified": 1754880515, 645 - "narHash": "sha256-K4jOaXcuagDqPomui6Ns/5fX47jmqum1kcP/1E40ssY=", 644 + "lastModified": 1755528728, 645 + "narHash": "sha256-2xW4v7E3aA/JjmONbh0nBsLGr6tbf0sgPybL+AzHjl0=", 646 646 "ref": "refs/heads/main", 647 - "rev": "95b2803ebffb516119d55be61af954cb29f97993", 648 - "revCount": 200, 647 + "rev": "69e62a4acd44548a77f59abd5883ab24e51a7788", 648 + "revCount": 214, 649 649 "type": "git", 650 650 "url": "https://codeberg.org/spoonbaker/mono" 651 651 },

+155 -149

nixosModules/dev/nvim.nix

··· 4 4 config, 5 5 lib, 6 6 ... 7 - }: { 7 + }: 8 + { 8 9 environment.systemPackages = with pkgs; [ 9 10 ripgrep 10 11 fd 11 12 ]; 12 13 13 14 home-manager.users.bean = { 14 - imports = [inputs.nixvim.homeModules.nixvim]; 15 + imports = [ inputs.nixvim.homeModules.nixvim ]; 15 16 16 17 programs.nixvim = { 17 18 enable = true; ··· 58 59 background = true; 59 60 }; 60 61 virtual_text = { 61 - errors = ["italic"]; 62 - hints = ["italic"]; 63 - information = ["italic"]; 64 - warnings = ["italic"]; 65 - ok = ["italic"]; 62 + errors = [ "italic" ]; 63 + hints = [ "italic" ]; 64 + information = [ "italic" ]; 65 + warnings = [ "italic" ]; 66 + ok = [ "italic" ]; 66 67 }; 67 68 underlines = { 68 - errors = ["underline"]; 69 - hints = ["underline"]; 70 - information = ["underline"]; 71 - warnings = ["underline"]; 69 + errors = [ "underline" ]; 70 + hints = [ "underline" ]; 71 + information = [ "underline" ]; 72 + warnings = [ "underline" ]; 72 73 }; 73 74 }; 74 75 }; ··· 90 91 ''; 91 92 92 93 autoGroups = { 93 - restore_cursor = {}; 94 - open_neotree = {}; 94 + restore_cursor = { }; 95 + open_neotree = { }; 95 96 }; 96 97 97 98 filetype.extension.mdx = "mdx"; ··· 114 115 autoCmd = [ 115 116 { 116 117 group = "restore_cursor"; 117 - event = ["BufReadPost"]; 118 + event = [ "BufReadPost" ]; 118 119 pattern = "*"; 119 120 callback.__raw = '' 120 121 function() ··· 131 132 } 132 133 { 133 134 group = "open_neotree"; 134 - event = ["BufRead"]; 135 + event = [ "BufRead" ]; 135 136 pattern = "*"; 136 137 once = true; 137 138 callback.__raw = '' ··· 159 160 }; 160 161 }; 161 162 162 - keymaps = let 163 - prefixMap = pre: maps: 164 - builtins.map (k: { 165 - action = "<cmd>${k.action}<cr>"; 166 - key = "${pre}${k.key}"; 167 - options = k.options; 168 - }) 169 - maps; 170 - in 163 + keymaps = 164 + let 165 + prefixMap = 166 + pre: maps: 167 + builtins.map (k: { 168 + action = "<cmd>${k.action}<cr>"; 169 + key = "${pre}${k.key}"; 170 + options = k.options; 171 + }) maps; 172 + in 171 173 lib.lists.flatten ( 172 - builtins.map (g: 173 - if builtins.hasAttr "group" g 174 - then prefixMap g.prefix g.keys 175 - else g) [ 174 + builtins.map (g: if builtins.hasAttr "group" g then prefixMap g.prefix g.keys else g) [ 176 175 { 177 176 action = ''"+p''; 178 177 key = "<C-S-V>"; ··· 313 312 } 314 313 { 315 314 action.__raw = "[[<C-\\><C-n><C-w>]]"; 316 - mode = ["t"]; 315 + mode = [ "t" ]; 317 316 key = "<C-w>"; 318 317 } 319 318 { 320 319 action.__raw = "[[<C-\\><C-n>]]"; 321 - mode = ["t"]; 320 + mode = [ "t" ]; 322 321 key = "<esc>"; 323 322 } 324 323 { ··· 329 328 ); 330 329 331 330 extraPlugins = with pkgs.vimPlugins; [ 332 - {plugin = pkgs.nvim-mdx;} 333 - {plugin = satellite-nvim;} 334 - {plugin = flatten-nvim;} 335 - {plugin = tiny-devicons-auto-colors-nvim;} 331 + { plugin = pkgs.nvim-mdx; } 332 + { plugin = satellite-nvim; } 333 + { plugin = flatten-nvim; } 334 + { plugin = tiny-devicons-auto-colors-nvim; } 336 335 ]; 337 336 338 337 plugins = { ··· 404 403 opts = { 405 404 position = "center"; 406 405 }; 407 - layout = let 408 - o = { 409 - position = "center"; 410 - }; 411 - txt = s: { 412 - type = "text"; 413 - val = s; 414 - opts = 415 - { 406 + layout = 407 + let 408 + o = { 409 + position = "center"; 410 + }; 411 + txt = s: { 412 + type = "text"; 413 + val = s; 414 + opts = { 416 415 hl = "Keyword"; 417 416 } 418 417 // o; 419 - }; 420 - grp = g: { 421 - type = "group"; 422 - val = g; 423 - opts.spacing = 1; 424 - }; 425 - btn = { 426 - val, 427 - onClick, 428 - ... 429 - }: { 430 - type = "button"; 431 - inherit val; 432 - opts = o; 433 - on_press.__raw = "function() vim.cmd[[${onClick}]] end"; 434 - }; 435 - cmd = { 436 - command, 437 - width, 438 - height, 439 - }: { 440 - type = "terminal"; 441 - inherit command width height; 442 - opts = o; 443 - }; 444 - pad = { 445 - type = "padding"; 446 - val = 2; 447 - }; 448 - in 418 + }; 419 + grp = g: { 420 + type = "group"; 421 + val = g; 422 + opts.spacing = 1; 423 + }; 424 + btn = 425 + { 426 + val, 427 + onClick, 428 + ... 429 + }: 430 + { 431 + type = "button"; 432 + inherit val; 433 + opts = o; 434 + on_press.__raw = "function() vim.cmd[[${onClick}]] end"; 435 + }; 436 + cmd = 437 + { 438 + command, 439 + width, 440 + height, 441 + }: 442 + { 443 + type = "terminal"; 444 + inherit command width height; 445 + opts = o; 446 + }; 447 + pad = { 448 + type = "padding"; 449 + val = 2; 450 + }; 451 + in 449 452 [ 450 453 pad 451 454 pad ··· 478 481 (txt " NixVim Rev ${builtins.substring 0 5 inputs.nixvim.rev}") 479 482 ]) 480 483 ]) 481 - ++ [pad]; 484 + ++ [ pad ]; 482 485 }; 483 486 484 487 trouble = { ··· 587 590 hover = { 588 591 enabled = true; 589 592 delay = 150; 590 - reveal = ["close"]; 593 + reveal = [ "close" ]; 591 594 }; 592 595 sort_by = "insert_at_end"; 593 596 diagnostics = "nvim_lsp"; ··· 602 605 603 606 statuscol = { 604 607 enable = true; 605 - settings.segments = let 606 - dispCond = { 607 - __raw = '' 608 - function(ln) 609 - return vim.bo.filetype ~= "neo-tree" 610 - end 611 - ''; 612 - }; 613 - in [ 614 - { 615 - click = "v:lua.ScSa"; 616 - condition = [ 617 - dispCond 618 - ]; 619 - text = [ 620 - "%s" 621 - ]; 622 - } 623 - { 624 - click = "v:lua.ScLa"; 625 - condition = [dispCond]; 626 - text = [ 627 - { 628 - __raw = "require('statuscol.builtin').lnumfunc"; 629 - } 630 - ]; 631 - } 632 - { 633 - click = "v:lua.ScFa"; 634 - condition = [ 635 - dispCond 636 - { 637 - __raw = "require('statuscol.builtin').not_empty"; 638 - } 639 - ]; 640 - text = [ 641 - { 642 - __raw = "require('statuscol.builtin').foldfunc"; 643 - } 644 - " " 645 - ]; 646 - } 647 - ]; 608 + settings.segments = 609 + let 610 + dispCond = { 611 + __raw = '' 612 + function(ln) 613 + return vim.bo.filetype ~= "neo-tree" 614 + end 615 + ''; 616 + }; 617 + in 618 + [ 619 + { 620 + click = "v:lua.ScSa"; 621 + condition = [ 622 + dispCond 623 + ]; 624 + text = [ 625 + "%s" 626 + ]; 627 + } 628 + { 629 + click = "v:lua.ScLa"; 630 + condition = [ dispCond ]; 631 + text = [ 632 + { 633 + __raw = "require('statuscol.builtin').lnumfunc"; 634 + } 635 + ]; 636 + } 637 + { 638 + click = "v:lua.ScFa"; 639 + condition = [ 640 + dispCond 641 + { 642 + __raw = "require('statuscol.builtin').not_empty"; 643 + } 644 + ]; 645 + text = [ 646 + { 647 + __raw = "require('statuscol.builtin').foldfunc"; 648 + } 649 + " " 650 + ]; 651 + } 652 + ]; 648 653 }; 649 654 650 655 dropbar = { ··· 670 675 671 676 options = { 672 677 theme = "catppuccin"; 673 - disabled_filetypes = ["neo-tree"]; 674 - ignore_focus = ["neo-tree"]; 678 + disabled_filetypes = [ "neo-tree" ]; 679 + ignore_focus = [ "neo-tree" ]; 675 680 }; 676 681 }; 677 682 }; 678 683 679 684 nix-develop = { 680 685 enable = true; 681 - package = 682 - pkgs.vimPlugins.nix-develop-nvim.overrideAttrs ( 683 - prev: next: { 684 - src = 685 - pkgs.fetchFromGitHub { 686 - owner = "Bwc9876"; 687 - repo = "nix-develop.nvim"; 688 - rev = "089cd52191ccbb3726594e21cd96567af6088dd5"; 689 - sha256 = "sha256-EIEJk8/IAuG+UICUJ2F8QakgRpFrQ1ezDSJ79NAVuD8= 686 + package = pkgs.vimPlugins.nix-develop-nvim.overrideAttrs ( 687 + prev: next: { 688 + src = pkgs.fetchFromGitHub { 689 + owner = "Bwc9876"; 690 + repo = "nix-develop.nvim"; 691 + rev = "089cd52191ccbb3726594e21cd96567af6088dd5"; 692 + sha256 = "sha256-EIEJk8/IAuG+UICUJ2F8QakgRpFrQ1ezDSJ79NAVuD8= 690 693 "; 691 - }; 692 - } 693 - ); 694 + }; 695 + } 696 + ); 694 697 }; 695 698 696 699 project-nvim = { ··· 781 784 cmp = { 782 785 enable = true; 783 786 settings = { 784 - sources = map (name: {inherit name;}) [ 787 + sources = map (name: { inherit name; }) [ 785 788 "nvim_lsp" 786 789 "nvim_lsp_signature_help" 787 790 "path" ··· 837 840 838 841 lspsaga = { 839 842 enable = true; 840 - symbolInWinbar.enable = false; 841 - lightbulb.enable = false; 842 - ui = { 843 - codeAction = "󰛨"; 844 - actionfix = "󰖷"; 843 + settings = { 844 + symbol_in_winbar.enable = false; 845 + implement.enable = false; 846 + lightbulb.enable = false; 847 + ui = { 848 + code_action = "󰛨"; 849 + actionfix = "󰖷"; 850 + }; 851 + hover = { 852 + openCmd = "!xdg-open"; 853 + openLink = "<leader>o"; 854 + maxWidth = 0.5; 855 + maxHeight = 0.4; 856 + }; 857 + rename.autoSave = true; 858 + finder = { 859 + keys.close = "<ESC>"; 860 + }; 861 + codeAction.keys.quit = "<ESC>"; 845 862 }; 846 - hover = { 847 - openCmd = "!xdg-open"; 848 - openLink = "<leader>o"; 849 - maxWidth = 0.5; 850 - maxHeight = 0.4; 851 - }; 852 - rename.autoSave = true; 853 - finder = { 854 - keys.close = "<ESC>"; 855 - }; 856 - codeAction.keys.quit = "<ESC>"; 857 863 }; 858 864 859 865 crates.enable = true;

+4

nixosModules/graphics/audio.nix

··· 10 10 11 11 services.playerctld.enable = true; 12 12 13 + hardware.rtl-sdr.enable = true; 14 + 15 + users.users.bean.extraGroups = ["plugdev"]; 16 + 13 17 home-manager.users.bean.wayland.windowManager.hyprland.settings = { 14 18 bindl = [ 15 19 ",XF86AudioPlay,exec,playerctl play-pause"

+1

nixosModules/graphics/firefox.nix

··· 100 100 101 101 ## Ads / Youtube 102 102 "ublock-origin" 103 + "consent-o-matic" 103 104 "sponsorblock" 104 105 105 106 # Information

+1 -2

nixosModules/graphics/news.nix

··· 46 46 in { 47 47 environment.systemPackages = with pkgs; [ 48 48 w3m 49 - # TODO: Broken 50 - # rdrview 49 + rdrview 51 50 ]; 52 51 53 52 home-manager.users.bean = {

-44

packages/rdrview.nix

··· 1 - { 2 - lib, 3 - stdenv, 4 - fetchFromGitHub, 5 - libxml2, 6 - curl, 7 - libseccomp, 8 - installShellFiles, 9 - }: 10 - stdenv.mkDerivation { 11 - pname = "rdrview"; 12 - version = "0.1.3"; 13 - 14 - src = fetchFromGitHub { 15 - owner = "eafer"; 16 - repo = "rdrview"; 17 - rev = "0bf7b5abfa22c252761f594c3bd6228947c50155"; 18 - sha256 = "sha256-UFHRsaLGa/jv/S+VXtXIMgLuQUPgqbRgD35bBrJyuZA="; 19 - }; 20 - 21 - buildInputs = [ 22 - libxml2 23 - curl 24 - libseccomp 25 - ]; 26 - nativeBuildInputs = [installShellFiles]; 27 - 28 - installPhase = '' 29 - runHook preInstall 30 - install -Dm755 rdrview -t $out/bin 31 - installManPage rdrview.1 32 - runHook postInstall 33 - ''; 34 - 35 - enableParallelBuilding = true; 36 - 37 - meta = with lib; { 38 - description = "Command line tool to extract main content from a webpage"; 39 - homepage = "https://github.com/eafer/rdrview"; 40 - license = licenses.asl20; 41 - maintainers = with maintainers; [djanatyn]; 42 - mainProgram = "rdrview"; 43 - }; 44 - }

+2 -2

res/command_not_found.nu

··· 1 1 {|cmd_name| 2 2 try { 3 - let attrs = (nix-locate --minimal --no-group --type x --type s --top-level --whole-name --at-root $"/bin/($cmd_name)") 3 + let attrs = (nix-locate --minimal --no-group --type x --type s --whole-name --at-root $"/bin/($cmd_name)") 4 4 let len = (echo $attrs | split row "\n" | length) 5 5 6 6 if $len == 0 { ··· 9 9 return $"\nThe program ($cmd_name) is not installed, but available from the following location$s$:\n\n($attrs | str replace ".out" "")" 10 10 } 11 11 } 12 - } 12 + }

Configure Feed

Configure Feed