From bca3a99f9d1e9c8e38e76a2169a439a7ca53a52b Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 21 Aug 2024 10:09:41 -0500 Subject: [PATCH] a lot of changes... --- .config/ags/config.js | 2 +- .config/tridactyl/tridactylrc | 4 +- flake.lock | 156 +- flake.nix | 2 + home/home.nix | 2 + home/modules/hyprland.nix | 10 +- modules/gaming.nix | 2 +- pkgs/base-packages.nix | 6 +- pkgs/desktop-packages.nix | 7 +- qmk/manifest.scm | 473 ----- scripts/quicklisp.lisp | 1757 ++++++++++++++++++ scripts/update-nix | 6 +- scripts/upgrade-nix | 2 +- systemd-units/user/aw-qt.service | 8 - systemd-units/user/jellyfin-mpv-shim.service | 8 - systemd-units/user/lolcate-update.service | 8 - systemd-units/user/lolcate-update.timer | 10 - systemd-units/user/mail.service | 8 - systemd-units/user/mail.timer | 9 - systemd-units/user/secretserviced.service | 14 - systems/kaladin/hardware-configuration.nix | 38 +- 21 files changed, 1858 insertions(+), 674 deletions(-) delete mode 100644 qmk/manifest.scm create mode 100644 scripts/quicklisp.lisp delete mode 100644 systemd-units/user/aw-qt.service delete mode 100644 systemd-units/user/jellyfin-mpv-shim.service delete mode 100644 systemd-units/user/lolcate-update.service delete mode 100644 systemd-units/user/lolcate-update.timer delete mode 100644 systemd-units/user/mail.service delete mode 100644 systemd-units/user/mail.timer delete mode 100644 systemd-units/user/secretserviced.service diff --git a/.config/ags/config.js b/.config/ags/config.js index 4989a7b..6becff8 100644 --- a/.config/ags/config.js +++ b/.config/ags/config.js @@ -180,7 +180,7 @@ function Bar(monitor = 0) { App.config({ style: css, windows: [ - Bar(laptop ? 0 : 1), // can be instantiated for each monitor + Bar(laptop ? 0 : 0), // can be instantiated for each monitor NotificationPopups(), (laptop ? BatteryPopup() : null) ], diff --git a/.config/tridactyl/tridactylrc b/.config/tridactyl/tridactylrc index 8b476c5..ff008da 100644 --- a/.config/tridactyl/tridactylrc +++ b/.config/tridactyl/tridactylrc @@ -6,7 +6,7 @@ set update.nagwait 7 set update.lastnaggedversion 1.14.0 set update.checkintervalsecs 86400 set searchurls.gh https://github.com/search?utf8=✓&q= -set searchurls.y https://www.yewtu.be/search?q= +set searchurls.y https://www.inv.cochrun.xyz/search?q= set searchurls.aw https://wiki.archlinux.org/index.php?search= set searchurls.qt https://doc.qt.io/qt-5/search-results.html?q= set searchurls.mel https://melpa.org/#/?q= @@ -17,7 +17,7 @@ set searchurls.wiki https://en.wikipedia.org/wiki/Special:Search/ set searchurls.g https://www.google.com/search?q= set searchurls.d https://duckduckgo.com/?q= set searchurls.s https://search.tfcconnection.org/?q= -set searchurls.ama https://smile.amazon.com/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords= +set searchurls.ama https://amazon.com/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords= set searchurls.google https://www.google.com/search?q= set searchurls.googlelucky https://www.google.com/search?btnI=I'm+Feeling+Lucky&q= set searchurls.scholar https://scholar.google.com/scholar?q= diff --git a/flake.lock b/flake.lock index 8c6ecd6..1cff98e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,14 +20,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1718921313, - "narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=", + "lastModified": 1721306136, + "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=", "owner": "Aylur", "repo": "ags", - "rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d", + "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c", "type": "github" }, "original": { @@ -89,11 +90,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -196,11 +197,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713171039, - "narHash": "sha256-9QrWi1VqMafXPAWw126uWRn56MtwzokNxDevSTjeQ/U=", + "lastModified": 1724119075, + "narHash": "sha256-rZe4WgHhLqhu4NjGVYyIQ36ieHZgSkfnNMdLzKaqFQk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "612646835968f663fd0e8f1a21ef52b5d0b88c57", + "rev": "e197771f35c8c330324256c5f306614f273ffd9d", "type": "github" }, "original": { @@ -218,11 +219,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713106678, - "narHash": "sha256-dm4bufwlVDUE4ndsR6cAPur75hvlVRzIxbMKJCizutg=", + "lastModified": 1720177068, + "narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=", "owner": "elkowar", "repo": "eww", - "rev": "1e37f53e99016aa2cd725d7050788bb5d4fcc76a", + "rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f", "type": "github" }, "original": { @@ -243,11 +244,11 @@ ] }, "locked": { - "lastModified": 1699821751, - "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=", + "lastModified": 1722175938, + "narHash": "sha256-HKyB4HD+NdX3T233bY31hm76v3/tdQBNeLLvopKbZeY=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49", + "rev": "37e7207ac9f857eedb58b208b9dc91cd6b24e651", "type": "github" }, "original": { @@ -304,7 +305,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -322,7 +323,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1705309234, @@ -340,7 +341,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -358,7 +359,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -376,7 +377,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -392,24 +393,6 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -450,11 +433,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -492,11 +475,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713109956, - "narHash": "sha256-JMJBqWnuM3JWkoYnou/OW46FSt9UX/LpXARJTYAG6jA=", + "lastModified": 1721242107, + "narHash": "sha256-HZAEP6wfXYInAlb7oCoN9Mjoqyok08JySnLPaWR9DQU=", "owner": "chriscochrun", "repo": "lumina", - "rev": "a00f1b081a3907c664074f4164bde9c604c48c92", + "rev": "bf9f65fade0b6bd6189e9afec15b706d9253e002", "type": "gitlab" }, "original": { @@ -531,11 +514,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1712227415, - "narHash": "sha256-4EvWs6rHxCIj9FFXI4Vxh32XJaZJfIqKtAal6vJfqAs=", + "lastModified": 1723533469, + "narHash": "sha256-8gSsZpYmOzwFRaLIX0OMBvV/+SATmu/O9QXkDgsZlIg=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "1a3748a368e96e3f3a38735bd9417f634beeeace", + "rev": "6e208d6a7b554be592167f6ecad9b16c0abf96d7", "type": "github" }, "original": { @@ -547,11 +530,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1724067415, + "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "type": "github" }, "original": { @@ -590,27 +573,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713013257, - "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", + "lastModified": 1723938990, + "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", + "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1713013257, - "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -622,11 +605,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712026416, - "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080a4a27f206d07724b88da096e27ef63401a504", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "type": "github" }, "original": { @@ -654,27 +637,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711668574, - "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", + "lastModified": 1723282977, + "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -742,11 +725,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1720526170, - "narHash": "sha256-i+42syggxAdDLo9MCs+Cx3BSil8RTW3VGfLkR5gbD8E=", + "lastModified": 1724168344, + "narHash": "sha256-JqBcwOOeiXFtVGKFrutTVALleh/3wbzgIZzSh3k67bk=", "ref": "refs/heads/master", - "rev": "54551b117435a006acddefbf3850b02d6ee84ffa", - "revCount": 2040, + "rev": "8922388caa8ad879bdc2b82267bb5122afb77a1e", + "revCount": 2083, "type": "git", "url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" }, @@ -782,11 +765,11 @@ ] }, "locked": { - "lastModified": 1708395022, - "narHash": "sha256-pxHZbfDsLAAcyWz+snbudxhQPlAnK2nWGAqRx11veac=", + "lastModified": 1708999822, + "narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b4ae18c03af976549a0b6e396b2b5be56d275f8b", + "rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911", "type": "github" }, "original": { @@ -822,17 +805,16 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1713150335, - "narHash": "sha256-Ic7zCPfiSYc9nFFp+E44WFk3TBJ99J/uPZ4QXX+uPPw=", + "lastModified": 1724120436, + "narHash": "sha256-/MvfxTjco5UDBF6SEvwyeXrXwZG7nz7/mDVreQNKsWg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b186d85e747e2b7bee220ec95839fb66c868dc47", + "rev": "48e61fe824f5823e4f3f15dd9a75c19c63649269", "type": "github" }, "original": { @@ -880,11 +862,11 @@ ] }, "locked": { - "lastModified": 1719152448, - "narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=", + "lastModified": 1724091143, + "narHash": "sha256-55CrA0BNqmnS4qB812D7JY9hNBB0r36sJlErepkfeTo=", "owner": "danth", "repo": "stylix", - "rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181", + "rev": "94d70292d0c687ebacb65d00bd516cbefa18d3ca", "type": "github" }, "original": { @@ -895,16 +877,16 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 2ce7d6b..8fab645 100644 --- a/flake.nix +++ b/flake.nix @@ -87,6 +87,7 @@ inherit system; config = { allowUnfree = true; }; }; + pkgsForSystem = import nixpkgs { inherit system; config = { allowUnfree = true; }; @@ -136,6 +137,7 @@ kaladin = lib.nixosSystem { inherit system; pkgs = pkgsForSystem; + modules = [ ./systems/kaladin/configuration.nix home-manager.nixosModules.home-manager diff --git a/home/home.nix b/home/home.nix index a6724a0..765b3b4 100644 --- a/home/home.nix +++ b/home/home.nix @@ -84,6 +84,8 @@ in "audio/flac" = "mpv-slow.desktop"; "audio/wav" = "mpv-slow.desktop"; "audio/opus" = "mpv-slow.desktop"; + "audio/x-opus" = "mpv-slow.desktop"; + "audio/x-opus+ogg" = "mpv-slow.desktop"; }; defaultApplications = { "video/mp4" = "mpv.desktop"; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 59fc9f0..87641d6 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -81,7 +81,7 @@ in ''; }; home.file.".config/hypr/hyprpaper.conf" = { - source = if laptop then /home/chris/.dotfiles/.config/hypr/hyprpaper.conf else /home/chris/.dotfiles/.config/hypr/hyprpaper.conf; + source = ../../.config/hypr/hyprpaper.conf; }; wayland.windowManager.hyprland = { @@ -132,7 +132,7 @@ in #damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer layout = "master"; - no_cursor_warps = false; + # no_cursor_warps = false; }; gestures = { @@ -186,7 +186,7 @@ in master = { special_scale_factor = 0.8; mfact = 0.65; - new_is_master = false; + # new_is_master = false; new_on_top = false; }; @@ -252,8 +252,8 @@ in "SUPER,j,layoutmsg,cyclenext" "SUPERSHIFT,h,movewindow,l" "SUPERSHIFT,l,movewindow,r" - "SUPERSHIFTALT,h,layoutmsg,addmaster" - "SUPERSHIFTALT,l,layoutmsg,addmaster" + "SUPERALT,j,layoutmsg,orientationnext" + "SUPERALT,k,layoutmsg,orientationprev" "SUPERSHIFT,k,layoutmsg,swapprev" "SUPERSHIFT,j,layoutmsg,swapnext" "SUPERCTRL,l,splitratio,+0.05" diff --git a/modules/gaming.nix b/modules/gaming.nix index 4c4ef97..cec0fc6 100644 --- a/modules/gaming.nix +++ b/modules/gaming.nix @@ -3,7 +3,7 @@ with lib; { hardware.opengl = { - driSupport = true; + # driSupport = true; driSupport32Bit = true; }; programs.steam = { diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index 6e25584..82dc379 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -22,7 +22,7 @@ guile-json guile-lib scsh - radicle-cli + radicle-node # unrar p7zip zip @@ -41,7 +41,7 @@ ripgrep fd socat - ffmpeg_5-full + ffmpeg-full imagemagick libheif trash-cli @@ -54,7 +54,7 @@ samba blesh # OVMFFull - quickemu + # quickemu macchina neofetch fwupd diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index e327470..7ade926 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -19,7 +19,7 @@ with lib; ifuse dash dolphin - guix + # guix freecad picard brightnessctl @@ -99,7 +99,7 @@ with lib; qrencode # brave # scribus - # darktable + darktable # qutebrowser virt-manager virt-viewer @@ -138,12 +138,13 @@ with lib; kdenlive # olive-editor # davinci-resolve - natron + # natron glaxnimate mediainfo libmediainfo pqiv plasma5Packages.audiotube + discord # natron # digikam rubberband diff --git a/qmk/manifest.scm b/qmk/manifest.scm deleted file mode 100644 index 5a1bfbe..0000000 --- a/qmk/manifest.scm +++ /dev/null @@ -1,473 +0,0 @@ -;;; GNU Guix manifest for the QMK Firmware development environment -;;; Copyright © 2021-2023 Sergey Vlasov -;;; Copyright © 2022 Mark Dawson -;;; -;;; This program is free software: you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation, either version 3 of the License, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . - -;; This manifest file can be used to set up a development environment for the -;; QMK Firmware (https://github.com/qmk/qmk_firmware): -;; -;; $ guix shell -m path/to/manifest.scm -;; -;; Or, if this manifest.scm file is in the current directory, "guix shell" will -;; load it automatically when invoked without parameters: -;; -;; $ guix shell -;; -;; The resulting environment provides the "qmk" command that can be used to -;; compile the QMK firmware, and also the required toolchains for Arm-based and -;; AVR-based MCUs; it also provides some common flashing tools that are used -;; with those MCUs. -;; -;; Note that the system-wide configuration such as udev rules is not handled -;; here, therefore commands such as "qmk flash" or "qmk console" that actually -;; need to access the hardware may fail if that setup is not done. - -(use-modules - (ice-9 match) - (srfi srfi-1) - (guix licenses) - (guix packages) - (guix download) - (guix git-download) - (guix build-system pyproject) - (guix build-system python) - (guix build-system trivial) - (guix search-paths)) - -(use-package-modules - avr - base - bash - check - commencement - compression - embedded - flashing-tools - libusb - python - python-build - python-check - python-xyz - version-control - wget) - -;; Some Python modules that are required by QMK are not yet packaged for Guix; -;; define packages for those modules here. - -(define python-spinners - (package - (name "python-spinners") - (version "0.0.24") - (source - (origin - (method url-fetch) - (uri (pypi-uri "spinners" version)) - (sha256 (base32 "0zz2z6dpdjdq5z8m8w8dfi8by0ih1zrdq0caxm1anwhxg2saxdhy")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'patch-requirements-dev-txt - (lambda _ - ;; Update requirements from dependency==version - ;; to dependency>=version - (substitute* "requirements-dev.txt" - (("==") ">=")) - #t))))) - (native-inputs - `(("python-coverage" ,python-coverage) - ("python-nose" ,python-nose) - ("python-pylint" ,python-pylint) - ("python-tox" ,python-tox))) - (home-page "https://github.com/manrajgrover/py-spinners") - (synopsis "More than 60 spinners for terminal") - (description "More than 60 spinners for terminal, python wrapper for amazing node library cli-spinners.") - (license expat))) - -(define python-log-symbols - (package - (name "python-log-symbols") - (version "0.0.14") - (source - (origin - (method url-fetch) - (uri (pypi-uri "log_symbols" version)) - (sha256 (base32 "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'patch-requirements-dev-txt - (lambda _ - ;; Update requirements from dependency==version - ;; to dependency>=version - (substitute* "requirements-dev.txt" - (("==") ">=")) - #t))))) - (native-inputs - `(("python-coverage" ,python-coverage) - ("python-nose" ,python-nose) - ("python-pylint" ,python-pylint) - ("python-tox" ,python-tox))) - (propagated-inputs - `(("python-colorama" ,python-colorama))) - (home-page "https://github.com/manrajgrover/py-log-symbols") - (synopsis "Colored symbols for various log levels for Python") - (description "Colored symbols for various log levels for Python.") - (license expat))) - -(define python-halo - (package - (name "python-halo") - (version "0.0.31") - (source - (origin - (method url-fetch) - (uri (pypi-uri "halo" version)) - (sha256 (base32 "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv")))) - (build-system python-build-system) - (native-inputs - `(("python-coverage" ,python-coverage) - ("python-nose" ,python-nose) - ("python-pylint" ,python-pylint) - ("python-tox" ,python-tox) - ("python-twine" ,python-twine))) - (propagated-inputs - `(("python-log-symbols" ,python-log-symbols) - ("python-spinners" ,python-spinners) - ("python-termcolor" ,python-termcolor) - ("python-colorama" ,python-colorama) - ("python-six" ,python-six))) - (home-page "https://github.com/manrajgrover/halo") - (synopsis "Beautiful spinners for terminal, IPython and Jupyter") - (description "Beautiful spinners for terminal, IPython and Jupyter.") - (license expat))) - -(define python-milc - (package - (name "python-milc") - (version "1.6.6") - (source - (origin - (method url-fetch) - (uri (pypi-uri "milc" version)) - (sha256 (base32 "007hdwp659s1wfld92pxdgjz9ijvh949wyf1cbmyzkma30vng8d4")))) - (build-system python-build-system) - (propagated-inputs - `(("python-appdirs" ,python-appdirs) - ("python-argcomplete" ,python-argcomplete) - ("python-colorama" ,python-colorama) - ("python-halo" ,python-halo) - ("python-spinners" ,python-spinners))) - (home-page "https://milc.clueboard.co/") - (synopsis "Batteries-Included Python 3 CLI Framework") - (description "MILC is a framework for writing CLI applications in Python 3.6+. It gives you all the features users expect from a modern CLI tool out of the box.") - (license expat))) - -(define python-hjson - (package - (name "python-hjson") - (version "3.1.0") - (source - (origin - ;; Sources on pypi don't contain data files for tests - (method git-fetch) - (uri (git-reference - (url "https://github.com/hjson/hjson-py") - ;; No proper v3.1.0 tag on github, but the actual code seems to - ;; match what's on pypi - (commit "1687b811fcbbc54b5ac71cfbaa99f805e406fbcb"))) - (file-name (git-file-name name version)) - (sha256 (base32 "1qfqnhvfx5mm7bdajjnnagmvns1zxyksjzh3k5la2ag6a8bp5gki")))) - (build-system python-build-system) - (home-page "http://github.com/hjson/hjson-py") - (synopsis "Human JSON implementation for Python") - (description "Hjson is a syntax extension to JSON. It is intended to be used like a user interface for humans, to read and edit before passing the JSON data to the machine. This package contains a Python library for parsing and generating Hjson.") - (license expat))) - -(define python-dotty-dict - (package - (name "python-dotty-dict") - (version "1.3.1") - (source - (origin - ;; Sources on pypi don't contain data files for tests - (method git-fetch) - (uri (git-reference - (url "https://github.com/pawelzny/dotty_dict") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 "0rs83pglkgb4sfnk09rskg8c53hvl7mkjw4vfgl5xc8z13vyi3li")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'build 'pretend-version - ;; Workaround for building from a checkout without git metadata - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version)))))) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-setuptools-scm" ,python-setuptools-scm))) - (home-page "https://github.com/pawelzny/dotty_dict") - (synopsis "Dictionary wrapper for quick access to deeply nested keys") - (description "Dictionary wrapper for quick access to deeply nested keys.") - (license expat))) - -(define python-hid - (package - (name "python-hid") - (version "1.0.5") - (source - (origin - (method url-fetch) - (uri (pypi-uri "hid" version)) - (sha256 (base32 "1s5hvfbmnlmifswr5514f4xxn5rcd429bdcdqzgwkdxrg9zlx58y")))) - (build-system python-build-system) - (arguments - `(#:modules ((srfi srfi-1) - (srfi srfi-26) - (guix build utils) - (guix build python-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-hidapi-reference - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "hid/__init__.py" - (("library_paths = \\(") - (string-append - "library_paths = ('" - (find (negate symbolic-link?) - (find-files (assoc-ref inputs "hidapi") - "^libhidapi-.*\\.so\\..*")) - "',"))) - #t))))) - (inputs - `(("hidapi" ,hidapi))) - (native-inputs - `(("python-nose" ,python-nose))) - (home-page "https://github.com/apmorton/pyhidapi") - (synopsis "hidapi bindings in ctypes") - (description "Python wrapper for the hidapi library using ctypes.") - (license expat))) - -;; "python-qmk" is the QMK CLI package which provides the "qmk" command. - -(define python-qmk - (package - (name "python-qmk") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "qmk" version)) - (sha256 (base32 "1619q9v90740dbg8xpzqlhwcasz42xj737803aiip8qc3a7zhwgq")))) - (build-system pyproject-build-system) - (arguments - `(#:tests? #f)) - (propagated-inputs - `(("python-hid" ,python-hid) - ("python-pyusb" ,python-pyusb) - ("python-milc" ,python-milc) - ("python-setuptools" ,python-setuptools) - ("python-dotty-dict" ,python-dotty-dict) - ("python-hjson" ,python-hjson) - ("python-jsonschema" ,python-jsonschema) - ("python-pillow" ,python-pillow) - ("python-pygments" ,python-pygments) - ("python-pyserial" ,python-pyserial))) - (home-page "https://qmk.fm/") - (synopsis "QMK CLI is a program to help users work with QMK Firmware") - (description "QMK CLI provides various functions for working with QMK Firmware: getting the QMK Firmware sources, setting up the build environment, compiling and flashing the firmware, accessing the debug console provided by the firmware, and many more functions used for the QMK Firmware configuration and development.") - (license expat))) - -;; Workaround for https://issues.guix.info/issue/39794#8 (the bug report is -;; closed, but the issue is not actually fixed) - all cross compilers use the -;; same CROSS_*_PATH environment variables, therefore including more than one -;; cross compiler in the profile breaks all of them except the last one, -;; because the include and library paths from all cross compilers get combined -;; into the same variables. - -(define (qmk-wrap-toolchain toolchain-name toolchain-package toolchain-env-prefix) - - ;; Make a new list of inputs by applying PROC to all packages listed in - ;; INPUTS and keeping the same labels and outputs. - (define (map-inputs proc inputs) - (define (rewrite input) - (match input - ((label (? package? package) outputs ...) - (cons* label (proc package) outputs)) - (_ - input))) - (map rewrite inputs)) - - ;; Return the list of search path specifications from SEARCH-PATHS which - ;; variable names are not found in the VAR-NAMES alist. - (define (delete-from-search-paths search-paths var-names) - (define (keep search-path) - (not (assoc (search-path-specification-variable search-path) var-names))) - (filter keep search-paths)) - - ;; Return package ORIGINAL with search path specifications matching VAR-NAMES - ;; removed from native-search-paths. - (define (package-without-native-search-paths original var-names) - (package/inherit original - (native-search-paths - (delete-from-search-paths (package-native-search-paths original) var-names)))) - - ;; Make a new list of inputs from INPUTS by removing native search path - ;; specifications matching VAR-NAMES from all listed packages. - (define (inputs-without-native-search-paths inputs var-names) - (define (rewrite package) - (package-without-native-search-paths package var-names)) - (map-inputs rewrite inputs)) - - (let* ((wrapper-name (string-append "qmk-" toolchain-name)) - (modules '((guix build utils))) - - ;; List of search paths set by the toolchain that must be saved. - (saved-search-paths - (filter - (lambda (search-path) - (let* ((var (search-path-specification-variable search-path))) - (and (string-prefix? "CROSS_" var) - (string-suffix? "_PATH" var)))) - (package-transitive-native-search-paths toolchain-package))) - - ;; Association list that maps the original environment variable names - ;; for search paths to the architecture specific environment variable - ;; names (which must not collide between different toolchains). - (search-path-var-names - (map - (lambda (search-path) - (let* ((var (search-path-specification-variable search-path))) - (cons var (string-append toolchain-env-prefix "_" var)))) - saved-search-paths)) - - ;; List of new search paths with architecture specific environment - ;; variable names. - (new-search-paths - (map - (lambda (search-path) - (search-path-specification - (inherit search-path) - (variable - (assoc-ref search-path-var-names - (search-path-specification-variable search-path))))) - saved-search-paths)) - - ;; Shell code for setting the environment variable values that would - ;; actually be used by the compiler from the architecture specific - ;; environment variables. The code is a sequence of lines like: - ;; VAR="${ARCH_VAR}" \ - ;; (the last line also contains a backslash and is intended to - ;; combine with the "exec" statement at the next line in the shell - ;; wrapper script). - (search-path-copy-code - (apply string-append - (map - (lambda (var-mapping) - (string-append (car var-mapping) "=\"${" (cdr var-mapping) "}\" \\\n")) - search-path-var-names))) - - ;; The toolchain package with all CROSS_*_PATH native search paths - ;; removed from its propagated inputs (these variables will be set to - ;; their original values in the wrapper scripts, but leaving them - ;; listed in native-search-paths will cause them to be exported with - ;; inappropriately combined values taken from multiple different - ;; toolchains). - (new-toolchain-package - (package/inherit toolchain-package - (propagated-inputs - (inputs-without-native-search-paths - (package-propagated-inputs toolchain-package) - search-path-var-names))))) - - ;; Generate a wrapper package with most properties copied from the original - ;; toolchain package. - (package - (name wrapper-name) - (version (package-version toolchain-package)) - (source #f) - (build-system trivial-build-system) - (arguments - `(#:modules ,modules - #:builder - (begin - ;; Generate wrapper scripts for all executables from the "gcc" - ;; package in the toolchain. - (use-modules ,@modules) - (let* ((wrapper-bin-dir (string-append %output "/bin")) - (bash (assoc-ref %build-inputs "bash")) - (gcc (assoc-ref %build-inputs "gcc")) - (bash-binary (string-append bash "/bin/bash")) - (gcc-bin-dir (string-append gcc "/bin"))) - (mkdir %output) - (mkdir wrapper-bin-dir) - (for-each - (lambda (bin) - (let* ((bin-name (basename bin)) - (wrapper (string-append wrapper-bin-dir "/" bin-name))) - (call-with-output-file wrapper - (lambda (port) - (format port "#!~a~%~aexec ~a \"$@\"~%" - bash-binary - ,search-path-copy-code - bin))) - (chmod wrapper #o755))) - (find-files gcc-bin-dir)) - #t)))) - (inputs - `(("bash" ,bash) - ("gcc" ,(first (assoc-ref (package-transitive-target-inputs toolchain-package) "gcc"))))) - (propagated-inputs - `((,toolchain-name ,new-toolchain-package))) - (native-search-paths new-search-paths) - (synopsis (package-synopsis toolchain-package)) - (description (package-description toolchain-package)) - (home-page (package-home-page toolchain-package)) - (license (package-license toolchain-package))))) - -(define qmk-avr-toolchain - (qmk-wrap-toolchain "avr-toolchain" - avr-toolchain - "AVR")) - -(define qmk-arm-none-eabi-nano-toolchain-7-2018-q2-update - (qmk-wrap-toolchain "arm-none-eabi-nano-toolchain-7-2018-q2-update" - arm-none-eabi-nano-toolchain-7-2018-q2-update - "ARM_NONE_EABI_NANO")) - -;; Finally make the manifest with all required packages. - -(packages->manifest - (list - - ;; Toolchains - qmk-arm-none-eabi-nano-toolchain-7-2018-q2-update - qmk-avr-toolchain - - ;; Flashing tools - avrdude - dfu-programmer - dfu-util - teensy-loader-cli - - ;; Other tools required for build - git - gnu-make - python - - ;; QMK CLI - python-qmk)) diff --git a/scripts/quicklisp.lisp b/scripts/quicklisp.lisp new file mode 100644 index 0000000..6cda472 --- /dev/null +++ b/scripts/quicklisp.lisp @@ -0,0 +1,1757 @@ +;;;; +;;;; This is quicklisp.lisp, the quickstart file for Quicklisp. To use +;;;; it, start Lisp, then (load "quicklisp.lisp") +;;;; +;;;; Quicklisp is beta software and comes with no warranty of any kind. +;;;; +;;;; For more information about the Quicklisp beta, see: +;;;; +;;;; http://www.quicklisp.org/beta/ +;;;; +;;;; If you have any questions or comments about Quicklisp, please +;;;; contact: +;;;; +;;;; Zach Beane +;;;; + +(cl:in-package #:cl-user) +(cl:defpackage #:qlqs-user + (:use #:cl)) +(cl:in-package #:qlqs-user) + +(defpackage #:qlqs-info + (:export #:*version*)) + +(defvar qlqs-info:*version* "2015-01-28") + +(defpackage #:qlqs-impl + (:use #:cl) + (:export #:*implementation*) + (:export #:definterface + #:defimplementation) + (:export #:lisp + #:abcl + #:allegro + #:ccl + #:clasp + #:clisp + #:cmucl + #:cormanlisp + #:ecl + #:gcl + #:lispworks + #:mkcl + #:scl + #:sbcl)) + +(defpackage #:qlqs-impl-util + (:use #:cl #:qlqs-impl) + (:export #:call-with-quiet-compilation)) + +(defpackage #:qlqs-network + (:use #:cl #:qlqs-impl) + (:export #:open-connection + #:write-octets + #:read-octets + #:close-connection + #:with-connection)) + +(defpackage #:qlqs-progress + (:use #:cl) + (:export #:make-progress-bar + #:start-display + #:update-progress + #:finish-display)) + +(defpackage #:qlqs-http + (:use #:cl #:qlqs-network #:qlqs-progress) + (:export #:fetch + #:*proxy-url* + #:*maximum-redirects* + #:*default-url-defaults*)) + +(defpackage #:qlqs-minitar + (:use #:cl) + (:export #:unpack-tarball)) + +(defpackage #:quicklisp-quickstart + (:use #:cl #:qlqs-impl #:qlqs-impl-util #:qlqs-http #:qlqs-minitar) + (:export #:install + #:help + #:*proxy-url* + #:*asdf-url* + #:*quicklisp-tar-url* + #:*setup-url* + #:*help-message* + #:*after-load-message* + #:*after-initial-setup-message*)) + + +;;; +;;; Defining implementation-specific packages and functionality +;;; + +(in-package #:qlqs-impl) + +(eval-when (:compile-toplevel :load-toplevel :execute) + (defun error-unimplemented (&rest args) + (declare (ignore args)) + (error "Not implemented"))) + +(defmacro neuter-package (name) + `(eval-when (:compile-toplevel :load-toplevel :execute) + (let ((definition (fdefinition 'error-unimplemented))) + (do-external-symbols (symbol ,(string name)) + (unless (fboundp symbol) + (setf (fdefinition symbol) definition)))))) + +(eval-when (:compile-toplevel :load-toplevel :execute) + (defun feature-expression-passes-p (expression) + (cond ((keywordp expression) + (member expression *features*)) + ((consp expression) + (case (first expression) + (or + (some 'feature-expression-passes-p (rest expression))) + (and + (every 'feature-expression-passes-p (rest expression))))) + (t (error "Unrecognized feature expression -- ~S" expression))))) + + +(defmacro define-implementation-package (feature package-name &rest options) + (let* ((output-options '((:use) + (:export #:lisp))) + (prep (cdr (assoc :prep options))) + (class-option (cdr (assoc :class options))) + (class (first class-option)) + (superclasses (rest class-option)) + (import-options '()) + (effectivep (feature-expression-passes-p feature))) + (dolist (option options) + (ecase (first option) + ((:prep :class)) + ((:import-from + :import) + (push option import-options)) + ((:export + :shadow + :intern + :documentation) + (push option output-options)) + ((:reexport-from) + (push (cons :export (cddr option)) output-options) + (push (cons :import-from (cdr option)) import-options)))) + `(eval-when (:compile-toplevel :load-toplevel :execute) + ,@(when effectivep + prep) + (defclass ,class ,superclasses ()) + (defpackage ,package-name ,@output-options + ,@(when effectivep + import-options)) + ,@(when effectivep + `((setf *implementation* (make-instance ',class)))) + ,@(unless effectivep + `((neuter-package ,package-name)))))) + +(defmacro definterface (name lambda-list &body options) + (let* ((forbidden (intersection lambda-list lambda-list-keywords)) + (gf-options (remove :implementation options :key #'first)) + (implementations (set-difference options gf-options))) + (when forbidden + (error "~S not allowed in definterface lambda list" forbidden)) + (flet ((method-option (class body) + `(:method ((*implementation* ,class) ,@lambda-list) + ,@body))) + (let ((generic-name (intern (format nil "%~A" name)))) + `(eval-when (:compile-toplevel :load-toplevel :execute) + (defgeneric ,generic-name (lisp ,@lambda-list) + ,@gf-options + ,@(mapcar (lambda (implementation) + (destructuring-bind (class &rest body) + (rest implementation) + (method-option class body))) + implementations)) + (defun ,name ,lambda-list + (,generic-name *implementation* ,@lambda-list))))))) + +(defmacro defimplementation (name-and-options + lambda-list &body body) + (destructuring-bind (name &key (for t) qualifier) + (if (consp name-and-options) + name-and-options + (list name-and-options)) + (unless for + (error "You must specify an implementation name.")) + (let ((generic-name (find-symbol (format nil "%~A" name)))) + (unless (and generic-name + (fboundp generic-name)) + (error "~S does not name an implementation function" name)) + `(defmethod ,generic-name + ,@(when qualifier (list qualifier)) + ,(list* `(*implementation* ,for) lambda-list) ,@body)))) + + +;;; Bootstrap implementations + +(defvar *implementation* nil) +(defclass lisp () ()) + + +;;; Allegro Common Lisp + +(define-implementation-package :allegro #:qlqs-allegro + (:documentation + "Allegro Common Lisp - http://www.franz.com/products/allegrocl/") + (:class allegro) + (:reexport-from #:socket + #:make-socket) + (:reexport-from #:excl + #:read-vector)) + + +;;; Armed Bear Common Lisp + +(define-implementation-package :abcl #:qlqs-abcl + (:documentation + "Armed Bear Common Lisp - http://common-lisp.net/project/armedbear/") + (:class abcl) + (:reexport-from #:system + #:make-socket + #:get-socket-stream)) + +;;; Clozure CL + +(define-implementation-package :ccl #:qlqs-ccl + (:documentation + "Clozure Common Lisp - http://www.clozure.com/clozurecl.html") + (:class ccl) + (:reexport-from #:ccl + #:make-socket)) + + +;;; CLASP + +(define-implementation-package :clasp #:qlqs-clasp + (:documentation "CLASP - http://github.com/drmeister/clasp") + (:class clasp) + (:prep + (require 'sockets)) + (:intern #:host-network-address) + (:reexport-from #:sb-bsd-sockets + #:get-host-by-name + #:host-ent-address + #:socket-connect + #:socket-make-stream + #:inet-socket)) + + +;;; GNU CLISP + +(define-implementation-package :clisp #:qlqs-clisp + (:documentation "GNU CLISP - http://clisp.cons.org/") + (:class clisp) + (:reexport-from #:socket + #:socket-connect) + (:reexport-from #:ext + #:read-byte-sequence)) + + +;;; CMUCL + +(define-implementation-package :cmu #:qlqs-cmucl + (:documentation "CMU Common Lisp - http://www.cons.org/cmucl/") + (:class cmucl) + (:reexport-from #:ext + #:*gc-verbose*) + (:reexport-from #:system + #:make-fd-stream) + (:reexport-from #:extensions + #:connect-to-inet-socket)) + +(defvar qlqs-cmucl:*gc-verbose* nil) + + +;;; Scieneer CL + +(define-implementation-package :scl #:qlqs-scl + (:documentation "Scieneer Common Lisp - http://www.scieneer.com/scl/") + (:class scl) + (:reexport-from #:system + #:make-fd-stream) + (:reexport-from #:extensions + #:connect-to-inet-socket)) + +;;; ECL + +(define-implementation-package :ecl #:qlqs-ecl + (:documentation "ECL - http://ecls.sourceforge.net/") + (:class ecl) + (:prep + (require 'sockets)) + (:intern #:host-network-address) + (:reexport-from #:sb-bsd-sockets + #:get-host-by-name + #:host-ent-address + #:socket-connect + #:socket-make-stream + #:inet-socket)) + + +;;; LispWorks + +(define-implementation-package :lispworks #:qlqs-lispworks + (:documentation "LispWorks - http://www.lispworks.com/") + (:class lispworks) + (:prep + (require "comm")) + (:reexport-from #:comm + #:open-tcp-stream + #:get-host-entry)) + + +;;; SBCL + +(define-implementation-package :sbcl #:qlqs-sbcl + (:class sbcl) + (:documentation + "Steel Bank Common Lisp - http://www.sbcl.org/") + (:prep + (require 'sb-bsd-sockets)) + (:intern #:host-network-address) + (:reexport-from #:sb-ext + #:compiler-note) + (:reexport-from #:sb-bsd-sockets + #:get-host-by-name + #:inet-socket + #:host-ent-address + #:socket-connect + #:socket-make-stream)) + +;;; MKCL + +(define-implementation-package :mkcl #:qlqs-mkcl + (:class mkcl) + (:documentation + "ManKai Common Lisp - http://common-lisp.net/project/mkcl/") + (:prep + (require 'sockets)) + (:intern #:host-network-address) + (:reexport-from #:sb-bsd-sockets + #:get-host-by-name + #:inet-socket + #:host-ent-address + #:socket-connect + #:socket-make-stream)) + +;;; +;;; Utility function +;;; + +(in-package #:qlqs-impl-util) + +(definterface call-with-quiet-compilation (fun) + (:implementation t + (let ((*load-verbose* nil) + (*compile-verbose* nil) + (*load-print* nil) + (*compile-print* nil)) + (handler-bind ((warning #'muffle-warning)) + (funcall fun))))) + +(defimplementation (call-with-quiet-compilation :for sbcl :qualifier :around) + (fun) + (declare (ignorable fun)) + (handler-bind ((qlqs-sbcl:compiler-note #'muffle-warning)) + (call-next-method))) + +(defimplementation (call-with-quiet-compilation :for cmucl :qualifier :around) + (fun) + (declare (ignorable fun)) + (let ((qlqs-cmucl:*gc-verbose* nil)) + (call-next-method))) + + +;;; +;;; Low-level networking implementations +;;; + +(in-package #:qlqs-network) + +(definterface host-address (host) + (:implementation t + host) + (:implementation mkcl + (qlqs-mkcl:host-ent-address (qlqs-mkcl:get-host-by-name host))) + (:implementation sbcl + (qlqs-sbcl:host-ent-address (qlqs-sbcl:get-host-by-name host)))) + +(definterface open-connection (host port) + (:implementation t + (declare (ignorable host port)) + (error "Sorry, quicklisp in implementation ~S is not supported yet." + (lisp-implementation-type))) + (:implementation allegro + (qlqs-allegro:make-socket :remote-host host + :remote-port port)) + (:implementation abcl + (let ((socket (qlqs-abcl:make-socket host port))) + (qlqs-abcl:get-socket-stream socket :element-type '(unsigned-byte 8)))) + (:implementation ccl + (qlqs-ccl:make-socket :remote-host host + :remote-port port)) + (:implementation clasp + (let* ((endpoint (qlqs-clasp:host-ent-address + (qlqs-clasp:get-host-by-name host))) + (socket (make-instance 'qlqs-clasp:inet-socket + :protocol :tcp + :type :stream))) + (qlqs-clasp:socket-connect socket endpoint port) + (qlqs-clasp:socket-make-stream socket + :element-type '(unsigned-byte 8) + :input t + :output t + :buffering :full))) + (:implementation clisp + (qlqs-clisp:socket-connect port host :element-type '(unsigned-byte 8))) + (:implementation cmucl + (let ((fd (qlqs-cmucl:connect-to-inet-socket host port))) + (qlqs-cmucl:make-fd-stream fd + :element-type '(unsigned-byte 8) + :binary-stream-p t + :input t + :output t))) + (:implementation scl + (let ((fd (qlqs-scl:connect-to-inet-socket host port))) + (qlqs-scl:make-fd-stream fd + :element-type '(unsigned-byte 8) + :input t + :output t))) + (:implementation ecl + (let* ((endpoint (qlqs-ecl:host-ent-address + (qlqs-ecl:get-host-by-name host))) + (socket (make-instance 'qlqs-ecl:inet-socket + :protocol :tcp + :type :stream))) + (qlqs-ecl:socket-connect socket endpoint port) + (qlqs-ecl:socket-make-stream socket + :element-type '(unsigned-byte 8) + :input t + :output t + :buffering :full))) + (:implementation lispworks + (qlqs-lispworks:open-tcp-stream host port + :direction :io + :errorp t + :read-timeout nil + :element-type '(unsigned-byte 8) + :timeout 5)) + (:implementation mkcl + (let* ((endpoint (qlqs-mkcl:host-ent-address + (qlqs-mkcl:get-host-by-name host))) + (socket (make-instance 'qlqs-mkcl:inet-socket + :protocol :tcp + :type :stream))) + (qlqs-mkcl:socket-connect socket endpoint port) + (qlqs-mkcl:socket-make-stream socket + :element-type '(unsigned-byte 8) + :input t + :output t + :buffering :full))) + (:implementation sbcl + (let* ((endpoint (qlqs-sbcl:host-ent-address + (qlqs-sbcl:get-host-by-name host))) + (socket (make-instance 'qlqs-sbcl:inet-socket + :protocol :tcp + :type :stream))) + (qlqs-sbcl:socket-connect socket endpoint port) + (qlqs-sbcl:socket-make-stream socket + :element-type '(unsigned-byte 8) + :input t + :output t + :buffering :full)))) + +(definterface read-octets (buffer connection) + (:implementation t + (read-sequence buffer connection)) + (:implementation allegro + (qlqs-allegro:read-vector buffer connection)) + (:implementation clisp + (qlqs-clisp:read-byte-sequence buffer connection + :no-hang nil + :interactive t))) + +(definterface write-octets (buffer connection) + (:implementation t + (write-sequence buffer connection) + (finish-output connection))) + +(definterface close-connection (connection) + (:implementation t + (ignore-errors (close connection)))) + +(definterface call-with-connection (host port fun) + (:implementation t + (let (connection) + (unwind-protect + (progn + (setf connection (open-connection host port)) + (funcall fun connection)) + (when connection + (close connection)))))) + +(defmacro with-connection ((connection host port) &body body) + `(call-with-connection ,host ,port (lambda (,connection) ,@body))) + + +;;; +;;; A text progress bar +;;; + +(in-package #:qlqs-progress) + +(defclass progress-bar () + ((start-time + :initarg :start-time + :accessor start-time) + (end-time + :initarg :end-time + :accessor end-time) + (progress-character + :initarg :progress-character + :accessor progress-character) + (character-count + :initarg :character-count + :accessor character-count + :documentation "How many characters wide is the progress bar?") + (characters-so-far + :initarg :characters-so-far + :accessor characters-so-far) + (update-interval + :initarg :update-interval + :accessor update-interval + :documentation "Update the progress bar display after this many + internal-time units.") + (last-update-time + :initarg :last-update-time + :accessor last-update-time + :documentation "The display was last updated at this time.") + (total + :initarg :total + :accessor total + :documentation "The total number of units tracked by this progress bar.") + (progress + :initarg :progress + :accessor progress + :documentation "How far in the progress are we?") + (pending + :initarg :pending + :accessor pending + :documentation "How many raw units should be tracked in the next + display update?")) + (:default-initargs + :progress-character #\= + :character-count 50 + :characters-so-far 0 + :update-interval (floor internal-time-units-per-second 4) + :last-update-time 0 + :total 0 + :progress 0 + :pending 0)) + +(defgeneric start-display (progress-bar)) +(defgeneric update-progress (progress-bar unit-count)) +(defgeneric update-display (progress-bar)) +(defgeneric finish-display (progress-bar)) +(defgeneric elapsed-time (progress-bar)) +(defgeneric units-per-second (progress-bar)) + +(defmethod start-display (progress-bar) + (setf (last-update-time progress-bar) (get-internal-real-time)) + (setf (start-time progress-bar) (get-internal-real-time)) + (fresh-line) + (finish-output)) + +(defmethod update-display (progress-bar) + (incf (progress progress-bar) (pending progress-bar)) + (setf (pending progress-bar) 0) + (setf (last-update-time progress-bar) (get-internal-real-time)) + (let* ((showable (floor (character-count progress-bar) + (/ (total progress-bar) (progress progress-bar)))) + (needed (- showable (characters-so-far progress-bar)))) + (setf (characters-so-far progress-bar) showable) + (dotimes (i needed) + (write-char (progress-character progress-bar))) + (finish-output))) + +(defmethod update-progress (progress-bar unit-count) + (incf (pending progress-bar) unit-count) + (let ((now (get-internal-real-time))) + (when (< (update-interval progress-bar) + (- now (last-update-time progress-bar))) + (update-display progress-bar)))) + +(defmethod finish-display (progress-bar) + (update-display progress-bar) + (setf (end-time progress-bar) (get-internal-real-time)) + (terpri) + (format t "~:D bytes in ~$ seconds (~$KB/sec)" + (total progress-bar) + (elapsed-time progress-bar) + (/ (units-per-second progress-bar) 1024)) + (finish-output)) + +(defmethod elapsed-time (progress-bar) + (/ (- (end-time progress-bar) (start-time progress-bar)) + internal-time-units-per-second)) + +(defmethod units-per-second (progress-bar) + (if (plusp (elapsed-time progress-bar)) + (/ (total progress-bar) (elapsed-time progress-bar)) + 0)) + +(defun kb/sec (progress-bar) + (/ (units-per-second progress-bar) 1024)) + + + +(defparameter *uncertain-progress-chars* "?") + +(defclass uncertain-size-progress-bar (progress-bar) + ((progress-char-index + :initarg :progress-char-index + :accessor progress-char-index) + (units-per-char + :initarg :units-per-char + :accessor units-per-char)) + (:default-initargs + :total 0 + :progress-char-index 0 + :units-per-char (floor (expt 1024 2) 50))) + +(defmethod update-progress :after ((progress-bar uncertain-size-progress-bar) + unit-count) + (incf (total progress-bar) unit-count)) + +(defmethod progress-character ((progress-bar uncertain-size-progress-bar)) + (let ((index (progress-char-index progress-bar))) + (prog1 + (char *uncertain-progress-chars* index) + (setf (progress-char-index progress-bar) + (mod (1+ index) (length *uncertain-progress-chars*)))))) + +(defmethod update-display ((progress-bar uncertain-size-progress-bar)) + (setf (last-update-time progress-bar) (get-internal-real-time)) + (multiple-value-bind (chars pend) + (floor (pending progress-bar) (units-per-char progress-bar)) + (setf (pending progress-bar) pend) + (dotimes (i chars) + (write-char (progress-character progress-bar)) + (incf (characters-so-far progress-bar)) + (when (<= (character-count progress-bar) + (characters-so-far progress-bar)) + (terpri) + (setf (characters-so-far progress-bar) 0) + (finish-output))) + (finish-output))) + +(defun make-progress-bar (total) + (if (or (not total) (zerop total)) + (make-instance 'uncertain-size-progress-bar) + (make-instance 'progress-bar :total total))) + +;;; +;;; A simple HTTP client +;;; + +(in-package #:qlqs-http) + +;;; Octet data + +(deftype octet () + '(unsigned-byte 8)) + +(defun make-octet-vector (size) + (make-array size :element-type 'octet + :initial-element 0)) + +(defun octet-vector (&rest octets) + (make-array (length octets) :element-type 'octet + :initial-contents octets)) + +;;; ASCII characters as integers + +(defun acode (char) + (cond ((eql char :cr) + 13) + ((eql char :lf) + 10) + (t + (let ((code (char-code char))) + (if (<= 0 code 127) + code + (error "Character ~S is not in the ASCII character set" + char)))))) + +(defvar *whitespace* + (list (acode #\Space) (acode #\Tab) (acode :cr) (acode :lf))) + +(defun whitep (code) + (member code *whitespace*)) + +(defun ascii-vector (string) + (let ((vector (make-octet-vector (length string)))) + (loop for char across string + for code = (char-code char) + for i from 0 + if (< 127 code) do + (error "Invalid character for ASCII -- ~A" char) + else + do (setf (aref vector i) code)) + vector)) + +(defun ascii-subseq (vector start end) + "Return a subseq of octet-specialized VECTOR as a string." + (let ((string (make-string (- end start)))) + (loop for i from 0 + for j from start below end + do (setf (char string i) (code-char (aref vector j)))) + string)) + +(defun ascii-downcase (code) + (if (<= 65 code 90) + (+ code 32) + code)) + +(defun ascii-equal (a b) + (eql (ascii-downcase a) (ascii-downcase b))) + +(defmacro acase (value &body cases) + (flet ((convert-case-keys (keys) + (mapcar (lambda (key) + (etypecase key + (integer key) + (character (char-code key)) + (symbol + (ecase key + (:cr 13) + (:lf 10) + ((t) t))))) + (if (consp keys) keys (list keys))))) + `(case ,value + ,@(mapcar (lambda (case) + (destructuring-bind (keys &rest body) + case + `(,(if (eql keys t) + t + (convert-case-keys keys)) + ,@body))) + cases)))) + +;;; Pattern matching (for finding headers) + +(defclass matcher () + ((pattern + :initarg :pattern + :reader pattern) + (pos + :initform 0 + :accessor match-pos) + (matchedp + :initform nil + :accessor matchedp))) + +(defun reset-match (matcher) + (setf (match-pos matcher) 0 + (matchedp matcher) nil)) + +(define-condition match-failure (error) ()) + +(defun match (matcher input &key (start 0) end error) + (let ((i start) + (end (or end (length input))) + (match-end (length (pattern matcher)))) + (with-slots (pattern pos) + matcher + (loop + (cond ((= pos match-end) + (let ((match-start (- i pos))) + (setf pos 0) + (setf (matchedp matcher) t) + (return (values match-start (+ match-start match-end))))) + ((= i end) + (return nil)) + ((= (aref pattern pos) + (aref input i)) + (incf i) + (incf pos)) + (t + (if error + (error 'match-failure) + (if (zerop pos) + (incf i) + (setf pos 0))))))))) + +(defun ascii-matcher (string) + (make-instance 'matcher + :pattern (ascii-vector string))) + +(defun octet-matcher (&rest octets) + (make-instance 'matcher + :pattern (apply 'octet-vector octets))) + +(defun acode-matcher (&rest codes) + (make-instance 'matcher + :pattern (make-array (length codes) + :element-type 'octet + :initial-contents + (mapcar 'acode codes)))) + + +;;; "Connection Buffers" are a kind of callback-driven, +;;; pattern-matching chunky stream. Callbacks can be called for a +;;; certain number of octets or until one or more patterns are seen in +;;; the input. cbufs automatically refill themselves from a +;;; connection as needed. + +(defvar *cbuf-buffer-size* 8192) + +(define-condition end-of-data (error) ()) + +(defclass cbuf () + ((data + :initarg :data + :accessor data) + (connection + :initarg :connection + :accessor connection) + (start + :initarg :start + :accessor start) + (end + :initarg :end + :accessor end) + (eofp + :initarg :eofp + :accessor eofp)) + (:default-initargs + :data (make-octet-vector *cbuf-buffer-size*) + :connection nil + :start 0 + :end 0 + :eofp nil) + (:documentation "A CBUF is a connection buffer that keeps track of + incoming data from a connection. Several functions make it easy to + treat a CBUF as a kind of chunky, callback-driven stream.")) + +(define-condition cbuf-progress () + ((size + :initarg :size + :accessor cbuf-progress-size + :initform 0))) + +(defun call-processor (fun cbuf start end) + (signal 'cbuf-progress :size (- end start)) + (funcall fun (data cbuf) start end)) + +(defun make-cbuf (connection) + (make-instance 'cbuf :connection connection)) + +(defun make-stream-writer (stream) + "Create a callback for writing data to STREAM." + (lambda (data start end) + (write-sequence data stream :start start :end end))) + +(defgeneric size (cbuf) + (:method ((cbuf cbuf)) + (- (end cbuf) (start cbuf)))) + +(defgeneric emptyp (cbuf) + (:method ((cbuf cbuf)) + (zerop (size cbuf)))) + +(defgeneric refill (cbuf) + (:method ((cbuf cbuf)) + (when (eofp cbuf) + (error 'end-of-data)) + (setf (start cbuf) 0) + (setf (end cbuf) + (read-octets (data cbuf) + (connection cbuf))) + (cond ((emptyp cbuf) + (setf (eofp cbuf) t) + (error 'end-of-data)) + (t (size cbuf))))) + +(defun process-all (fun cbuf) + (unless (emptyp cbuf) + (call-processor fun cbuf (start cbuf) (end cbuf)))) + +(defun multi-cmatch (matchers cbuf) + (let (start end) + (dolist (matcher matchers (values start end)) + (multiple-value-bind (s e) + (match matcher (data cbuf) + :start (start cbuf) + :end (end cbuf)) + (when (and s (or (null start) (< s start))) + (setf start s + end e)))))) + +(defun cmatch (matcher cbuf) + (if (consp matcher) + (multi-cmatch matcher cbuf) + (match matcher (data cbuf) :start (start cbuf) :end (end cbuf)))) + +(defun call-until-end (fun cbuf) + (handler-case + (loop + (process-all fun cbuf) + (refill cbuf)) + (end-of-data () + (return-from call-until-end)))) + +(defun show-cbuf (context cbuf) + (format t "cbuf: ~A ~D - ~D~%" context (start cbuf) (end cbuf))) + +(defun call-for-n-octets (n fun cbuf) + (let ((remaining n)) + (loop + (when (<= remaining (size cbuf)) + (let ((end (+ (start cbuf) remaining))) + (call-processor fun cbuf (start cbuf) end) + (setf (start cbuf) end) + (return))) + (process-all fun cbuf) + (decf remaining (size cbuf)) + (refill cbuf)))) + +(defun call-until-matching (matcher fun cbuf) + (loop + (multiple-value-bind (start end) + (cmatch matcher cbuf) + (when start + (call-processor fun cbuf (start cbuf) end) + (setf (start cbuf) end) + (return))) + (process-all fun cbuf) + (refill cbuf))) + +(defun ignore-data (data start end) + (declare (ignore data start end))) + +(defun skip-until-matching (matcher cbuf) + (call-until-matching matcher 'ignore-data cbuf)) + + +;;; Creating HTTP requests as octet buffers + +(defclass octet-sink () + ((storage + :initarg :storage + :accessor storage)) + (:default-initargs + :storage (make-array 1024 :element-type 'octet + :fill-pointer 0 + :adjustable t)) + (:documentation "A simple stream-like target for collecting + octets.")) + +(defun add-octet (octet sink) + (vector-push-extend octet (storage sink))) + +(defun add-octets (octets sink &key (start 0) end) + (setf end (or end (length octets))) + (loop for i from start below end + do (add-octet (aref octets i) sink))) + +(defun add-string (string sink) + (loop for char across string + for code = (char-code char) + do (add-octet code sink))) + +(defun add-strings (sink &rest strings) + (mapc (lambda (string) (add-string string sink)) strings)) + +(defun add-newline (sink) + (add-octet 13 sink) + (add-octet 10 sink)) + +(defun sink-buffer (sink) + (subseq (storage sink) 0)) + +(defvar *proxy-url* nil) + +(defun full-proxy-path (host port path) + (format nil "~:[http~;https~]://~A~:[:~D~;~*~]~A" + (= port 443) + host + (or (= port 80) + (= port 443)) + port + path)) + +(defun make-request-buffer (host port path &key (method "GET")) + (setf method (string method)) + (when *proxy-url* + (setf path (full-proxy-path host port path))) + (let ((sink (make-instance 'octet-sink))) + (flet ((add-line (&rest strings) + (apply #'add-strings sink strings) + (add-newline sink))) + (add-line method " " path " HTTP/1.1") + (add-line "Host: " host (if (= port 80) "" + (format nil ":~D" port))) + (add-line "Connection: close") + ;; FIXME: get this version string from somewhere else. + (add-line "User-Agent: quicklisp-bootstrap/" + qlqs-info:*version*) + (add-newline sink) + (sink-buffer sink)))) + +(defun sink-until-matching (matcher cbuf) + (let ((sink (make-instance 'octet-sink))) + (call-until-matching + matcher + (lambda (buffer start end) + (add-octets buffer sink :start start :end end)) + cbuf) + (sink-buffer sink))) + + +;;; HTTP headers + +(defclass header () + ((data + :initarg :data + :accessor data) + (status + :initarg :status + :accessor status) + (name-starts + :initarg :name-starts + :accessor name-starts) + (name-ends + :initarg :name-ends + :accessor name-ends) + (value-starts + :initarg :value-starts + :accessor value-starts) + (value-ends + :initarg :value-ends + :accessor value-ends))) + +(defmethod print-object ((header header) stream) + (print-unreadable-object (header stream :type t) + (prin1 (status header) stream))) + +(defun matches-at (pattern target pos) + (= (mismatch pattern target :start2 pos) (length pattern))) + +(defun header-value-indexes (field-name header) + (loop with data = (data header) + with pattern = (ascii-vector (string-downcase field-name)) + for start across (name-starts header) + for i from 0 + when (matches-at pattern data start) + return (values (aref (value-starts header) i) + (aref (value-ends header) i)))) + +(defun ascii-header-value (field-name header) + (multiple-value-bind (start end) + (header-value-indexes field-name header) + (when start + (ascii-subseq (data header) start end)))) + +(defun all-field-names (header) + (map 'list + (lambda (start end) + (ascii-subseq (data header) start end)) + (name-starts header) + (name-ends header))) + +(defun headers-alist (header) + (mapcar (lambda (name) + (cons name (ascii-header-value name header))) + (all-field-names header))) + +(defmethod describe-object :after ((header header) stream) + (format stream "~&Decoded headers:~% ~S~%" (headers-alist header))) + +(defun content-length (header) + (let ((field-value (ascii-header-value "content-length" header))) + (when field-value + (let ((value (ignore-errors (parse-integer field-value)))) + (or value + (error "Content-Length header field value is not a number -- ~A" + field-value)))))) + +(defun chunkedp (header) + (string= (ascii-header-value "transfer-encoding" header) "chunked")) + +(defun location (header) + (ascii-header-value "location" header)) + +(defun status-code (vector) + (let* ((space (position (acode #\Space) vector)) + (c1 (- (aref vector (incf space)) 48)) + (c2 (- (aref vector (incf space)) 48)) + (c3 (- (aref vector (incf space)) 48))) + (+ (* c1 100) + (* c2 10) + (* c3 1)))) + +(defun force-downcase-field-names (header) + (loop with data = (data header) + for start across (name-starts header) + for end across (name-ends header) + do (loop for i from start below end + for code = (aref data i) + do (setf (aref data i) (ascii-downcase code))))) + +(defun skip-white-forward (pos vector) + (position-if-not 'whitep vector :start pos)) + +(defun skip-white-backward (pos vector) + (let ((nonwhite (position-if-not 'whitep vector :end pos :from-end t))) + (if nonwhite + (1+ nonwhite) + pos))) + +(defun contract-field-value-indexes (header) + "Header field values exclude leading and trailing whitespace; adjust +the indexes in the header accordingly." + (loop with starts = (value-starts header) + with ends = (value-ends header) + with data = (data header) + for i from 0 + for start across starts + for end across ends + do + (setf (aref starts i) (skip-white-forward start data)) + (setf (aref ends i) (skip-white-backward end data)))) + +(defun next-line-pos (vector) + (let ((pos 0)) + (labels ((finish (&optional (i pos)) + (return-from next-line-pos i)) + (after-cr (code) + (acase code + (:lf (finish pos)) + (t (finish (1- pos))))) + (pending (code) + (acase code + (:cr #'after-cr) + (:lf (finish pos)) + (t #'pending)))) + (let ((state #'pending)) + (loop + (setf state (funcall state (aref vector pos))) + (incf pos)))))) + +(defun make-hvector () + (make-array 16 :fill-pointer 0 :adjustable t)) + +(defun process-header (vector) + "Create a HEADER instance from the octet data in VECTOR." + (let* ((name-starts (make-hvector)) + (name-ends (make-hvector)) + (value-starts (make-hvector)) + (value-ends (make-hvector)) + (header (make-instance 'header + :data vector + :status 999 + :name-starts name-starts + :name-ends name-ends + :value-starts value-starts + :value-ends value-ends)) + (mark nil) + (pos (next-line-pos vector))) + (unless pos + (error "Unable to process HTTP header")) + (setf (status header) (status-code vector)) + (labels ((save (value vector) + (vector-push-extend value vector)) + (mark () + (setf mark pos)) + (clear-mark () + (setf mark nil)) + (finish () + (if mark + (save mark value-ends) + (save pos value-ends)) + (force-downcase-field-names header) + (contract-field-value-indexes header) + (return-from process-header header)) + (in-new-line (code) + (acase code + ((#\Tab #\Space) (setf mark nil) #'in-value) + (t + (when mark + (save mark value-ends)) + (clear-mark) + (save pos name-starts) + (in-name code)))) + (after-cr (code) + (acase code + (:lf #'in-new-line) + (t (in-new-line code)))) + (pending-value (code) + (acase code + ((#\Tab #\Space) #'pending-value) + (:cr #'after-cr) + (:lf #'in-new-line) + (t (save pos value-starts) #'in-value))) + (in-name (code) + (acase code + (#\: + (save pos name-ends) + (save (1+ pos) value-starts) + #'in-value) + ((:cr :lf) + (finish)) + ((#\Tab #\Space) + (error "Unexpected whitespace in header field name")) + (t + (unless (<= 0 code 127) + (error "Unexpected non-ASCII header field name")) + #'in-name))) + (in-value (code) + (acase code + (:lf (mark) #'in-new-line) + (:cr (mark) #'after-cr) + (t #'in-value)))) + (let ((state #'in-new-line)) + (loop + (incf pos) + (when (<= (length vector) pos) + (error "No header found in response")) + (setf state (funcall state (aref vector pos)))))))) + + +;;; HTTP URL parsing + +(defclass url () + ((hostname + :initarg :hostname + :accessor hostname + :initform nil) + (port + :initarg :port + :accessor port + :initform 80) + (path + :initarg :path + :accessor path + :initform "/"))) + +(defun parse-urlstring (urlstring) + (setf urlstring (string-trim " " urlstring)) + (let* ((pos (mismatch urlstring "http://" :test 'char-equal)) + (mark pos) + (url (make-instance 'url))) + (labels ((save () + (subseq urlstring mark pos)) + (mark () + (setf mark pos)) + (finish () + (return-from parse-urlstring url)) + (hostname-char-p (char) + (position char "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_." + :test 'char-equal)) + (at-start (char) + (case char + (#\/ + (setf (port url) nil) + (mark) + #'in-path) + (t + #'in-host))) + (in-host (char) + (case char + ((#\/ :end) + (setf (hostname url) (save)) + (mark) + #'in-path) + (#\: + (setf (hostname url) (save)) + (mark) + #'in-port) + (t + (unless (hostname-char-p char) + (error "~S is not a valid URL" urlstring)) + #'in-host))) + (in-port (char) + (case char + ((#\/ :end) + (setf (port url) + (parse-integer urlstring + :start (1+ mark) + :end pos)) + (mark) + #'in-path) + (t + (unless (digit-char-p char) + (error "Bad port in URL ~S" urlstring)) + #'in-port))) + (in-path (char) + (case char + ((#\# :end) + (setf (path url) (save)) + (finish))) + #'in-path)) + (let ((state #'at-start)) + (loop + (when (<= (length urlstring) pos) + (funcall state :end) + (finish)) + (setf state (funcall state (aref urlstring pos))) + (incf pos)))))) + +(defun url (thing) + (if (stringp thing) + (parse-urlstring thing) + thing)) + +(defgeneric request-buffer (method url) + (:method (method url) + (setf url (url url)) + (make-request-buffer (hostname url) (port url) (path url) + :method method))) + +(defun urlstring (url) + (format nil "~@[http://~A~]~@[:~D~]~A" + (hostname url) + (and (/= 80 (port url)) (port url)) + (path url))) + +(defmethod print-object ((url url) stream) + (print-unreadable-object (url stream :type t) + (prin1 (urlstring url) stream))) + +(defun merge-urls (url1 url2) + (setf url1 (url url1)) + (setf url2 (url url2)) + (make-instance 'url + :hostname (or (hostname url1) + (hostname url2)) + :port (or (port url1) + (port url2)) + :path (or (path url1) + (path url2)))) + + +;;; Requesting an URL and saving it to a file + +(defparameter *maximum-redirects* 10) +(defvar *default-url-defaults* (url "http://src.quicklisp.org/")) + +(defun read-http-header (cbuf) + (let ((header-data (sink-until-matching (list (acode-matcher :lf :lf) + (acode-matcher :cr :cr) + (acode-matcher :cr :lf :cr :lf)) + cbuf))) + (process-header header-data))) + +(defun read-chunk-header (cbuf) + (let* ((header-data (sink-until-matching (acode-matcher :cr :lf) cbuf)) + (end (or (position (acode :cr) header-data) + (position (acode #\;) header-data)))) + (values (parse-integer (ascii-subseq header-data 0 end) :radix 16)))) + +(defun save-chunk-response (stream cbuf) + "For a chunked response, read all chunks and write them to STREAM." + (let ((fun (make-stream-writer stream)) + (matcher (acode-matcher :cr :lf))) + (loop + (let ((chunk-size (read-chunk-header cbuf))) + (when (zerop chunk-size) + (return)) + (call-for-n-octets chunk-size fun cbuf) + (skip-until-matching matcher cbuf))))) + +(defun save-response (file header cbuf) + (with-open-file (stream file + :direction :output + :if-exists :supersede + :element-type 'octet) + (let ((content-length (content-length header))) + (cond ((chunkedp header) + (save-chunk-response stream cbuf)) + (content-length + (call-for-n-octets content-length + (make-stream-writer stream) + cbuf)) + (t + (call-until-end (make-stream-writer stream) cbuf)))))) + +(defun call-with-progress-bar (size fun) + (let ((progress-bar (make-progress-bar size))) + (start-display progress-bar) + (flet ((update (condition) + (update-progress progress-bar + (cbuf-progress-size condition)))) + (handler-bind ((cbuf-progress #'update)) + (funcall fun))) + (finish-display progress-bar))) + +(defun fetch (url file &key (follow-redirects t) quietly + (maximum-redirects *maximum-redirects*)) + "Request URL and write the body of the response to FILE." + (setf url (merge-urls url *default-url-defaults*)) + (setf file (merge-pathnames file)) + (let ((redirect-count 0) + (original-url url) + (connect-url (or (url *proxy-url*) url)) + (stream (if quietly + (make-broadcast-stream) + *trace-output*))) + (loop + (when (<= maximum-redirects redirect-count) + (error "Too many redirects for ~A" original-url)) + (with-connection (connection (hostname connect-url) (port connect-url)) + (let ((cbuf (make-instance 'cbuf :connection connection)) + (request (request-buffer "GET" url))) + (write-octets request connection) + (let ((header (read-http-header cbuf))) + (loop while (= (status header) 100) + do (setf header (read-http-header cbuf))) + (cond ((= (status header) 200) + (let ((size (content-length header))) + (format stream "~&; Fetching ~A~%" url) + (if (and (numberp size) + (plusp size)) + (format stream "; ~$KB~%" (/ size 1024)) + (format stream "; Unknown size~%")) + (if quietly + (save-response file header cbuf) + (call-with-progress-bar (content-length header) + (lambda () + (save-response file header cbuf)))))) + ((not (<= 300 (status header) 399)) + (error "Unexpected status for ~A: ~A" + url (status header)))) + (if (and follow-redirects (<= 300 (status header) 399)) + (let ((new-urlstring (ascii-header-value "location" header))) + (when (not new-urlstring) + (error "Redirect code ~D received, but no Location: header" + (status header))) + (incf redirect-count) + (setf url (merge-urls new-urlstring + url)) + (format stream "~&; Redirecting to ~A~%" url)) + (return (values header (and file (probe-file file))))))))))) + + +;;; A primitive tar unpacker + +(in-package #:qlqs-minitar) + +(defun make-block-buffer () + (make-array 512 :element-type '(unsigned-byte 8) :initial-element 0)) + +(defun skip-n-blocks (n stream) + (let ((block (make-block-buffer))) + (dotimes (i n) + (read-sequence block stream)))) + +(defun ascii-subseq (vector start end) + (let ((string (make-string (- end start)))) + (loop for i from 0 + for j from start below end + do (setf (char string i) (code-char (aref vector j)))) + string)) + +(defun block-asciiz-string (block start length) + (let* ((end (+ start length)) + (eos (or (position 0 block :start start :end end) + end))) + (ascii-subseq block start eos))) + +(defun prefix (header) + (when (plusp (aref header 345)) + (block-asciiz-string header 345 155))) + +(defun name (header) + (block-asciiz-string header 0 100)) + +(defun payload-size (header) + (values (parse-integer (block-asciiz-string header 124 12) :radix 8))) + +(defun nth-block (n file) + (with-open-file (stream file :element-type '(unsigned-byte 8)) + (let ((block (make-block-buffer))) + (skip-n-blocks (1- n) stream) + (read-sequence block stream) + block))) + +(defun payload-type (code) + (case code + (0 :file) + (48 :file) + (53 :directory) + (t :unsupported))) + +(defun full-path (header) + (let ((prefix (prefix header)) + (name (name header))) + (if prefix + (format nil "~A/~A" prefix name) + name))) + +(defun save-file (file size stream) + (multiple-value-bind (full-blocks partial) + (truncate size 512) + (ensure-directories-exist file) + (with-open-file (outstream file + :direction :output + :if-exists :supersede + :element-type '(unsigned-byte 8)) + (let ((block (make-block-buffer))) + (dotimes (i full-blocks) + (read-sequence block stream) + (write-sequence block outstream)) + (when (plusp partial) + (read-sequence block stream) + (write-sequence block outstream :end partial)))))) + +(defun unpack-tarball (tarfile &key (directory *default-pathname-defaults*)) + (let ((block (make-block-buffer))) + (with-open-file (stream tarfile :element-type '(unsigned-byte 8)) + (loop + (let ((size (read-sequence block stream))) + (when (zerop size) + (return)) + (unless (= size 512) + (error "Bad size on tarfile")) + (when (every #'zerop block) + (return)) + (let* ((payload-code (aref block 156)) + (payload-type (payload-type payload-code)) + (tar-path (full-path block)) + (full-path (merge-pathnames tar-path directory)) + (payload-size (payload-size block))) + (case payload-type + (:file + (save-file full-path payload-size stream)) + (:directory + (ensure-directories-exist full-path)) + (t + (warn "Unknown tar block payload code -- ~D" payload-code) + (skip-n-blocks (ceiling (payload-size block) 512) stream))))))))) + +(defun contents (tarfile) + (let ((block (make-block-buffer)) + (result '())) + (with-open-file (stream tarfile :element-type '(unsigned-byte 8)) + (loop + (let ((size (read-sequence block stream))) + (when (zerop size) + (return (nreverse result))) + (unless (= size 512) + (error "Bad size on tarfile")) + (when (every #'zerop block) + (return (nreverse result))) + (let* ((payload-type (payload-type (aref block 156))) + (tar-path (full-path block)) + (payload-size (payload-size block))) + (skip-n-blocks (ceiling payload-size 512) stream) + (case payload-type + (:file + (push tar-path result)) + (:directory + (push tar-path result))))))))) + + +;;; +;;; The actual bootstrapping work +;;; + +(in-package #:quicklisp-quickstart) + +(defvar *home* + (merge-pathnames (make-pathname :directory '(:relative "quicklisp")) + (user-homedir-pathname))) + +(defun qmerge (pathname) + (merge-pathnames pathname *home*)) + +(defun renaming-fetch (url file) + (let ((tmpfile (qmerge "tmp/fetch.dat"))) + (fetch url tmpfile) + (rename-file tmpfile file))) + +(defvar *quickstart-parameters* nil + "This plist is populated with parameters that may carry over to the + initial configuration of the client, e.g. :proxy-url + or :initial-dist-url") + +(defvar *quicklisp-hostname* "beta.quicklisp.org") + +(defvar *client-info-url* + (format nil "http://~A/client/quicklisp.sexp" + *quicklisp-hostname*)) + +(defclass client-info () + ((setup-url + :reader setup-url + :initarg :setup-url) + (asdf-url + :reader asdf-url + :initarg :asdf-url) + (client-tar-url + :reader client-tar-url + :initarg :client-tar-url) + (version + :reader version + :initarg :version) + (plist + :reader plist + :initarg :plist) + (source-file + :reader source-file + :initarg :source-file))) + +(defmethod print-object ((client-info client-info) stream) + (print-unreadable-object (client-info stream :type t) + (prin1 (version client-info) stream))) + +(defun safely-read (stream) + (let ((*read-eval* nil)) + (read stream))) + +(defun fetch-client-info-plist (url) + "Fetch and return the client info data at URL." + (let ((local-client-info-file (qmerge "tmp/client-info.sexp"))) + (ensure-directories-exist local-client-info-file) + (renaming-fetch url local-client-info-file) + (with-open-file (stream local-client-info-file) + (list* :source-file local-client-info-file + (safely-read stream))))) + +(defun fetch-client-info (url) + (let ((plist (fetch-client-info-plist url))) + (destructuring-bind (&key setup asdf client-tar version + source-file + &allow-other-keys) + plist + (unless (and setup asdf client-tar version) + (error "Invalid data from client info URL -- ~A" url)) + (make-instance 'client-info + :setup-url (getf setup :url) + :asdf-url (getf asdf :url) + :client-tar-url (getf client-tar :url) + :version version + :plist plist + :source-file source-file)))) + +(defun client-info-url-from-version (version) + (format nil "http://~A/client/~A/client-info.sexp" + *quicklisp-hostname* + version)) + +(defun distinfo-url-from-version (version) + (format nil "http://~A/dist/~A/distinfo.txt" + *quicklisp-hostname* + version)) + +(defvar *help-message* + (format nil "~&~% ==== quicklisp quickstart install help ====~%~% ~ + quicklisp-quickstart:install can take the following ~ + optional arguments:~%~% ~ + :path \"/path/to/installation/\"~%~% ~ + :proxy \"http://your.proxy:port/\"~%~% ~ + :client-url ~%~% ~ + :client-version ~%~% ~ + :dist-url ~%~% ~ + :dist-version ~%~%")) + +(defvar *after-load-message* + (format nil "~&~% ==== quicklisp quickstart ~A loaded ====~%~% ~ + To continue with installation, evaluate: (quicklisp-quickstart:install)~%~% ~ + For installation options, evaluate: (quicklisp-quickstart:help)~%~%" + qlqs-info:*version*)) + +(defvar *after-initial-setup-message* + (with-output-to-string (*standard-output*) + (format t "~&~% ==== quicklisp installed ====~%~%") + (format t " To load a system, use: (ql:quickload \"system-name\")~%~%") + (format t " To find systems, use: (ql:system-apropos \"term\")~%~%") + (format t " To load Quicklisp every time you start Lisp, use: (ql:add-to-init-file)~%~%") + (format t " For more information, see http://www.quicklisp.org/beta/~%~%"))) + +(defun initial-install (&key (client-url *client-info-url*) dist-url) + (setf *quickstart-parameters* + (list :proxy-url *proxy-url* + :initial-dist-url dist-url)) + (ensure-directories-exist (qmerge "tmp/")) + (let ((client-info (fetch-client-info client-url)) + (tmptar (qmerge "tmp/quicklisp.tar")) + (setup (qmerge "setup.lisp")) + (asdf (qmerge "asdf.lisp"))) + (renaming-fetch (client-tar-url client-info) tmptar) + (unpack-tarball tmptar :directory (qmerge "./")) + (renaming-fetch (setup-url client-info) setup) + (renaming-fetch (asdf-url client-info) asdf) + (rename-file (source-file client-info) (qmerge "client-info.sexp")) + (load setup :verbose nil :print nil) + (write-string *after-initial-setup-message*) + (finish-output))) + +(defun help () + (write-string *help-message*) + t) + +(defun non-empty-file-namestring (pathname) + (let ((string (file-namestring pathname))) + (unless (or (null string) + (equal string "")) + string))) + +(defun install (&key ((:path *home*) *home*) + ((:proxy *proxy-url*) *proxy-url*) + client-url + client-version + dist-url + dist-version) + (setf *home* (merge-pathnames *home* (truename *default-pathname-defaults*))) + (let ((name (non-empty-file-namestring *home*))) + (when name + (warn "Making ~A part of the install pathname directory" + name) + ;; This corrects a pathname like "/foo/bar" to "/foo/bar/" and + ;; "foo" to "foo/" + (setf *home* + (make-pathname :defaults *home* + :directory (append (pathname-directory *home*) + (list name)))))) + (let ((setup-file (qmerge "setup.lisp"))) + (when (probe-file setup-file) + (multiple-value-bind (result proceed) + (with-simple-restart (load-setup "Load ~S" setup-file) + (error "Quicklisp has already been installed. Load ~S instead." + setup-file)) + (declare (ignore result)) + (when proceed + (return-from install (load setup-file)))))) + (if (find-package '#:ql) + (progn + (write-line "!!! Quicklisp has already been set up. !!!") + (write-string *after-initial-setup-message*) + t) + (call-with-quiet-compilation + (lambda () + (let ((client-url (or client-url + (and client-version + (client-info-url-from-version client-version)) + *client-info-url*)) + ;; It's ok for dist-url to be nil; there's a default in + ;; the client + (dist-url (or dist-url + (and dist-version + (distinfo-url-from-version dist-version))))) + (initial-install :client-url client-url + :dist-url dist-url)))))) + +(write-string *after-load-message*) + +;;; End of quicklisp.lisp diff --git a/scripts/update-nix b/scripts/update-nix index b907bb7..0018c0c 100755 --- a/scripts/update-nix +++ b/scripts/update-nix @@ -1,6 +1,10 @@ #!/bin/sh currentdir=$(pwd) -cd ~/.dotfiles +if [[hostname == "kaladin"]]; then + cd ~/.config/dotfiles +else + cd ~/.dotfiles +fi nix flake update nix flake lock cd $currentdir diff --git a/scripts/upgrade-nix b/scripts/upgrade-nix index 39aac09..e3837cf 100755 --- a/scripts/upgrade-nix +++ b/scripts/upgrade-nix @@ -1,5 +1,5 @@ #!/bin/sh currentdir=$(pwd) -cd ~/.dotfiles +cd ~/.config/dotfiles/ nixos-rebuild --use-remote-sudo switch --show-trace --verbose --impure --flake .# cd $currentdir diff --git a/systemd-units/user/aw-qt.service b/systemd-units/user/aw-qt.service deleted file mode 100644 index 33bb4dc..0000000 --- a/systemd-units/user/aw-qt.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=ActivityWatch Service - Automatic Time Tracker - -[Service] -ExecStart=/usr/bin/aw-qt - -[Install] -WantedBy=default.target diff --git a/systemd-units/user/jellyfin-mpv-shim.service b/systemd-units/user/jellyfin-mpv-shim.service deleted file mode 100644 index 7090ffa..0000000 --- a/systemd-units/user/jellyfin-mpv-shim.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Jellyfin MPV - -[Service] -ExecStart=jellyfin-mpv-shim - -[Install] -WantedBy=default.target \ No newline at end of file diff --git a/systemd-units/user/lolcate-update.service b/systemd-units/user/lolcate-update.service deleted file mode 100644 index dd98926..0000000 --- a/systemd-units/user/lolcate-update.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=lolcate updater - -[Service] -ExecStart=lolcate --update - -[Install] -WantedBy=default.target \ No newline at end of file diff --git a/systemd-units/user/lolcate-update.timer b/systemd-units/user/lolcate-update.timer deleted file mode 100644 index 8f9fb5f..0000000 --- a/systemd-units/user/lolcate-update.timer +++ /dev/null @@ -1,10 +0,0 @@ - -[Unit] -Description=run lolcate updater every 20min - -[Timer] -OnBootSec=1min -OnUnitActiveSec=20min - -[Install] -WantedBy=timers.target \ No newline at end of file diff --git a/systemd-units/user/mail.service b/systemd-units/user/mail.service deleted file mode 100644 index 4b3fce1..0000000 --- a/systemd-units/user/mail.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=mbsync automated sync of mail - -[Service] -ExecStart=/home/chris/scripts/mailsync - -[Install] -WantedBy=default.target diff --git a/systemd-units/user/mail.timer b/systemd-units/user/mail.timer deleted file mode 100644 index 69410cc..0000000 --- a/systemd-units/user/mail.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=timer for syncing mail - -[Timer] -OnStartupSec=2min -OnUnitActiveSec=5min - -[Install] -WantedBy=timers.target diff --git a/systemd-units/user/secretserviced.service b/systemd-units/user/secretserviced.service deleted file mode 100644 index 9a87664..0000000 --- a/systemd-units/user/secretserviced.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Service to keep secrets of applications -Documentation=https://github.com/yousefvand/secret-service - -[Install] -WantedBy=default.target - -[Service] -Type=simple -RestartSec=30 -Restart=always -Environment="MASTERPASSWORD=Gr@$$B00ts#21" -WorkingDirectory=/usr/bin/ -ExecStart=/usr/bin/secretserviced \ No newline at end of file diff --git a/systems/kaladin/hardware-configuration.nix b/systems/kaladin/hardware-configuration.nix index a8d77d3..6eb4ac7 100644 --- a/systems/kaladin/hardware-configuration.nix +++ b/systems/kaladin/hardware-configuration.nix @@ -11,36 +11,16 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba"; - fsType = "btrfs"; - options = [ "subvol=@" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ]; + { device = "/dev/disk/by-uuid/e5add982-fbdf-45e6-9e96-ea81c3ceff37"; + fsType = "ext4"; }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba"; - fsType = "btrfs"; - options = [ "subvol=@home" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ]; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1D14-97A8"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; - fileSystems."/snapshots" = - { device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba"; - fsType = "btrfs"; - options = [ "subvol=snapshots" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ]; - }; - - - #fileSystems."/nix" = - # { device = "/dev/disk/by-uuid/9b5a1a62-0de6-4e07-a541-634736980d10"; - # fsType = "btrfs"; - # options = [ "subvol=@nix" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ]; - # }; - - #fileSystems."/var/log" = - # { device = "/dev/disk/by-uuid/9b5a1a62-0de6-4e07-a541-634736980d10"; - # fsType = "btrfs"; - # options = [ "subvol=@log" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ]; - # }; - fileSystems."/run/media/chris/Storage" = { device = "/dev/disk/by-uuid/4c7d4273-7b72-4aa8-8e1c-e281543d06cb"; fsType = "btrfs"; @@ -52,12 +32,6 @@ fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/35A0-C1F1"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking