Bump fonts, fix includes
This commit is contained in:
Brenden Matthews
parent
4940070c0a
commit
e872623aed
|
|
@ -9,27 +9,27 @@ Using CMake to build Conky is pretty easy, and here is how I do it:
|
|||
1. From the top level source dir, create a build working dir, and cd into it
|
||||
|
||||
```shell-session
|
||||
$ mkdir build
|
||||
$ cd build
|
||||
mkdir build
|
||||
cd build
|
||||
```
|
||||
|
||||
2. Run the cmake configuration process
|
||||
|
||||
```shell-session
|
||||
$ cmake ../ # pass the path to the sources to cmake
|
||||
cmake ../ # pass the path to the sources to cmake
|
||||
```
|
||||
|
||||
OR
|
||||
|
||||
```shell-session
|
||||
$ ccmake ../ # you can also use the fance curses interface, or try cmake-gui
|
||||
ccmake ../ # you can also use the fance curses interface, or try cmake-gui
|
||||
```
|
||||
|
||||
3. Compile as usual, and enjoy the out-of-source goodness
|
||||
|
||||
```shell-session
|
||||
$ make
|
||||
# make install # if you want
|
||||
make
|
||||
sudo make install # if you want
|
||||
```
|
||||
|
||||
There are a number of build options for Conky, and the best way to discover
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ indexWeight: 0
|
|||
Build the image with:
|
||||
|
||||
```shell-session
|
||||
$ docker build --tag=conky .
|
||||
docker build --tag=conky .
|
||||
```
|
||||
|
||||
or if you want the commandline version:
|
||||
|
||||
```shell-session
|
||||
$ docker build --build-arg X11=no --tag=conkycmd .
|
||||
docker build --build-arg X11=no --tag=conkycmd .
|
||||
```
|
||||
|
||||
## Running the container
|
||||
|
|
@ -23,38 +23,38 @@ $ docker build --build-arg X11=no --tag=conkycmd .
|
|||
After building you can run the graphical version with:
|
||||
|
||||
```shell-session
|
||||
$ docker run --rm -ti --net=host -e DISPLAY -v ~/.Xauthority:/root/.Xauthority conky
|
||||
docker run --rm -ti --net=host -e DISPLAY -v ~/.Xauthority:/root/.Xauthority conky
|
||||
```
|
||||
|
||||
The commandline version is easier:
|
||||
|
||||
```shell-session
|
||||
$ docker run --rm -ti conkycmd
|
||||
docker run --rm -ti conkycmd
|
||||
```
|
||||
|
||||
If you want to pass some options to conky you can just add them if you mention
|
||||
'conky' twice. Once for the image and once for the command. For example:
|
||||
|
||||
```shell-session
|
||||
$ docker run --rm -ti --net=host -e DISPLAY -v ~/.Xauthority:/root/.Xauthority conky conky --version
|
||||
docker run --rm -ti --net=host -e DISPLAY -v ~/.Xauthority:/root/.Xauthority conky conky --version
|
||||
```
|
||||
|
||||
will show you the version of conky. Since you don't need X for this you could also do:
|
||||
|
||||
```shell-session
|
||||
$ docker run --rm -ti conkycmd conky --version
|
||||
docker run --rm -ti conkycmd conky --version
|
||||
```
|
||||
|
||||
If you want to fiddle around a bit with the configuration first you could do:
|
||||
|
||||
```shell-session
|
||||
$ docker run --rm -ti --net=host -e DISPLAY -v ~/.Xauthority:/root/.Xauthority conky bash
|
||||
docker run --rm -ti --net=host -e DISPLAY -v ~/.Xauthority:/root/.Xauthority conky bash
|
||||
```
|
||||
|
||||
_change things is in the configuration_
|
||||
|
||||
```shell-session
|
||||
$ conky -c configurationfile ; exit
|
||||
conky -c configurationfile ; exit
|
||||
```
|
||||
|
||||
See the docker docs to a lot of other ways to (ab)use this container
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -21,20 +21,20 @@
|
|||
"e2e:headless": "start-server-and-test dev http://localhost:3000 \"cypress run --e2e\""
|
||||
},
|
||||
"dependencies": {
|
||||
"@fontsource/fira-code": "^4.5.13",
|
||||
"@fontsource/inter": "^4.5.15",
|
||||
"@fontsource/newsreader": "^4.5.10",
|
||||
"@fontsource-variable/fira-code": "^5.0.3",
|
||||
"@fontsource-variable/inter": "^5.0.3",
|
||||
"@fontsource-variable/newsreader": "^5.0.3",
|
||||
"@headlessui/react": "^1.7.15",
|
||||
"@mapbox/rehype-prism": "^0.8.0",
|
||||
"@netlify/plugin-nextjs": "^4.37.0",
|
||||
"@netlify/plugin-nextjs": "^4.38.1",
|
||||
"@tailwindcss/typography": "^0.5.9",
|
||||
"classnames": "^2.3.2",
|
||||
"colord": "^2.9.3",
|
||||
"d3": "^7.8.4",
|
||||
"d3": "^7.8.5",
|
||||
"fuse.js": "^6.6.2",
|
||||
"gray-matter": "^4.0.3",
|
||||
"inter-ui": "^3.19.3",
|
||||
"next": "^13.4.4",
|
||||
"next": "^13.4.7",
|
||||
"prismjs": "^1.29.0",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
|
|
@ -45,19 +45,19 @@
|
|||
"@types/eslint": "^8.40.2",
|
||||
"@types/js-yaml": "^4.0.5",
|
||||
"@types/mapbox__rehype-prism": "^0.8.0",
|
||||
"@types/node": "^20.2.5",
|
||||
"@types/node": "^20.3.1",
|
||||
"@types/prismjs": "^1.26.0",
|
||||
"@types/react": "^18.0.30",
|
||||
"@types/react-dom": "^18.2.4",
|
||||
"@typescript-eslint/eslint-plugin": "^5.59.2",
|
||||
"@typescript-eslint/parser": "^5.59.8",
|
||||
"@types/react": "^18.2.14",
|
||||
"@types/react-dom": "^18.2.6",
|
||||
"@typescript-eslint/eslint-plugin": "^5.60.0",
|
||||
"@typescript-eslint/parser": "^5.60.0",
|
||||
"autoprefixer": "^10.4.14",
|
||||
"cypress": "^12.13.0",
|
||||
"cypress": "^12.15.0",
|
||||
"eslint": "^8.43.0",
|
||||
"eslint-config-next": "^13.4.2",
|
||||
"eslint-config-next": "^13.4.7",
|
||||
"eslint-config-prettier": "^8.8.0",
|
||||
"eslint-plugin-cypress": "^2.13.2",
|
||||
"eslint-plugin-mdx": "^2.0.5",
|
||||
"eslint-plugin-cypress": "^2.13.3",
|
||||
"eslint-plugin-mdx": "^2.1.0",
|
||||
"js-yaml": "^4.1.0",
|
||||
"netlify-plugin-cypress": "^2.2.1",
|
||||
"next-mdx-remote": "^4.4.1",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import '@fontsource/fira-code/variable.css'
|
||||
import '@fontsource/inter/variable.css'
|
||||
import '@fontsource/newsreader/variable.css'
|
||||
import '@fontsource-variable/fira-code'
|
||||
import '@fontsource-variable/inter'
|
||||
import '@fontsource-variable/newsreader'
|
||||
import 'prismjs/themes/prism-tomorrow.css'
|
||||
import '../styles/globals.css'
|
||||
import { AppProps } from 'next/app'
|
||||
|
|
|
|||
|
|
@ -2,3 +2,9 @@
|
|||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
@tailwind variants;
|
||||
|
||||
code[class*='language-'],
|
||||
pre[class*='language-'] {
|
||||
font-family: 'Fira Code Variable', 'ui-monospace', 'SFMono-Regular', 'Menlo',
|
||||
'Monaco', 'Consolas', 'Liberation Mono', 'Courier New', 'monospace';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
const plugin = require('tailwindcss/plugin')
|
||||
const pluginTypography = require('@tailwindcss/typography')
|
||||
import plugin = require('tailwindcss/plugin')
|
||||
import pluginTypography = require('@tailwindcss/typography')
|
||||
|
||||
const hoveredSiblingPlugin = plugin(function ({ addVariant, e }) {
|
||||
addVariant('hovered-sibling', ({ container }) => {
|
||||
|
|
@ -13,7 +13,7 @@ module.exports = {
|
|||
theme: {
|
||||
fontFamily: {
|
||||
sans: [
|
||||
'InterVariable',
|
||||
'Inter Variable',
|
||||
'ui-sans-serif',
|
||||
'system-ui',
|
||||
'-apple-system',
|
||||
|
|
@ -30,7 +30,7 @@ module.exports = {
|
|||
'Noto Color Emoji',
|
||||
],
|
||||
serif: [
|
||||
'NewsreaderVariable',
|
||||
'Newsreader Variable',
|
||||
'ui-serif',
|
||||
'Georgia',
|
||||
'Cambria',
|
||||
|
|
@ -39,7 +39,7 @@ module.exports = {
|
|||
'serif',
|
||||
],
|
||||
mono: [
|
||||
'Fira CodeVariable',
|
||||
'Fira Code Variable',
|
||||
'ui-monospace',
|
||||
'SFMono-Regular',
|
||||
'Menlo',
|
||||
|
|
|
|||
Loading…
Reference in New Issue