Update · bwc9876.dev/nixos-config@b75d577

+30 -30

flake.lock

··· 151 151 ] 152 152 }, 153 153 "locked": { 154 - "lastModified": 1735774679, 155 - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", 154 + "lastModified": 1736143030, 155 + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", 156 156 "owner": "hercules-ci", 157 157 "repo": "flake-parts", 158 - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", 158 + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", 159 159 "type": "github" 160 160 }, 161 161 "original": { ··· 297 297 ] 298 298 }, 299 299 "locked": { 300 - "lastModified": 1736089250, 301 - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", 300 + "lastModified": 1736508663, 301 + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", 302 302 "owner": "nix-community", 303 303 "repo": "home-manager", 304 - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", 304 + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", 305 305 "type": "github" 306 306 }, 307 307 "original": { ··· 436 436 ] 437 437 }, 438 438 "locked": { 439 - "lastModified": 1735956190, 440 - "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=", 439 + "lastModified": 1736370755, 440 + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", 441 441 "owner": "lnl7", 442 442 "repo": "nix-darwin", 443 - "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9", 443 + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", 444 444 "type": "github" 445 445 }, 446 446 "original": { ··· 456 456 ] 457 457 }, 458 458 "locked": { 459 - "lastModified": 1736047960, 460 - "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", 459 + "lastModified": 1736440205, 460 + "narHash": "sha256-QJgTI//KEGuEJC6FDxuI9Dq8PewIpnxD2NVx2/OHbfc=", 461 461 "owner": "Mic92", 462 462 "repo": "nix-index-database", 463 - "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", 463 + "rev": "a2200b499efa01ca8646173e94cdfcc93188f2b8", 464 464 "type": "github" 465 465 }, 466 466 "original": { ··· 471 471 }, 472 472 "nixos-hardware": { 473 473 "locked": { 474 - "lastModified": 1735388221, 475 - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", 474 + "lastModified": 1736441705, 475 + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", 476 476 "owner": "NixOS", 477 477 "repo": "nixos-hardware", 478 - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", 478 + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", 479 479 "type": "github" 480 480 }, 481 481 "original": { ··· 487 487 }, 488 488 "nixpkgs": { 489 489 "locked": { 490 - "lastModified": 1735834308, 491 - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", 490 + "lastModified": 1736344531, 491 + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", 492 492 "owner": "NixOS", 493 493 "repo": "nixpkgs", 494 - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", 494 + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", 495 495 "type": "github" 496 496 }, 497 497 "original": { ··· 550 550 "treefmt-nix": "treefmt-nix" 551 551 }, 552 552 "locked": { 553 - "lastModified": 1736112263, 554 - "narHash": "sha256-tSYWCZhs21SVg+X6jQrHGchok3db6nqZ4vL+x2ySJWk=", 553 + "lastModified": 1736430661, 554 + "narHash": "sha256-0dabFSGqcPo47WfgPRM5usnVXaGMdYvPlDJ5PeIqjr4=", 555 555 "owner": "nix-community", 556 556 "repo": "nixvim", 557 - "rev": "7896856db1de897e95333aed381f06fa8788fff7", 557 + "rev": "67de84848e43ca6a5025e4f8eddc2f6684a51f2b", 558 558 "type": "github" 559 559 }, 560 560 "original": { ··· 616 616 ] 617 617 }, 618 618 "locked": { 619 - "lastModified": 1735594503, 620 - "narHash": "sha256-zuHBKmmwhEpJ75Eco0SPJ9nSzSsVOt7N4DeebRffx9M=", 619 + "lastModified": 1736174470, 620 + "narHash": "sha256-n3UdsDg8mNvNcH3dRM46GoJq0v+X/Wre1nAr0DRVxV8=", 621 621 "owner": "ow-mods", 622 622 "repo": "ow-mod-man", 623 - "rev": "594c9de8c067fa9c70baa0835acb3f4fa23b2a56", 623 + "rev": "1799d111b56a1de34242edb59417f6c3777bd6be", 624 624 "type": "github" 625 625 }, 626 626 "original": { ··· 700 700 ] 701 701 }, 702 702 "locked": { 703 - "lastModified": 1736130662, 704 - "narHash": "sha256-z+WGez9oTR2OsiUWE5ZhIpETqM1ogrv6Xcd24WFi6KQ=", 703 + "lastModified": 1736476219, 704 + "narHash": "sha256-+qyv3QqdZCdZ3cSO/cbpEY6tntyYjfe1bB12mdpNFaY=", 705 705 "owner": "oxalica", 706 706 "repo": "rust-overlay", 707 - "rev": "2f5d4d9cd31cc02c36e51cb2e21c4b25c4f78c52", 707 + "rev": "de30cc5963da22e9742bbbbb9a3344570ed237b9", 708 708 "type": "github" 709 709 }, 710 710 "original": { ··· 751 751 ] 752 752 }, 753 753 "locked": { 754 - "lastModified": 1735905407, 755 - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", 754 + "lastModified": 1736154270, 755 + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", 756 756 "owner": "numtide", 757 757 "repo": "treefmt-nix", 758 - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", 758 + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", 759 759 "type": "github" 760 760 }, 761 761 "original": {

+16

pkgs/nvim-mdx.nix

··· 1 + { 2 + vimUtils, 3 + fetchFromGitHub, 4 + ... 5 + }: 6 + vimUtils.buildVimPlugin { 7 + pname = "mdx-nvim"; 8 + version = "2025-01-04"; 9 + src = fetchFromGitHub { 10 + owner = "davidmh"; 11 + repo = "mdx.nvim"; 12 + rev = "464a74be368dce212cff02f6305845dc7f209ab3"; 13 + sha256 = "sha256-jpMcrWx/Rg9sMfkQFXnIM8VB5qRuSB/70wuSh6Y5uFk="; 14 + }; 15 + meta.homepage = "https://github.com/davidmh/mdx.nvim"; 16 + }

+7 -2

roles/dev/nvim.nix

··· 158 158 } 159 159 ]; 160 160 161 - extraPlugins = with pkgs.vimPlugins; [{plugin = tiny-devicons-auto-colors-nvim;} {plugin = nvim-biscuits;}]; 161 + extraPlugins = with pkgs.vimPlugins; [{plugin = pkgs.callPackage "${inputs.self}/pkgs/nvim-mdx.nix" {};} {plugin = tiny-devicons-auto-colors-nvim;} {plugin = nvim-biscuits;}]; 162 162 163 163 plugins = { 164 164 telescope = { ··· 317 317 318 318 treesitter = { 319 319 enable = true; 320 + languageRegister.mdx = "markdown"; 321 + luaConfig.post = '' 322 + require('mdx').setup() 323 + ''; 320 324 settings = { 321 325 highlight.enable = true; 322 326 }; ··· 403 407 404 408 fidget = { 405 409 enable = true; 406 - notification = { 410 + settings.notification = { 407 411 overrideVimNotify = true; 408 412 window.align = "top"; 409 413 }; ··· 501 505 yamlls.enable = true; 502 506 pylsp.enable = true; 503 507 csharp_ls.enable = true; 508 + svelte.enable = true; 504 509 nil_ls.enable = true; 505 510 bashls.enable = true; 506 511 nushell.enable = true;

+141

roles/graphics/apps.nix

··· 8 8 Icon=htop 9 9 ''; 10 10 11 + home-manager.users.bean.xdg.configFile = { 12 + # "Nickvision Cavalier/cava_config".text = '' 13 + # [general] 14 + # framerate = 144 15 + # bars = 100 16 + # autosens = 1 17 + # sensitivity = 100 18 + # [input] 19 + # method = pulse 20 + # [output] 21 + # method = raw 22 + # raw_target = /dev/stdout 23 + # bit_format = 16bit 24 + # channels = stereo 25 + # [smoothing] 26 + # monstercat = 1 27 + # noise_reduction = 77 28 + # ''; 29 + # 30 + # "Nickvision Cavalier/config.json".text = 31 + # builtins.toJSON 32 + # { 33 + # ActiveProfile = 0; 34 + # AreaMargin = 40; 35 + # AreaOffsetX = 0; 36 + # AreaOffsetY = 0; 37 + # AutohideHeader = false; 38 + # Autosens = true; 39 + # BarPairs = 50; 40 + # BgImageAlpha = 1; 41 + # BgImageIndex = -1; 42 + # BgImageScale = 1; 43 + # Borderless = true; 44 + # ColorProfiles = [ 45 + # { 46 + # BgColors = ["#ff000000"]; 47 + # FgColors = ["#ffa51d2d" "#ffff7800" "#fff8e45c" "#ff2ec27e" "#ff1c71d8" "#ffdc8add"]; 48 + # Name = "Default"; 49 + # Theme = 1; 50 + # } 51 + # ]; 52 + # Direction = 1; 53 + # FgImageAlpha = 1; 54 + # FgImageIndex = -1; 55 + # FgImageScale = 1; 56 + # Filling = true; 57 + # Framerate = 144; 58 + # InnerRadius = 0.5; 59 + # ItemsOffset = 0.1; 60 + # ItemsRoundness = 0.5; 61 + # LinesThickness = 5; 62 + # Mirror = 0; 63 + # Mode = 3; 64 + # Monstercat = true; 65 + # NoiseReduction = 0.77; 66 + # ReverseMirror = false; 67 + # ReverseOrder = true; 68 + # Rotation = 0; 69 + # Sensitivity = 10; 70 + # SharpCorners = true; 71 + # ShowControls = true; 72 + # Stereo = true; 73 + # WindowHeight = 300; 74 + # WindowMaximized = true; 75 + # WindowWidth = 500; 76 + # }; 77 + 78 + "htop/htoprc".text = '' 79 + htop_version=3.3.0 80 + config_reader_min_version=3 81 + fields=0 3 2 18 46 47 39 1 82 + hide_kernel_threads=1 83 + hide_userland_threads=0 84 + hide_running_in_container=0 85 + shadow_other_users=0 86 + show_thread_names=1 87 + show_program_path=0 88 + highlight_base_name=1 89 + highlight_deleted_exe=0 90 + shadow_distribution_path_prefix=0 91 + highlight_megabytes=1 92 + highlight_threads=1 93 + highlight_changes=0 94 + highlight_changes_delay_secs=5 95 + find_comm_in_cmdline=1 96 + strip_exe_from_cmdline=1 97 + show_merged_command=0 98 + header_margin=1 99 + screen_tabs=1 100 + detailed_cpu_time=0 101 + cpu_count_from_one=1 102 + show_cpu_usage=1 103 + show_cpu_frequency=0 104 + show_cpu_temperature=1 105 + degree_fahrenheit=0 106 + update_process_names=0 107 + account_guest_in_cpu_meter=1 108 + color_scheme=0 109 + enable_mouse=1 110 + delay=15 111 + hide_function_bar=0 112 + header_layout=two_67_33 113 + column_meters_0=System Hostname Date Clock Uptime Tasks CPU AllCPUs4 MemorySwap 114 + column_meter_modes_0=2 2 2 2 2 2 2 1 1 115 + column_meters_1=DiskIO DiskIO Blank NetworkIO NetworkIO 116 + column_meter_modes_1=2 3 2 2 3 117 + tree_view=0 118 + sort_key=46 119 + tree_sort_key=0 120 + sort_direction=-1 121 + tree_sort_direction=1 122 + tree_view_always_by_pid=0 123 + all_branches_collapsed=0 124 + screen:Main=PID PPID STATE NICE PERCENT_CPU PERCENT_MEM M_RESIDENT Command 125 + .sort_key=PERCENT_CPU 126 + .tree_sort_key=PID 127 + .tree_view_always_by_pid=0 128 + .tree_view=0 129 + .sort_direction=-1 130 + .tree_sort_direction=1 131 + .all_branches_collapsed=0 132 + screen:Tree=PID PPID PGRP PROCESSOR TTY USER SESSION Command 133 + .sort_key=PID 134 + .tree_sort_key=PID 135 + .tree_view_always_by_pid=0 136 + .tree_view=1 137 + .sort_direction=1 138 + .tree_sort_direction=1 139 + .all_branches_collapsed=0 140 + screen:I/O=PID PPID IO_READ_RATE IO_WRITE_RATE Command 141 + .sort_key=IO_RATE 142 + .tree_sort_key=PID 143 + .tree_view_always_by_pid=0 144 + .tree_view=0 145 + .sort_direction=-1 146 + .tree_sort_direction=1 147 + .all_branches_collapsed=0 148 + ''; 149 + }; 150 + 11 151 programs.kdeconnect.enable = true; 12 152 13 153 systemd.user.services.kdeconnect = { ··· 36 176 gimp 37 177 inkscape 38 178 lorien 179 + cavalier 39 180 40 181 ## 3D 41 182 prusa-slicer

+72 -61

roles/imperm.nix

··· 6 6 persistRoot = "/nix/persist"; # Anything important we want backed up 7 7 secureRoot = "${persistRoot}/secure"; # Files and directories we want only root to access 8 8 cacheRoot = "/nix/cache"; # Anything not as important that we can stand losing 9 + preWith = pre: paths: builtins.map (p: "${pre}/${p}") paths; 10 + preShare = preWith ".local/share"; 11 + preConf = preWith ".config"; 9 12 in { 10 13 imports = [inputs.imperm.nixosModules.default]; 11 - # Requires /nix/persist to exist 12 - # TODO: Bind mount game save directories 14 + # Requires /nix/persist and /nix/cache to exist 13 15 14 16 environment.etc."machine-id".text = builtins.hashString "md5" config.networking.hostName; 15 17 ··· 32 34 environment.persistence.${cacheRoot} = { 33 35 enable = true; 34 36 hideMounts = true; 35 - directories = [ 36 - "/var/log" 37 - "/var/lib/bluetooth" 38 - "/var/lib/nixos" 39 - "/var/lib/systemd/coredump" 40 - "/var/lib/systemd/timers" 41 - "/var/lib/systemd/backlight" 42 - "/var/lib/systemd/rfkill" 43 - { 44 - directory = "/var/lib/colord"; 45 - user = "colord"; 46 - group = "colord"; 47 - mode = "u=rwx,g=rx,o="; 48 - } 49 - ]; 50 - users.bean.directories = [ 51 - ".cache" 52 - ".local/share/Steam" # Most saves are cloud backed up or in .local/share and I don't want to back up games themselves 53 - "" 54 - ]; 37 + directories = 38 + (preWith "/var" ([ 39 + "log" 40 + ] 41 + ++ preWith "lib" ( 42 + [ 43 + "bluetooth" 44 + "nixos" 45 + ] 46 + ++ preWith "systemd" [ 47 + "coredump" 48 + "timers" 49 + "backlight" 50 + "rfkill" 51 + ] 52 + ))) 53 + ++ [ 54 + { 55 + directory = "/var/lib/colord"; 56 + user = "colord"; 57 + group = "colord"; 58 + mode = "u=rwx,g=rx,o="; 59 + } 60 + ]; 61 + users.bean.directories = 62 + [ 63 + ".cache" 64 + ".cargo" 65 + ".npm" 66 + ".pnpm" 67 + ] 68 + ++ (preShare ["Steam" "Trash"]) 69 + ++ (preConf ["gh" "GitHub Desktop" "spotify" "vesktop" "VencordDesktop" "kdeconnect"]); 55 70 }; 56 71 57 72 environment.persistence.${persistRoot} = { ··· 60 75 directories = [ 61 76 "/etc/NetworkManager/system-connections" 62 77 ]; 63 - files = [ 64 - { 65 - file = "/var/keys/secret_file"; 66 - parentDirectory = {mode = "u=rwx,g=,o=";}; 67 - } 68 - ]; 69 78 users.bean = { 70 - directories = [ 71 - "Downloads" 72 - "Music" 73 - "Videos" 74 - "Pictures" 75 - "Documents" 76 - ".mozilla" 77 - { 78 - directory = ".gnupg"; 79 - mode = "0700"; 80 - } 81 - { 82 - directory = ".ssh"; 83 - mode = "0700"; 84 - } 85 - { 86 - directory = ".nixops"; 87 - mode = "0700"; 88 - } 89 - { 90 - directory = ".local/share/keyrings"; 91 - mode = "0700"; 92 - } 93 - ".local/share/direnv" 94 - ".local/share/ow-mod-man" 95 - ".local/share/OuterWildsModManager" 96 - ".local/share/PrismLauncher" 97 - ".local/share/newsboat" 98 - ".local/share/zoxide" 99 - ".local/share/nvim" 100 - ".local/share/user-places.xbel" 101 - ".config/vesktop" 102 - ]; 79 + directories = 80 + [ 81 + "Downloads" 82 + "Music" 83 + "Videos" 84 + "Pictures" 85 + "Documents" 86 + ".mozilla" 87 + { 88 + directory = ".gnupg"; 89 + mode = "0700"; 90 + } 91 + { 92 + directory = ".ssh"; 93 + mode = "0700"; 94 + } 95 + { 96 + directory = ".nixops"; 97 + mode = "0700"; 98 + } 99 + { 100 + directory = ".local/share/keyrings"; 101 + mode = "0700"; 102 + } 103 + ] 104 + ++ (preShare [ 105 + "direnv" 106 + "ow-mod-man" 107 + "OuterWildsModManager" 108 + "PrismLauncher" 109 + "newsboat" 110 + "zoxide" 111 + "nvim" 112 + "user-places.xbel" 113 + ]); 103 114 files = [ 104 115 ".config/nushell/history.txt" 105 116 ];

Configure Feed

Configure Feed