Merge pull request #942 from Mic92/joerg-ci

flake.lock: Update

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/zsh-users/zsh-autosuggestions.git
 [submodule "zsh/pure"]
 	path = zsh/pure
-	url = https://github.com/Mic92/pure.git
+	url = https://github.com/sindresorhus/pure.git
 [submodule "zsh/zsh-autopair"]
 	path = zsh/zsh-autopair
 	url = https://github.com/hlissner/zsh-autopair.git

home-manager/desktop.nix

@@ -78,7 +78,6 @@
     # to fix xdg-open
     glib
     zoom-us
-    gnupg
     jmtpfs # needed for charging? WTF
     (pkgs.runCommand "slack-aliases" { } ''
       mkdir -p $out/bin

home-manager/modules/neovim/user/options.lua

@@ -7,6 +7,7 @@ return {
     spell = false, -- sets vim.opt.spell
     signcolumn = "auto", -- sets vim.opt.signcolumn to auto
     wrap = false, -- sets vim.opt.wrap
+    background = "light",
   },
   g = {
     mapleader = " ", -- sets vim.g.mapleader

home/.config/bat/config

@@ -4,7 +4,7 @@
 
 # Specify desired highlighting theme (e.g. "TwoDark"). Run `bat --list-themes`
 # for a list of all available themes
---theme="Dracula"
+--theme="Solarized (light)"
 
 # Enable this to use italic text on the terminal. This is not supported on all
 # terminal emulators (like tmux, by default):

home/.config/cheat/conf.yml

@@ -1,47 +1,82 @@
 ---
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
-#editor: vim
+# editor: vim
 
 # Should 'cheat' always colorize output?
 colorize: true
 
 # Which 'chroma' colorscheme should be applied to the output?
 # Options are available here:
 #   https://github.com/alecthomas/chroma/tree/master/styles
-style: dracula
+style: solarized-light
 
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
 formatter: terminal16m
 
-# The paths at which cheatsheets are available. Tags associated with a cheatpath
-# are automatically attached to all cheatsheets residing on that path.
+# Through which pager should output be piped?
+# 'less -FRX' is recommended on Unix systems
+# 'more' is recommended on Windows
+pager: less -FRX
+
+# Cheatpaths are paths at which cheatsheets are available on your local
+# filesystem.
+#
+# It is useful to sort cheatsheets into different cheatpaths for organizational
+# purposes. For example, you might want one cheatpath for community
+# cheatsheets, one for personal cheatsheets, one for cheatsheets pertaining to
+# your day job, one for code snippets, etc.
+#
+# Cheatpaths are scoped, such that more "local" cheatpaths take priority over
+# more "global" cheatpaths. (The most global cheatpath is listed first in this
+# file; the most local is listed last.) For example, if there is a 'tar'
+# cheatsheet on both global and local paths, you'll be presented with the local
+# one by default. ('cheat -p' can be used to view cheatsheets from alternative
+# cheatpaths.)
+#
+# Cheatpaths can also be tagged as "read only". This instructs cheat not to
+# automatically create cheatsheets on a read-only cheatpath. Instead, when you
+# would like to edit a read-only cheatsheet using 'cheat -e', cheat will
+# perform a copy-on-write of that cheatsheet from a read-only cheatpath to a
+# writeable cheatpath.
+#
+# This is very useful when you would like to maintain, for example, a
+# "pristine" repository of community cheatsheets on one cheatpath, and an
+# editable personal reponsity of cheatsheets on another cheatpath.
 #
-# Whenever cheatsheets share the same title (like 'tar'), the most local
-# cheatsheets (those which come later in this file) take precedent over the
-# less local sheets. This allows you to create your own "overides" for
-# "upstream" cheatsheets.
+# Cheatpaths can be also configured to automatically apply tags to cheatsheets
+# on certain paths, which can be useful for querying purposes.
+# Example: 'cheat -t work jenkins'.
 #
-# But what if you want to view the "upstream" cheatsheets instead of your own?
-# Cheatsheets may be filtered via 'cheat -f <tag>' in combination with other
-# commands. So, if you want to view the 'tar' cheatsheet that is tagged as
-# 'community' rather than your own, you can use: cheat tar -f community
+# Community cheatsheets must be installed separately, though you may have
+# downloaded them automatically when installing 'cheat'. If not, you may
+# download them here:
+#
+# https://github.com/cheat/cheatsheets
 cheatpaths:
-
-  # Paths that come earlier are considered to be the most "global", and will
-  # thus be overridden by more local cheatsheets. That being the case, you
-  # should probably list community cheatsheets first.
-  #
-  # Note that the paths and tags listed below are just examples. You may freely
-  # change them to suit your needs.
+  # Cheatpath properties mean the following:
+  #   'name': the name of the cheatpath (view with 'cheat -d', filter with 'cheat -p')
+  #   'path': the filesystem path of the cheatsheet directory (view with 'cheat -d')
+  #   'tags': tags that should be automatically applied to sheets on this path
+  #   'readonly': shall user-created ('cheat -e') cheatsheets be saved here?
   - name: community
     path: ~/git/cheatsheets
     tags: [ community ]
     readonly: true
 
-  # Maybe your company or department maintains a repository of cheatsheets as
-  # well. It's probably sensible to list those second.
-  - name: x86
-    path: ~/git/x86_64-linux-cheatsheats/pages/
-    tags: [ x86 ]
+  # If you have personalized cheatsheets, list them last. They will take
+  # precedence over the more global cheatsheets.
+  - name: personal
+    path: ~/git/x86_64-linux-cheatsheats/pages
+    tags: [ personal ]
     readonly: false
+
+  # While it requires no configuration here, it's also worth noting that
+  # cheat will automatically append directories named '.cheat' within the
+  # current working directory to the 'cheatpath'. This can be very useful if
+  # you'd like to closely associate cheatsheets with, for example, a directory
+  # containing source code.
+  #
+  # Such "directory-scoped" cheatsheets will be treated as the most "local"
+  # cheatsheets, and will override less "local" cheatsheets. Similarly,
+  # directory-scoped cheatsheets will always be editable ('readonly: false').

home/.config/foot/foot.ini

@@ -6,22 +6,48 @@ font=FiraCode Nerd Font:size=14
 [bell]
 urgent=yes
 
+#[colors]
+#background=282828
+#foreground=ebdbb2
+#regular0=282828
+#regular1=cc241d
+#regular2=98971a
+#regular3=d79921
+#regular4=458588
+#regular5=b16286
+#regular6=689d6a
+#regular7=a89984
+#bright0=928374
+#bright1=fb4934
+#bright2=b8bb26
+#bright3=fabd2f
+#bright4=83a598
+#bright5=d3869b
+#bright6=8ec07c
+#bright7=ebdbb2
+
+# -*- conf -*-
+# Solarized light
+
+[cursor]
+color=fdf6e3 586e75
+
 [colors]
-background=282828
-foreground=ebdbb2
-regular0=282828
-regular1=cc241d
-regular2=98971a
-regular3=d79921
-regular4=458588
-regular5=b16286
-regular6=689d6a
-regular7=a89984
-bright0=928374
-bright1=fb4934
-bright2=b8bb26
-bright3=fabd2f
-bright4=83a598
-bright5=d3869b
-bright6=8ec07c
-bright7=ebdbb2
+background=              fdf6e3
+foreground=              657b83
+regular0=                eee8d5
+regular1=                dc322f
+regular2=                859900
+regular3=                b58900
+regular4=                268bd2
+regular5=                d33682
+regular6=                2aa198
+regular7=                073642
+bright0=                 cb4b16
+bright1=                 fdf6e3
+bright2=                 93a1a1
+bright3=                 839496
+bright4=                 657b83
+bright5=                 6c71c4
+bright6=                 586e75
+bright7=                 002b36

home/.config/jesseduffield/lazygit/config.yml

@@ -12,7 +12,7 @@ os:
 git:
   paging:
     colorArg: always
-    pager: delta --syntax-theme "Dracula" --paging=never
+    pager: delta --syntax-theme "Solarized (light)" --paging=never
 customCommands:
   - key: '<c-r>'
     command: 'git rebase --interactive "{{.SelectedLocalCommit.Sha}}"'

home/.config/qtile/config.py

@@ -121,6 +121,8 @@ def create_screenshot(qtile: Qtile) -> None:
         desc="Take a screenshot of the focused window",
     ),
     Key([mod], "s", create_screenshot, desc="Take a screenshot of the focused window"),
+    # screen key on framework
+    Key([mod], "p", lazy.spawn("wlr-randr --output eDP-1 --on"), desc="Launch firefox"),
 ]
 
 groups = [
@@ -226,6 +228,7 @@ def create_screenshot(qtile: Qtile) -> None:
 )
 memory_widget = widget.Memory(measure_mem="G")
 
