From 2dcd176432dbed0835bdf9af605b4abdc1419931 Mon Sep 17 00:00:00 2001 From: Lucy Hochkamp Date: Tue, 5 Mar 2024 12:51:43 +0100 Subject: [PATCH] fix: fix --- darwin-common.nix | 8 +- data/vscode-extensions.nix | 259 +++++++++++------------------- flake.lock | 90 +++++------ hm-imports/vscode/default.nix | 19 ++- hm-imports/vscode/extensions.toml | 19 ++- hm-imports/xonsh/default.nix | 9 +- hosts/daedalus/default.nix | 22 ++- hosts/ds9/default.nix | 4 +- 8 files changed, 211 insertions(+), 219 deletions(-) diff --git a/darwin-common.nix b/darwin-common.nix index cabac05d..b8b4012e 100644 --- a/darwin-common.nix +++ b/darwin-common.nix @@ -6,6 +6,12 @@ nix.package = pkgs.nixVersions.stable; nix.settings.cores = 0; # use all cores nix.settings.max-jobs = 10; # use all cores + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + security.pam.enableSudoTouchIdAuth = true; + programs.zsh.shellInit = '' + eval $(/opt/homebrew/bin/brew shellenv)' + ''; + environment.systemPath = [ "/opt/homebrew/bin" "/opt/homebrew/sbin" ]; #nix.settings.auto-optimise-store = true; nix.distributedBuilds = true; nix.nixPath = [{ nixpkgs = "${inputs.nixpkgs-darwin.outPath}"; nixpkgs-master = "${inputs.nixpkgs-master.outPath}"; nixpkgs-nixos = "${inputs.nixpkgs.outPath}"; }]; @@ -15,7 +21,7 @@ sshUser = "ragon"; maxJobs = 12; hostName = "ds9"; - sshKey = "/Users/ragon/.ssh/id_ed25519"; + sshKey = "/Users/xyno/.ssh/id_ed25519"; publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUorQkJYdWZYQUpoeVVIVmZocWxrOFk0ekVLSmJLWGdKUXZzZEU0ODJscFYgcm9vdEBpc28K"; } #{ diff --git a/data/vscode-extensions.nix b/data/vscode-extensions.nix index 16d675b6..39c51454 100644 --- a/data/vscode-extensions.nix +++ b/data/vscode-extensions.nix @@ -4,47 +4,6 @@ let vscode-utils = pkgs.vscode-utils; in { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "valentjn"."vscode-ltex" = (vscode-utils.buildVscodeExtension { name = "valentjn.vscode-ltex"; vscodeExtPublisher = "valentjn"; @@ -57,322 +16,300 @@ in vscodeExtUniqueId = "valentjn.vscode-ltex"; version = "13.1.0"; }); - - - - - - - "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2023.25.10221012"; - sha256 = "14bkvlflib4wky6lw1hq0i01ymzf5349cl4d9minaam2lq0451i0"; + version = "2024.3.10641005"; + sha256 = "0ghzcgs1lri35blshs482x0f0mbx0hrrfb3cizv0glrwglz7728p"; + }; + "ms-python"."vscode-pylance" = vscode-utils.extensionFromVscodeMarketplace { + name = "vscode-pylance"; + publisher = "ms-python"; + version = "2024.2.105"; + sha256 = "0iyz05nbkfmpn564axnd2fi1a4h15nr9yq3lzrxyd6zd7wk5ax73"; }; - "ms-vscode"."cpptools" = vscode-utils.extensionFromVscodeMarketplace { name = "cpptools"; publisher = "ms-vscode"; - version = "1.19.2"; - sha256 = "0amq6f59i12kppg56670a4300k2wswlpnjh12qx914p6r92jq9gx"; + version = "1.19.4"; + sha256 = "0c1dj8ngqwdi9zh203s7mirfhbyqzxdcmq46m4xyaqkkjrya1fd2"; }; - "ms-toolsai"."jupyter-renderers" = vscode-utils.extensionFromVscodeMarketplace { name = "jupyter-renderers"; publisher = "ms-toolsai"; version = "1.0.17"; sha256 = "1c065s2cllf2x90i174qs2qyzywrlsjkc6agcc9qvdsb426c6r9l"; }; - "dbaeumer"."vscode-eslint" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-eslint"; publisher = "dbaeumer"; version = "2.4.4"; sha256 = "1c10n36a3bxwwjgd4vhrf79wg14dm0hxvz9z23pqdyxzcwrar49l"; }; - "redhat"."java" = vscode-utils.extensionFromVscodeMarketplace { name = "java"; publisher = "redhat"; version = "1.27.2024011308"; sha256 = "134b3ar8qacanp4jxrbdrj97lg7imv93bw6aa1kczppghdi5nhjh"; }; - "ms-azuretools"."vscode-docker" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.28.0"; - sha256 = "0nmc3pdgxpmr6k2ksdczkv9bbwszncfczik0xjympqnd2k0ra9h0"; + version = "1.29.0"; + sha256 = "0rz32qwdf7a5hn3nnhxviaf8spwsszfrxmhnbbskspi5r9b6qm4r"; }; - - "vscjava"."vscode-java-debug" = vscode-utils.extensionFromVscodeMarketplace { - name = "vscode-java-debug"; - publisher = "vscjava"; - version = "0.55.2023121302"; - sha256 = "0nhly0gvm6rg8ppfqbgb6vln34qpd98h3kxgsxzag880pgj1ak7j"; + "eamodio"."gitlens" = vscode-utils.extensionFromVscodeMarketplace { + name = "gitlens"; + publisher = "eamodio"; + version = "2024.3.404"; + sha256 = "01mr5kgz5gm3flmps8kk8j1zal1rrr086qjcm55r7ycb6ll7yaba"; }; - "ms-vscode"."cmake-tools" = vscode-utils.extensionFromVscodeMarketplace { name = "cmake-tools"; publisher = "ms-vscode"; - version = "1.17.7"; - sha256 = "0fvq1vkfb8p91y73kykb41ngwxfvak9g3x8nkffrb7gdfi59m9yn"; + version = "1.18.4"; + sha256 = "06gjyv87ncm2l964lj6xydckk7vjmsxlvcah94r3b1g6nygh1wp2"; + }; + "vscjava"."vscode-java-debug" = vscode-utils.extensionFromVscodeMarketplace { + name = "vscode-java-debug"; + publisher = "vscjava"; + version = "0.56.2024022605"; + sha256 = "1r0xq2qsyd0vmk2vfa6i1vr8hahj74a2kn1sj7ij8pgks3hjv2x7"; }; - "vscjava"."vscode-maven" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-maven"; publisher = "vscjava"; - version = "0.43.2024011905"; - sha256 = "0hmv7m38ffai5cz7lsswfw6d58h2miczcppd7x6yc2i7vnv6v6pg"; + version = "0.44.2024013105"; + sha256 = "0fpfr1g6dfrrrdc4i8q19xzx5rqd0irpsba2qhipx08kjr3z57iv"; }; - "ms-dotnettools"."csharp" = vscode-utils.extensionFromVscodeMarketplace { name = "csharp"; publisher = "ms-dotnettools"; - version = "2.16.24"; - sha256 = "019jr326hsrxvs40gvlz6xcmq37fmw64svs7hckwn8wiab83qv9z"; + version = "2.19.13"; + sha256 = "1nw7y6lj4qz0k88mb44cp8mg79rps6whlfiab4dj716svnih0afi"; }; - - "vscjava"."vscode-java-test" = vscode-utils.extensionFromVscodeMarketplace { - name = "vscode-java-test"; - publisher = "vscjava"; - version = "0.40.2024011806"; - sha256 = "1fnr8r9z2jz7gabc677zrhvdzqhlrrasnzlr2ralgq9pi3vpwyfa"; - }; - - "vscjava"."vscode-java-dependency" = vscode-utils.extensionFromVscodeMarketplace { - name = "vscode-java-dependency"; - publisher = "vscjava"; - version = "0.23.2024010506"; - sha256 = "1z7v8ys7ksmnkc3b8l24c03221dj9c075yi4i98j66b07m74vzlh"; - }; - "ms-vscode"."cpptools-extension-pack" = vscode-utils.extensionFromVscodeMarketplace { name = "cpptools-extension-pack"; publisher = "ms-vscode"; version = "1.3.0"; sha256 = "11fk26siccnfxhbb92z6r20mfbl9b3hhp5zsvpn2jmh24vn96x5c"; }; - + "vscjava"."vscode-java-test" = vscode-utils.extensionFromVscodeMarketplace { + name = "vscode-java-test"; + publisher = "vscjava"; + version = "0.40.2024011806"; + sha256 = "1fnr8r9z2jz7gabc677zrhvdzqhlrrasnzlr2ralgq9pi3vpwyfa"; + }; + "vscjava"."vscode-java-dependency" = vscode-utils.extensionFromVscodeMarketplace { + name = "vscode-java-dependency"; + publisher = "vscjava"; + version = "0.23.2024022305"; + sha256 = "18amdhi17fdwhfzip4l14429fcqw9rl6d03kg4yjfxqshj87jwcr"; + }; "vscjava"."vscode-java-pack" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-java-pack"; publisher = "vscjava"; version = "0.25.2023121402"; sha256 = "04vv88lmn4fs3gk84nyxcc0r5ay1pmzs59wwfrx78yqrd0mlj596"; }; - + "ms-vscode-remote"."remote-containers" = vscode-utils.extensionFromVscodeMarketplace { + name = "remote-containers"; + publisher = "ms-vscode-remote"; + version = "0.349.0"; + sha256 = "0krahb8ymnamp20iq4crqjyj37wmvyfrijs4ippxs3620pb9mi6r"; + }; "ms-vscode-remote"."remote-ssh" = vscode-utils.extensionFromVscodeMarketplace { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.108.2023112915"; - sha256 = "1ys59dys5kmijr9f2afbzbwm7dx7ps78jdwp89q1kb4c0aajmkx2"; + version = "0.109.2024022215"; + sha256 = "0bdlqbln7bhlshmi828qkv1l9646rffwaddrikfqiahrz19vm9g4"; + }; + "ms-python"."debugpy" = vscode-utils.extensionFromVscodeMarketplace { + name = "debugpy"; + publisher = "ms-python"; + version = "2024.3.10611007"; + sha256 = "0bvhv8vxb6l5gyd85imm3p94j8qgfvmcym11v9gvzl0sns38z2bq"; }; - "golang"."go" = vscode-utils.extensionFromVscodeMarketplace { name = "go"; publisher = "golang"; - version = "0.40.3"; - sha256 = "15kicpv9xpn7l3w9mbmsjdzjmavh88p3skkim0a9prg9p40bsq0m"; + version = "0.41.1"; + sha256 = "0i4h458x90v2bfr0la8axg6fs0756f2paby6h34pj4vflhi78axm"; }; - "ms-dotnettools"."vscode-dotnet-runtime" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-dotnet-runtime"; publisher = "ms-dotnettools"; - version = "2.0.0"; - sha256 = "1sn454mv5vb9qspaarr8wp0yqx4g20c1mf0mjhhzmj9x92r9adx1"; + version = "2.0.2"; + sha256 = "018fkmx47fa01hwzqqnjsb0b014vash04llifa8pbrn04lx7rp7c"; }; - "dart-code"."dart-code" = vscode-utils.extensionFromVscodeMarketplace { name = "dart-code"; publisher = "dart-code"; - version = "3.81.20240117"; - sha256 = "18hcvyvfli7h3y7h7272cbkmfqh6fazkbq75yr92561qq5i9hqc8"; + version = "3.85.20240304"; + sha256 = "01hfjw146qxrjwp4acr55vgksrwdjwpj9d66glxggihzi3cl822k"; }; - "yzhang"."markdown-all-in-one" = vscode-utils.extensionFromVscodeMarketplace { name = "markdown-all-in-one"; publisher = "yzhang"; version = "3.6.2"; sha256 = "1n9d3qh7vypcsfygfr5rif9krhykbmbcgf41mcjwgjrf899f11h4"; }; - "dart-code"."flutter" = vscode-utils.extensionFromVscodeMarketplace { name = "flutter"; publisher = "dart-code"; - version = "3.81.20231227"; - sha256 = "12cfg4dwf9cbhl2bglfr44rqlmbx5asa7hspgdmwr64hd38wm2px"; + version = "3.85.20240301"; + sha256 = "0wz6bzjjd1z3pg5gv6ywqv5is6qfi1isszqr4dm97nmlph4bh59d"; }; - "donjayamanne"."python-environment-manager" = vscode-utils.extensionFromVscodeMarketplace { name = "python-environment-manager"; publisher = "donjayamanne"; version = "1.2.4"; sha256 = "02pdq9cllnr2ih638cbhfldsw4l8v6091fxk8wp7yvpylfhywfyn"; }; - "davidanson"."vscode-markdownlint" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-markdownlint"; publisher = "davidanson"; - version = "0.53.0"; - sha256 = "1jd2bgzmk11jgv897605ibfl38lr0yssmic6yv6mrrwcgvmrg402"; + version = "0.54.0"; + sha256 = "171qw6mymc9hmm8xin3gwr8r2ac8yfr3s8agagsqq9193cawbcq6"; }; - "vscodevim"."vim" = vscode-utils.extensionFromVscodeMarketplace { name = "vim"; publisher = "vscodevim"; version = "1.27.2"; sha256 = "0m5gdyvd3yg52d8zxwdw188wqjfvdyyvwnw5dz57pn633g5bi49v"; }; - "bradlc"."vscode-tailwindcss" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.11.39"; - sha256 = "1l3iqkyj876ydg6qb0zzibbdx3603q46ivnyxgg0hc024fz47vzq"; + version = "0.11.40"; + sha256 = "10z3gj6jcyszsg6nkqdsfvkl7jhcw5p55122g9515v20vdwqwg4y"; }; - "ms-vscode"."hexeditor" = vscode-utils.extensionFromVscodeMarketplace { name = "hexeditor"; publisher = "ms-vscode"; - version = "1.9.12"; - sha256 = "0m8g3bd9gk0n3wcqy5w3kjz0sr06q0i88m7z8fkx52x9nla75lkf"; + version = "1.9.14"; + sha256 = "0fncakv8v8p1rhka5dvh87kc0vsfaxg1s48blwhv7r6fyw70b9jm"; }; - "firefox-devtools"."vscode-firefox-debug" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-firefox-debug"; publisher = "firefox-devtools"; version = "2.9.10"; sha256 = "1w6ncs6f0azi4745zx82pi2z2zxn5vdvyr08y6kk7apzq89ybsy6"; }; - "james-yu"."latex-workshop" = vscode-utils.extensionFromVscodeMarketplace { name = "latex-workshop"; publisher = "james-yu"; - version = "9.18.0"; - sha256 = "105m211np7m8izg6ciffjaqy7yyzl5b9f7jvfrhi4xajdg6pi8ik"; + version = "9.18.2"; + sha256 = "1bzzrq8bd73gjs8jrqnwqil6hd6bs6zbbrv35ngz31hx7wsgkw1s"; + }; + "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { + name = "rust-analyzer"; + publisher = "rust-lang"; + version = "0.4.1818"; + sha256 = "sha256-PqIqoeDxgwNzXSIaAIgslR7PyeU9Kc5iHaFhRWOL7Tc="; }; - "johnpapa"."vscode-peacock" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-peacock"; publisher = "johnpapa"; version = "4.2.3"; sha256 = "04a5akgdzwr05snwam7r9m9mgyani48hy4c4xx9hp8nh7ddfwn29"; }; - - "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { - name = "rust-analyzer"; - publisher = "rust-lang"; - version = "0.4.1818"; - sha256 = "028489jb8f4yy1g8bimna2fk0sk59ymj1zz5yavpm229ln24xkaw"; + "ms-dotnettools"."csdevkit" = vscode-utils.extensionFromVscodeMarketplace { + name = "csdevkit"; + publisher = "ms-dotnettools"; + version = "1.4.6"; + sha256 = "14q5s272mwnwrvy9ihynq1dvb96zz82ms96273vklbdn2i51f9bl"; + }; + "sonarsource"."sonarlint-vscode" = vscode-utils.extensionFromVscodeMarketplace { + name = "sonarlint-vscode"; + publisher = "sonarsource"; + version = "4.3.0"; + sha256 = "14cdyiq9wf0yrxkh1sfszmp9vb0qvkp99xs6wxz2y4n8y5npryp6"; }; - "vsls-contrib"."gitdoc" = vscode-utils.extensionFromVscodeMarketplace { name = "gitdoc"; publisher = "vsls-contrib"; version = "0.1.0"; sha256 = "0sb5iwsrcqh6gsdngqy1wm6f6kqgqmx2kpqp6hkqri41j2phydjy"; }; - - "ms-dotnettools"."csdevkit" = vscode-utils.extensionFromVscodeMarketplace { - name = "csdevkit"; - publisher = "ms-dotnettools"; - version = "1.3.6"; - sha256 = "1rwz7cs5raa5mlxal9rs33kbv99iaas82wjr0i1ii7mmps6k0djr"; - }; - "hediet"."vscode-drawio" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-drawio"; publisher = "hediet"; version = "1.6.6"; sha256 = "0hwvcncl2206p7yjh7flr9qxxpk80mdj32fqh7wi57fb5sfi5xs8"; }; - "bierner"."markdown-mermaid" = vscode-utils.extensionFromVscodeMarketplace { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.21.0"; - sha256 = "1ix0l8h1g32yn65nsc1sja7ddh42y5wdxbr7w753zdqyx04rs8v3"; + version = "1.22.0"; + sha256 = "1ii6slnmj5ck40mdnixbybqjqbmqg7wl7yqw66p31wsnpqk71q28"; }; - "alexisvt"."flutter-snippets" = vscode-utils.extensionFromVscodeMarketplace { name = "flutter-snippets"; publisher = "alexisvt"; version = "3.0.0"; sha256 = "1vq4xpzdkk0bima5mx4nzxrfcqf168pm9wj0xi50lpv24vw4db24"; }; - "denoland"."vscode-deno" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-deno"; publisher = "denoland"; - version = "3.33.1"; - sha256 = "00b9gz599h4dd3f9yy8nnr5vrx210j4pxhhzi4gmj16fbpaj7jp6"; + version = "3.33.3"; + sha256 = "039yj1c9w42w3nwg00ab4kjwxzznscq481rkbjw5mi094cfmh1lk"; }; - "jdinhlife"."gruvbox" = vscode-utils.extensionFromVscodeMarketplace { name = "gruvbox"; publisher = "jdinhlife"; version = "1.18.0"; sha256 = "07iy4649vjqif40agvp2ck9695vl1kv4zv69rn4j6hi0jra8dhg2"; }; - "bierner"."markdown-footnotes" = vscode-utils.extensionFromVscodeMarketplace { name = "markdown-footnotes"; publisher = "bierner"; version = "0.1.1"; sha256 = "1pp64x8cn4vmpscmzv2dg6bakjhnwd36rms2wl6bs5laq29k5wl7"; }; - "bpruitt-goddard"."mermaid-markdown-syntax-highlighting" = vscode-utils.extensionFromVscodeMarketplace { name = "mermaid-markdown-syntax-highlighting"; publisher = "bpruitt-goddard"; version = "1.6.0"; sha256 = "14vkkha82pnvvpg4pnzi4d5k9wp272mjmd2m3mrx0jn2kj9r10ax"; }; - "sswg"."swift-lang" = vscode-utils.extensionFromVscodeMarketplace { name = "swift-lang"; publisher = "sswg"; - version = "1.7.2"; - sha256 = "0h89skpyh5f8ri3jw8d63s0723fd0r6ha43r3cmvn1mzd0xqv8b1"; + version = "1.8.0"; + sha256 = "142qii5lcvp2fmvknjl2zziyydmac76jdxqsnrc2a8pf09hbgd74"; }; - "arcanis"."vscode-zipfs" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-zipfs"; publisher = "arcanis"; version = "3.0.0"; sha256 = "0wvrqnsiqsxb0a7hyccri85f5pfh9biifq4x2bllpl8mg79l5m68"; }; - - "tauri-apps"."tauri-vscode" = vscode-utils.extensionFromVscodeMarketplace { name = "tauri-vscode"; publisher = "tauri-apps"; version = "0.2.6"; sha256 = "03nfyiac562kpndy90j7vc49njmf81rhdyhjk9bxz0llx4ap3lrv"; }; - "foam"."foam-vscode" = vscode-utils.extensionFromVscodeMarketplace { name = "foam-vscode"; publisher = "foam"; - version = "0.25.7"; - sha256 = "11za3jb47vrxwxy6mqmvf23amkz27sfhjxfzrchl57ygzw5d0q84"; + version = "0.25.8"; + sha256 = "0b3bjiw5s0i1jajc9ybmmri566gr8mp68flbyxpn4mqs4bwdfxdn"; }; - "quarto"."quarto" = vscode-utils.extensionFromVscodeMarketplace { name = "quarto"; publisher = "quarto"; - version = "1.110.1"; - sha256 = "0q25595v6jknb5rw14sy8wd2mpqbg52ffhrk5nwcw5fx9sfk4kgn"; + version = "1.111.0"; + sha256 = "196axk27vclp3iaxf7230sgxjp592p858ga6idrhw61r7nnsngd8"; }; - "jnoortheen"."nix-ide" = vscode-utils.extensionFromVscodeMarketplace { name = "nix-ide"; publisher = "jnoortheen"; version = "0.2.2"; sha256 = "1264027sjh9a112si0y0p3pk3y36shj5b4qkpsj207z7lbxqq0wg"; }; - "mkhl"."direnv" = vscode-utils.extensionFromVscodeMarketplace { name = "direnv"; publisher = "mkhl"; diff --git a/flake.lock b/flake.lock index 3a344c38..e1da3ec3 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1707707289, - "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", + "lastModified": 1709434167, + "narHash": "sha256-2VLj0k4GNZCISN/1uf02GSaLwM1iBbTwWRLJWbjh/fw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", + "rev": "17c2ca3c7537a2512224242b84e1ea3c08e79b92", "type": "github" }, "original": { @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1707524024, - "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=", + "lastModified": 1709439398, + "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=", "owner": "nix-community", "repo": "disko", - "rev": "d07de570ba05cec2807d058daaa044f6955720c7", + "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", + "lastModified": 1708547820, + "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", + "rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "impermanence": { "locked": { - "lastModified": 1706639736, - "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=", + "lastModified": 1708968331, + "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045", + "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", "type": "github" }, "original": { @@ -397,11 +397,11 @@ ] }, "locked": { - "lastModified": 1706141075, - "narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", + "lastModified": 1709424235, + "narHash": "sha256-znvi6iSclLj9VpJspgw1x/ODCFsiuRIY8dk9vqR5qNM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", + "rev": "22225800f7c24e7460026a5b6c9c94187d67555f", "type": "github" }, "original": { @@ -417,11 +417,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707700468, - "narHash": "sha256-awDZrGbSMNQ5X9Z4o2YCxtO7p9AuwkG+16qw2Y8Ezoc=", + "lastModified": 1709428697, + "narHash": "sha256-NpXo8PhCG1lg731w9/7mn31zRG5ie2UwEg+QpjTSO/8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "728418f4de5d01d4c4997a99a11afeb69f3da104", + "rev": "ad19653822c4b9499b47a9c6a399ae5a7dc1b319", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1707211557, - "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=", + "lastModified": 1709410583, + "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7", + "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", "type": "github" }, "original": { @@ -469,11 +469,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -485,11 +485,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1707754611, - "narHash": "sha256-FOEi58hIWGZnJ3zy7/zyfV5AfEJmekumktpuUMrQAbQ=", + "lastModified": 1709315803, + "narHash": "sha256-/hHKlXR/w2Q1CgNfMPlbu68/0kGXG6py08hzhWuA5jI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6716c0e608eed726549fd92704b9a7a7077bdf00", + "rev": "01c6ad6d0b29988f30b8526b64775e02aba126d0", "type": "github" }, "original": { @@ -519,11 +519,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1707767886, - "narHash": "sha256-YTtr2cH1JwlnfYtjf/5c/jnF/uV915tScjIvpbQI3+g=", + "lastModified": 1709492876, + "narHash": "sha256-tpo/SBwSUm40v42HaEooy3V3hgi/2hNBK1zUAvYU36s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66597639ecf740726fe61f51c9bb4f16bbfee88f", + "rev": "961ddd92a18c9259dd041affacf1b42aadfeb46c", "type": "github" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707650010, - "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=", + "lastModified": 1709309926, + "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6", + "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", "type": "github" }, "original": { @@ -600,11 +600,11 @@ "notify-nvim": { "flake": false, "locked": { - "lastModified": 1705342184, - "narHash": "sha256-WhC80NnWXEAYHLORpUPIXb2s1ERJxyK3l2L9oke68mo=", + "lastModified": 1708161547, + "narHash": "sha256-xJYPOX4YLcWojMCdP1RO22/7FMrbcBQxqxrcVCE2TrU=", "owner": "rcarriga", "repo": "nvim-notify", - "rev": "80b67b265530632505193553d05127ae7fe09ddd", + "rev": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15", "type": "github" }, "original": { @@ -813,11 +813,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { diff --git a/hm-imports/vscode/default.nix b/hm-imports/vscode/default.nix index 3c0a4ffc..968b5b4c 100644 --- a/hm-imports/vscode/default.nix +++ b/hm-imports/vscode/default.nix @@ -23,6 +23,13 @@ in jdinhlife.gruvbox # theme mkhl.direnv # direnv + + marketplace.eamodio.gitlens + marketplace.ms-vscode-remote.remote-containers + + marketplace.sonarsource.sonarlint-vscode + + # tomoki1207.pdf # reenable when latex workshop goes marketplace.johnpapa.vscode-peacock # colors per workspace @@ -50,24 +57,26 @@ in marketplace.vscjava.vscode-maven marketplace.redhat.java marketplace.ms-vscode.cpptools-extension-pack # cpp - marketplace.ms-vscode.cmake-tools + # marketplace.ms-vscode.cmake-tools # broken rn marketplace.ms-vscode.cpptools marketplace.ms-azuretools.vscode-docker # docker jnoortheen.nix-ide # nix golang.go # go marketplace.ms-python.python # python + marketplace.ms-python.vscode-pylance # python + #marketplace.ms-python.debugpy # python marketplace.donjayamanne.python-environment-manager # python marketplace.denoland.vscode-deno # deno marketplace.bradlc.vscode-tailwindcss #ms-dotnettools.csharp # c# und so #marketplace.ms-dotnettools.csdevkit - #marketplace.ms-dotnettools.csharp - #marketplace.ms-dotnettools.vscode-dotnet-runtime - #(marketplace.ms-dotnettools.csdevkit.overrideAttrs (super: a: { sourceRoot = "."; })) + # marketplace.ms-dotnettools.csharp + # marketplace.ms-dotnettools.vscode-dotnet-runtime + # (marketplace.ms-dotnettools.csdevkit.overrideAttrs (super: a: { sourceRoot = "."; })) rust-lang.rust-analyzer # rust marketplace.sswg.swift-lang # swift #marketplace.vadimcn.vscode-lldb # swift - # marketplace.ms-toolsai.jupyter # jupiter notebooks, broken on 2023-12-19 + #marketplace.ms-toolsai.jupyter # jupiter notebooks, broken on 2023-12-19 marketplace.ms-toolsai.jupyter-renderers #ms-toolsai.jupyter #marketplace.jakebecker.elixir-ls # elixir diff --git a/hm-imports/vscode/extensions.toml b/hm-imports/vscode/extensions.toml index 570334fa..36c3d5d1 100644 --- a/hm-imports/vscode/extensions.toml +++ b/hm-imports/vscode/extensions.toml @@ -1,4 +1,4 @@ -vscode_version = "1.85.1" +vscode_version = "1.86.2" [[extensions]] publisher_name = "vscodevim" @@ -14,9 +14,20 @@ extension_name = "direnv" # tomoki1207.pdf # reenable when latex workshop goes +[[extensions]] +publisher_name = "eamodio" +extension_name = "gitlens" + +[[extensions]] +publisher_name = "ms-vscode-remote" +extension_name = "remote-containers" + [[extensions]] publisher_name = "johnpapa" extension_name = "vscode-peacock" +[[extensions]] +publisher_name = "sonarsource" +extension_name = "sonarlint-vscode" # notetaking [[extensions]] @@ -111,6 +122,12 @@ extension_name = "go" publisher_name = "ms-python" extension_name = "python" [[extensions]] +publisher_name = "ms-python" +extension_name = "vscode-pylance" +[[extensions]] +publisher_name = "ms-python" +extension_name = "debugpy" +[[extensions]] publisher_name = "donjayamanne" extension_name = "python-environment-manager" [[extensions]] diff --git a/hm-imports/xonsh/default.nix b/hm-imports/xonsh/default.nix index 08090f25..a739f7f9 100644 --- a/hm-imports/xonsh/default.nix +++ b/hm-imports/xonsh/default.nix @@ -4,6 +4,9 @@ let xonsh = pkgs.unstable.xonsh.override { extraPackages = ps: [ + ps.numpy + ps.pandas + ps.requests (ps.buildPythonPackage { pname = "xonsh-direnv"; version = "0.0.0"; @@ -13,8 +16,12 @@ let pname = "xonsh-fish-completer"; version = "0.0.0"; format = "pyproject"; - doCheck = false; src = inputs.xonsh-fish-completer; + prePatch = '' + pkgs.lib.substituteInPlace pyproject.toml --replace '"xonsh>=0.12.5"' "" + ''; + patchPhase = "sed -i -e 's/^dependencies.*$/dependencies = []/' pyproject.toml"; + doCheck = false; propagatedBuildInputs = [ ps.setuptools ]; diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix index 3e664dcc..a7e891bd 100644 --- a/hosts/daedalus/default.nix +++ b/hosts/daedalus/default.nix @@ -10,16 +10,27 @@ with lib.my; homebrew = { enable = true; + taps = [ + "cormacrelf/tap" # dark-notify + "leoafarias/fvm" # flutter version manager + ]; brews = [ "cormacrelf/tap/dark-notify" + "lima" + "docker" # docker cli + "docker-compose" + "leoafarias/fvm/fvm" # flutter version manager + "cocoapods" # flutter/other ios shit ]; casks = [ "hammerspoon" "android-platform-tools" "alfred" "ukelele" - "homebrew/cask-drivers/zsa-wally" - "lens" +# "homebrew/cask-drivers/zsa-wally" + "thunderbird" + "openlens" + "ferdium" "discord" "finicky" "vlc" @@ -29,6 +40,10 @@ with lib.my; "iterm2" "signal" "eqmac" + "syncthing" + "android-studio" + "temurin" + "whisky" ]; #masApps = { @@ -135,7 +150,7 @@ with lib.my; VISUAL = "nvim"; COLORTERM = "truecolor"; # emacs tty fix PATH = "$PATH:$HOME/go/bin:$HOME/development/flutter/bin:/Applications/Android Studio.app/Contents/bin/:/Applications/Docker.app/Contents/Resources/bin:/Applications/Android Studio.app/Contents/jre/Contents/Home/bin"; - JAVA_HOME = "/Applications/Android Studio.app/Contents/jre/Contents/Home/"; + # JAVA_HOME = "/Applications/Android Studio.app/Contents/jre/Contents/Home/"; }; home.packages = with pkgs; [ mosh @@ -146,6 +161,7 @@ with lib.my; cmake pandoc + micromamba #unstable.qutebrowser #unstable.python311Packages.adblock diff --git a/hosts/ds9/default.nix b/hosts/ds9/default.nix index 1913d89d..a5d3be94 100644 --- a/hosts/ds9/default.nix +++ b/hosts/ds9/default.nix @@ -163,7 +163,7 @@ in _smb._tcp 445 - ds9.hailsatan.eu + ds9.kangaroo-galaxy.ts.net _device-info._tcp @@ -174,7 +174,7 @@ in _adisk._tcp sys=waMa=0,adVF=0x100 dk0=adVN=TimeMachine,adVF=0x82 - ds9.hailsatan.eu + ds9.kangaroo-galaxy.ts.net '';