From 7df09ad64a8213d6aa25a7a187cafc41a14efede Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Sun, 11 Aug 2024 09:02:24 -0400 Subject: [PATCH] dev: cleanup unused stuff --- .cabal/config | 69 ------ .screenrc | 12 - .xmonad/xmonad.errors | 0 .xmonad/xmonad.hi | Bin 2312 -> 0 bytes .xmonad/xmonad.hs | 47 ---- .yi/yi.hs | 122 ---------- docker-compose.yaml | 283 ----------------------- nix/base-system/darwin-configuration.nix | 1 - 8 files changed, 534 deletions(-) delete mode 100644 .cabal/config delete mode 100644 .screenrc delete mode 100644 .xmonad/xmonad.errors delete mode 100644 .xmonad/xmonad.hi delete mode 100644 .xmonad/xmonad.hs delete mode 100644 .yi/yi.hs delete mode 100644 docker-compose.yaml diff --git a/.cabal/config b/.cabal/config deleted file mode 100644 index 4c2a480..0000000 --- a/.cabal/config +++ /dev/null @@ -1,69 +0,0 @@ --- This is the configuration file for the 'cabal' command line tool. - --- The available configuration options are listed below. --- Some of them have default values listed. - --- Lines (like this one) beginning with '--' are comments. --- Be careful with spaces and indentation because they are --- used to indicate layout for nested sections. - - -remote-repo: hackage.haskell.org:http://hackage.haskell.org/packages/archive -remote-repo-cache: /Users/jwall/.cabal/packages --- local-repo: --- verbose: 1 --- compiler: ghc --- with-compiler: --- with-hc-pkg: --- scratchdir: --- program-prefix: --- program-suffix: --- library-vanilla: True --- library-profiling: True --- shared: False --- executable-profiling: True --- optimization: True --- library-for-ghci: True --- split-objs: False --- executable-stripping: True --- user-install: True --- package-db: --- flags: --- extra-include-dirs: --- extra-lib-dirs: --- constraint: --- cabal-lib-version: --- preference: --- documentation: False --- doc-index-file: $datadir/doc/index.html --- root-cmd: --- symlink-bindir: -build-summary: /Users/jwall/.cabal/logs/build.log --- build-log: -remote-build-reporting: anonymous --- username: --- password: - -install-dirs user - -- prefix: /Users/jwall/.cabal - -- bindir: $prefix/bin - -- libdir: $prefix/lib - -- libsubdir: $pkgid/$compiler - -- libexecdir: $prefix/libexec - -- datadir: $prefix/share - -- datasubdir: $pkgid - -- docdir: $datadir/doc/$pkgid - -- htmldir: $docdir/html - -- haddockdir: $htmldir - -install-dirs global - -- prefix: /usr/local - -- bindir: $prefix/bin - -- libdir: $prefix/lib - -- libsubdir: $pkgid/$compiler - -- libexecdir: $prefix/libexec - -- datadir: $prefix/share - -- datasubdir: $pkgid - -- docdir: $datadir/doc/$pkgid - -- htmldir: $docdir/html - -- haddockdir: $htmldir diff --git a/.screenrc b/.screenrc deleted file mode 100644 index e4ed17e..0000000 --- a/.screenrc +++ /dev/null @@ -1,12 +0,0 @@ -startup_message off -defscrollback 5000 -termcapinfo xterm ti@:te@ -termcapinfo xterm-color ti@:te@ -hardstatus alwayslastline -hardstatus string '%{= kG}[ %{G}%H %{g}][%= %{= kw}%?%-Lw%?%{r}(%{W}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%= %{g}][%{B} %m/%d/%Y %{W}%c %{g}]' -vbell off -shell /bin/bash -logtstamp on -logtstamp after 1 -logfile flush -term screen-256color diff --git a/.xmonad/xmonad.errors b/.xmonad/xmonad.errors deleted file mode 100644 index e69de29..0000000 diff --git a/.xmonad/xmonad.hi b/.xmonad/xmonad.hi deleted file mode 100644 index 4956d72f822441b4dadc95b053b8aa3aef953421..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2312 zcmZSlbuNVg3RoBz7|a?V14M9w2rdx84I+3z1TTo-0}=cnLI6Yvf(RiHAq*l!Km^DN1~CSZ za*)yD3=Ci^B%rh;0|Ns{n-l{B14ySd0|VGqGEiC;O3N`YFo-cQFvvq`1t_furInzx zGRPAki&UT%s4_4xfLyHxrPUc2m}i4b0()G;U#iaImRT}~vcS5hA)?1MK~4rcP?LEc z-Gm`_bTPtZw6-zT7uPN3lC7NG#M+(je+Vw4I=%hI(R8tu-ZE};_!Q^8 zh=t2YOxO?=eIdkU;jGuX@y9dwfT9x;5Ze0tj<5I{{9U)ttKl-&>nWGvdUVXgR*J8C zwKL3R%bU6n_gzZhGP-;Ha~@>b1m1b_CZ6AWQ9=z^1{BhIyP2d;&umh9-n7=~QRd>G zc5oT}rF$ya((bkBU+ECl)T|Kv1(z`pn>b_gp^~t!BBmgvOa_HSxQy(X*!{=(D=*Ca z$yJc-CVValE+gltBiU*G)Aj9Fp*2QUTVCnGWeklgE6(;*eKhcJn8X>%q#p*B0R_0x z)5>#3o2AnD=FUC5sYrf?bK?K0CWj!!;vMOXR3Vbz9dpvZLAyN3{(c!n1O<12+r)eY~>_lsO=J6au57mg|0PGy34!x_YkCu~4`kQ;|Q# zU)C^BVcOIBTIhiz_XW6&Vl`8VgoAoo=&vc)e)sfwAY{w}x?Rr1-;(&9zH9C*#Ukxa z21rU!@iqSxx#8-u0K{a;P0Y*# zF+fFuFM`b-VQ8ppsAsBYpa&`?Kq`1aLKSHxx(0g22*JdnqQpvF13eQx13gI4F)*+s zB^IZGw1Dzra(-S(VrE`yQ88GR5nL;ON@{9BacZHip`J04X2F!qqSWM){Gv)-Lp?)1 z13e?CNwTRGC8>GEnMpaRx~Ub(sRbpO`FS8iLCQeI8AzQ#T4qjaL1IY;nyDP=8Ogc@ zMVYxEMW7sG?4QD$B`*dR#8XJFv2$j#47Owl#aGlT`dFjNQ>@z z&iQ#IMfo{;z93C{o_WP3iFwJX#ZX%~+&!H2oDh-63F5ouFH7 zAad}87F?280!zs-tHDbA5_3~i9Fviq#tjY|*UXZPRG4?Uz(T%>l}Ru|ct9Zv3qPoz zz@Z#cT95-%B;;O{Sdak<;0QxQy^zWRcm(mH1TaiL*cPYE5?CMzfh_U#*YilsOUX&q z3rVej#UFb>QEE pad "") - , ppOutput = hPutStrLn xmproc - } - , workspaces = ["code", "communication", "random", "configuration"] - } `additionalKeys` [ - ((mod1Mask, xK_w), kill) - , ((controlMask .|. mod1Mask, xK_Delete), spawn "gnome-screensaver-command --lock") - , ((mod1Mask .|. shiftMask, xK_p), spawn myGmRunCommand) -- %! Launch gmrun - , ((mod1Mask , xK_p), spawn myGmRunCommand) -- %! Launch gmrun - ] diff --git a/.yi/yi.hs b/.yi/yi.hs deleted file mode 100644 index a6e9902..0000000 --- a/.yi/yi.hs +++ /dev/null @@ -1,122 +0,0 @@ --- | --- Author : jeremy@marzhillstudios.com - --- Parts of this config were stolen from/inspired by --- yi/yi-contrib/src/Yi/Config/Michal.hs. - -import Yi -import qualified Yi.Keymap.Vim as Vim -import qualified Yi.Keymap.Vim.Common as Vim -import qualified Yi.Keymap.Vim.Utils as Vim -import Yi.Keymap.Keys -import Yi.Modes -import Yi.Style -import Yi.Style.Library -import Yi.Config.Default (availableFrontends) -import Yi.Config.Misc - -import Data.Monoid - --- TODO(jwall): : navigation --- TODO(jwall): handle file updates: checktime functionality --- TODO(jwall): Visual Mode is broken? - --- default color specifications -fgColor = brightwhite -bgColor = black -bgSelectedColor = lightGrey - -builtinColor = magenta -commentColor = darkcyan -typeColor = darkgreen -keywordColor = yellow -quoteColor = magenta - --- extended vim keymap -myKeymap :: KeymapSet -myKeymap = Vim.mkKeymapSet $ Vim.defVimConfig `override` \super self -> - let eval = Vim.pureEval self - in super { - -- put our custom bindings first so they override default bindings - Vim.vimBindings = myBindings eval <> Vim.vimBindings super - } - --- custom keybindings -myBindings :: (Vim.EventString -> EditorM ()) -> [Vim.VimBinding] -myBindings eval = - let nmap x y = Vim.mkStringBindingE Vim.Normal Vim.Drop (x, y, id) - imap x y = Vim.VimBindingE (\evs state -> case Vim.vsMode state of - Vim.Insert _ -> - fmap (const (y >> return Vim.Continue)) - (evs `Vim.matchesString` x) - _ -> Vim.NoMatch) - nmap' x y = Vim.mkStringBindingY Vim.Normal (x, y, id) - in [ - -- custom bindings here - ] - --- GUI enhanced colors -guiBgColor = RGB 20 20 20 - -defaultVimTermTheme :: Theme -defaultVimTermTheme = defaultTheme `override` \super self -> super { - modelineAttributes = emptyAttributes {foreground = white, - background = grey}, - modelineFocusStyle = withBg grey `mappend` withFg fgColor, - baseAttributes = emptyAttributes { foreground = fgColor, - background = bgColor}, - builtinStyle = withFg builtinColor, - commentStyle = withFg commentColor, - typeStyle = withFg typeColor, - importStyle = withFg keywordColor, - selectedStyle = withBg bgSelectedColor, - stringStyle = withFg quoteColor, - keywordStyle = withFg green - } - -defaultVimGuiTheme :: Theme -defaultVimGuiTheme = defaultVimTermTheme `override` \super self -> super { - baseAttributes = emptyAttributes { foreground = fgColor, - background = guiBgColor} -} - --- global indent preferences -prefIndent :: Mode s -> Mode s -prefIndent m = m { - modeIndentSettings = IndentSettings - { - expandTabs = True - , shiftWidth = 2 - , tabSize = 2 - } -} - -myDefaultUI = configUI defaultVimConfig - -myConfigDefaultUI :: UIConfig -myConfigDefaultUI = myDefaultUI { - configFontSize = Just 9 - , configTheme = defaultVimGuiTheme - , configWindowFill = '~' - } - -myConfigTermUI :: UIConfig -- reuse the above defaults here -myConfigTermUI = myConfigDefaultUI { - configTheme = defaultVimTermTheme - } - -myDefaultConfig = defaultVimConfig { - configUI = myConfigDefaultUI - , defaultKm = myKeymap - , modeTable = fmap (onMode prefIndent) (modeTable defaultVimConfig) -} - -myConfig = - case availableFrontends of - (("vty", f):_) -> myDefaultConfig { - configUI = myConfigTermUI - } - ((_, f):_) -> myDefaultConfig - -main :: IO () -main = yi myConfig diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index 975b08d..0000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,283 +0,0 @@ ---- -version: "3.5" - -networks: - penpot: - -volumes: - penpot_postgres_v15: - penpot_assets: - # penpot_traefik: - # penpot_minio: - -services: - ## Traefik service declaration example. Consider using it if you are going to expose - ## penpot to the internet or different host than `localhost`. - - # traefik: - # image: traefik:v2.9 - # networks: - # - penpot - # command: - # - "--api.insecure=true" - # - "--entryPoints.web.address=:80" - # - "--providers.docker=true" - # - "--providers.docker.exposedbydefault=false" - # - "--entryPoints.websecure.address=:443" - # - "--certificatesresolvers.letsencrypt.acme.tlschallenge=true" - # - "--certificatesresolvers.letsencrypt.acme.email=" - # - "--certificatesresolvers.letsencrypt.acme.storage=/traefik/acme.json" - # volumes: - # - "penpot_traefik:/traefik" - # - "/var/run/docker.sock:/var/run/docker.sock" - # ports: - # - "80:80" - # - "443:443" - - penpot-frontend: - image: "penpotapp/frontend:latest" - ports: - - 9001:80 - - volumes: - - penpot_assets:/opt/data/assets - - depends_on: - - penpot-backend - - penpot-exporter - - networks: - - penpot - - labels: - - "traefik.enable=true" - - ## HTTP: example of labels for the case if you are going to expose penpot to the - ## internet using only HTTP (without HTTPS) with traefik - - # - "traefik.http.routers.penpot-http.entrypoints=web" - # - "traefik.http.routers.penpot-http.rule=Host(``)" - # - "traefik.http.services.penpot-http.loadbalancer.server.port=80" - - ## HTTPS: example of labels for the case if you are going to expose penpot to the - ## internet using with HTTPS using traefik - - # - "traefik.http.middlewares.http-redirect.redirectscheme.scheme=https" - # - "traefik.http.middlewares.http-redirect.redirectscheme.permanent=true" - # - "traefik.http.routers.penpot-http.entrypoints=web" - # - "traefik.http.routers.penpot-http.rule=Host(``)" - # - "traefik.http.routers.penpot-http.middlewares=http-redirect" - # - "traefik.http.routers.penpot-https.entrypoints=websecure" - # - "traefik.http.routers.penpot-https.rule=Host(``)" - # - "traefik.http.services.penpot-https.loadbalancer.server.port=80" - # - "traefik.http.routers.penpot-https.tls=true" - # - "traefik.http.routers.penpot-https.tls.certresolver=letsencrypt" - - ## Configuration envronment variables for frontend the container. In this case this - ## container only needs the `PENPOT_FLAGS`. This environment variable is shared with - ## other services but not all flags are relevant to all services. - - environment: - ## Relevant flags for frontend: - ## - demo-users - ## - login-with-github - ## - login-with-gitlab - ## - login-with-google - ## - login-with-ldap - ## - login-with-oidc - ## - login-with-password - ## - registration - ## - webhooks - ## - ## You can read more about all available flags on: - ## https://help.penpot.app/technical-guide/configuration/#advanced-configuration - - - PENPOT_FLAGS=enable-registration enable-login-with-password - - penpot-backend: - image: "penpotapp/backend:latest" - volumes: - - penpot_assets:/opt/penpot/assets - - depends_on: - - penpot-postgres - - penpot-redis - - networks: - - penpot - - ## Configuration envronment variables for backend the - ## container. - - environment: - - ## Relevant flags for backend: - ## - demo-users - ## - email-verification - ## - log-emails - ## - log-invitation-tokens - ## - login-with-github - ## - login-with-gitlab - ## - login-with-google - ## - login-with-ldap - ## - login-with-oidc - ## - login-with-password - ## - registration - ## - secure-session-cookies - ## - smtp - ## - smtp-debug - ## - telemetry - ## - webhooks - ## - prepl-server - ## - ## You can read more about all available flags and other - ## environment variables for the backend here: - ## https://help.penpot.app/technical-guide/configuration/#advanced-configuration - - - PENPOT_FLAGS=enable-registration enable-login-with-password disable-email-verification enable-smtp enable-prepl-server - - ## Penpot SECRET KEY. It serves as a master key from which other keys for subsystems - ## (eg http sessions) are derived. - ## - ## Leave it comment if it is ok for you to have to login again after each backend - ## restart. - ## - ## If you going to uncomment this, we recommend use here a trully randomly generated - ## 512 bits base64 encoded string. You can generate one with: - ## - ## python3 -c "import secrets; print(secrets.token_urlsafe(64))" - - # - PENPOT_SECRET_KEY=my-insecure-key - - ## The PREPL host. Mainly used for external programatic access to penpot backend - ## (example: admin). By default it listen on `localhost` but if you are going to use - ## the `admin`, you will need to uncomment this and set the host to `0.0.0.0`. - - # - PENPOT_PREPL_HOST=0.0.0.0 - - ## Public URI. If you are going to expose this instance to the internet and use it - ## under different domain than 'localhost', you will need to adjust it to the final - ## domain. - ## - ## Consider using traefik and set the 'disable-secure-session-cookies' if you are - ## not going to serve penpot under HTTPS. - - - PENPOT_PUBLIC_URI=http://localhost:9001 - - ## Database connection parameters. Don't touch them unless you are using custom - ## postgresql connection parameters. - - - PENPOT_DATABASE_URI=postgresql://penpot-postgres/penpot - - PENPOT_DATABASE_USERNAME=penpot - - PENPOT_DATABASE_PASSWORD=penpot - - ## Redis is used for the websockets notifications. Don't touch unless the redis - ## container has different parameters or different name. - - - PENPOT_REDIS_URI=redis://penpot-redis/0 - - ## Default configuration for assets storage: using filesystem based with all files - ## stored in a docker volume. - - - PENPOT_ASSETS_STORAGE_BACKEND=assets-fs - - PENPOT_STORAGE_ASSETS_FS_DIRECTORY=/opt/data/assets - - ## Also can be configured to to use a S3 compatible storage - ## service like MiniIO. Look below for minio service setup. - - # - AWS_ACCESS_KEY_ID= - # - AWS_SECRET_ACCESS_KEY= - # - PENPOT_ASSETS_STORAGE_BACKEND=assets-s3 - # - PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://penpot-minio:9000 - # - PENPOT_STORAGE_ASSETS_S3_BUCKET= - - ## Telemetry. When enabled, a periodical process will send anonymous data about this - ## instance. Telemetry data will enable us to learn on how the application is used, - ## based on real scenarios. If you want to help us, please leave it enabled. You can - ## audit what data we send with the code available on github - - - PENPOT_TELEMETRY_ENABLED=true - - ## Example SMTP/Email configuration. By default, emails are sent to the mailcatch - ## service, but for production usage is recommended to setup a real SMTP - ## provider. Emails are used to confirm user registrations & invitations. Look below - ## how mailcatch service is configured. - - - PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com - - PENPOT_SMTP_DEFAULT_REPLY_TO=no-reply@example.com - - PENPOT_SMTP_HOST=penpot-mailcatch - - PENPOT_SMTP_PORT=1025 - - PENPOT_SMTP_USERNAME= - - PENPOT_SMTP_PASSWORD= - - PENPOT_SMTP_TLS=false - - PENPOT_SMTP_SSL=false - - penpot-exporter: - image: "penpotapp/exporter:latest" - networks: - - penpot - - environment: - # Don't touch it; this uses internal docker network to - # communicate with the frontend. - - PENPOT_PUBLIC_URI=http://penpot-frontend - - ## Redis is used for the websockets notifications. - - PENPOT_REDIS_URI=redis://penpot-redis/0 - - penpot-postgres: - image: "postgres:15" - restart: always - stop_signal: SIGINT - - volumes: - - penpot_postgres_v15:/var/lib/postgresql/data - - networks: - - penpot - - environment: - - POSTGRES_INITDB_ARGS=--data-checksums - - POSTGRES_DB=penpot - - POSTGRES_USER=penpot - - POSTGRES_PASSWORD=penpot - - penpot-redis: - image: redis:7 - restart: always - networks: - - penpot - - ## A mailcatch service, used as temporal SMTP server. You can access via HTTP to the - ## port 1080 for read all emails the penpot platform has sent. Should be only used as a - ## temporal solution meanwhile you don't have a real SMTP provider configured. - - penpot-mailcatch: - image: sj26/mailcatcher:latest - restart: always - expose: - - '1025' - ports: - - "1080:1080" - networks: - - penpot - - ## Example configuration of MiniIO (S3 compatible object storage service); If you don't - ## have preference, then just use filesystem, this is here just for the completeness. - - # minio: - # image: "minio/minio:latest" - # command: minio server /mnt/data --console-address ":9001" - # - # volumes: - # - "penpot_minio:/mnt/data" - # - # environment: - # - MINIO_ROOT_USER=minioadmin - # - MINIO_ROOT_PASSWORD=minioadmin - # - # ports: - # - 9000:9000 - # - 9001:9001 - - diff --git a/nix/base-system/darwin-configuration.nix b/nix/base-system/darwin-configuration.nix index 27aacde..1bfbec8 100644 --- a/nix/base-system/darwin-configuration.nix +++ b/nix/base-system/darwin-configuration.nix @@ -334,7 +334,6 @@ in }; }; - # TODO launchd.user.agents.prometheus; # Use a custom configuration.nix location. # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";