+
 @dataclass
 class IOStat:
     device: str
@@ -275,9 +278,10 @@ def diskio(self) -> str:
 
     def poll(self) -> str:
         try:
-           return self.diskio()
+            return self.diskio()
         except Exception as e:
-           return f"Error: {e}"
+            return f"Error: {e}"
+
 
 class FPing(base.ThreadPoolText):
     defaults = [
@@ -393,6 +397,7 @@ def interface_set(self, _: list[str]):
     DiskIO(),
 ]
 
+
 screens = [
     Screen(
         top=bar.Bar(top_widgets, 24),
@@ -405,6 +410,7 @@ def interface_set(self, _: list[str]):
         # x11_drag_polling_rate = 60,
     ),
 ]
+screens.append(screens[0])
 
 # Drag floating layouts.
 mouse = [
@@ -451,7 +457,9 @@ def interface_set(self, _: list[str]):
     "type:touchpad": InputConfig(
         dwt=True, tap=True, natural_scroll=True, middle_emulation=True
     ),
-    "type:keyboard": InputConfig(kb_options="ctrl:nocaps", kb_layout="us", kb_variant="altgr-intl"),
+    "type:keyboard": InputConfig(
+        kb_options="ctrl:nocaps", kb_layout="us", kb_variant="altgr-intl"
+    ),
 }
 
 
@@ -467,24 +475,50 @@ def systemd_run(command: list[str]) -> list[str]:
 
 @hook.subscribe.startup
 def autostart():
-    commands = [
+    subprocess.run(
         [
             "systemctl",
             "--user",
             "import-environment",
             "XDG_SESSION_PATH",
             "WAYLAND_DISPLAY",
-        ],
+        ]
+    )
+    # fmt: off
+    sway_lock = [
+        "swaylock",
+        "--screenshots",
+        "--clock",
+        "--indicator",
+        "--indicator-radius", "100",
+        "--indicator-thickness", "7",
+        "--effect-blur", "7x5",
+        "--effect-vignette", "0.5:0.5",
+        "--ring-color", "bb00cc",
+        "--key-hl-color", "880033",
+        "--line-color", "00000000",
+        "--inside-color", "00000088",
+        "--separator-color", "00000000",
+        "--grace", "10",
+        "--fade-in", "0.2",
+    ]
+    commands = [
         ["firefox"],
         ["kanshi"],
         ["mako"],
         ["foot", "--server"],
         ["ferdium"],
         # start it twice because it doesn't create a window the first time
+        ["signal-desktop"],
         [
-            "signal-desktop"
+            "swayidle",
+            "-w",
+            "timeout", "300", shlex.join(sway_lock),
+            "timeout", "3600", "systemctl suspend",
+            "before-sleep", shlex.join(sway_lock),
         ],
     ]
+    # fmt: on
     for command in commands:
         subprocess.Popen(systemd_run(command))