diff --git a/.config/tridactyl/themes/snazzy.css b/.config/tridactyl/themes/snazzy.css
index f8b41ee..3b01816 100644
--- a/.config/tridactyl/themes/snazzy.css
+++ b/.config/tridactyl/themes/snazzy.css
@@ -36,10 +36,10 @@
--tridactyl-hint-outline: none;
}
-#command-line-holder { order: 1;
- /* border: 2px solid var(--base0B); */
- color: var(--tridactyl-bg) !important;
- background: var(--tridactyl-bg) !important;
+#command-line-holder {
+ order: 1;
+ color: var(--tridactyl-bg) !important;
+ background: var(--tridactyl-bg) !important;
}
:root #completions table tr td.prefix,
:root #completions table tr td.privatewindow,
diff --git a/.config/tridactyl/tridactylrc b/.config/tridactyl/tridactylrc
index 25a1aed..8ed6fc9 100644
--- a/.config/tridactyl/tridactylrc
+++ b/.config/tridactyl/tridactylrc
@@ -5,7 +5,6 @@ set update.nag true
set update.nagwait 7
set update.lastnaggedversion 1.14.0
set update.checkintervalsecs 86400
-set theme snazzy
set searchurls.gh https://github.com/search?utf8=✓&q=
set searchurls.y https://www.yewtu.be/search?q=
set searchurls.aw https://wiki.archlinux.org/index.php?search=
@@ -62,7 +61,7 @@ command org-capture composite get_current_url | js -p tri.excmds.exclaim_quiet('
"" Unbind this key to rebind it later
unbind v
-command mpv js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim('mpv ' + url))
+command mpv js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim('mpv --no-terminal' + '${url}'))
command torrent js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('transadd ' + url))
@@ -72,9 +71,10 @@ command ytdl js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim
command aud js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('dlaudio ' + url))
+unbind t
"" Adding my own bindings
-bind v hint -W mpv
+bind v composite hint -pipe a href | js -p tri.excmds.shellescape(JS_ARG) | exclaim mpv --ontop --keepaspect-window
bind gt hint -W torrent
bind gv current_url mpv
bind ga hint -W aud
@@ -88,6 +88,8 @@ bind m fillcmdline quickmark
bind O fillcmdline tabopen
bind gh hint -h
bind <C-s> fillcmdline tabgroupswitch
+bind tm fillcmdline tabgroupmove
+bind ts fillcmdline tabgroupswitch
"" buffers show as windows
bind b fillcmdline taball
@@ -99,4 +101,6 @@ bind --mode=ex <C-j> ex.next_completion
bind --mode=ex <C-k> ex.prev_completion
"" unbind Ctrl-F
-unbind <C-f>
\ No newline at end of file
+unbind <C-f>
+
+set theme snazzy
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 3c64ead..6971af6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
]
},
"locked": {
- "lastModified": 1696926085,
- "narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=",
+ "lastModified": 1701453400,
+ "narHash": "sha256-hI9+KBShsSfvWX7bmRa/1VI20WGat3lDXmbceMZzMS4=",
"owner": "Kirottu",
"repo": "anyrun",
- "rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216",
+ "rev": "e14da6c37337ffa3ee1bc66965d58ef64c1590e5",
"type": "github"
},
"original": {
@@ -46,11 +46,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1699378729,
- "narHash": "sha256-WH3CEdPqp1wQeE5hi0yik+MwwSQelFUZCnB3Iqwa1wE=",
+ "lastModified": 1703405679,
+ "narHash": "sha256-5deEIknMX0Zl0MdKjlUn6Yvg2J20uHWAp035OSIRlxU=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "4f81073c44bfa46c97cdd739345e6dc05494c69a",
+ "rev": "bfe818bd2936828a3669df3afb21707b09d99cd9",
"type": "github"
},
"original": {
@@ -68,11 +68,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1692366702,
- "narHash": "sha256-GEysmNDm+olt1WXHzRwb4ZLifkXmeP5+APAN3b81/Og=",
+ "lastModified": 1703102678,
+ "narHash": "sha256-MR91Ytt9Jf63dshn7LX64LWAVygbZgQYkcTIKhfVNXI=",
"owner": "elkowar",
"repo": "eww",
- "rev": "a9a35c1804d72ef92e04ee71555bd9e5a08fa17e",
+ "rev": "65d622c81f2e753f462d23121fa1939b0a84a3e0",
"type": "github"
},
"original": {
@@ -93,11 +93,11 @@
]
},
"locked": {
- "lastModified": 1691100095,
- "narHash": "sha256-qp+M5l18qHRmvUkYOqoi5AaspX7ZbqsVf6S8qQgEnFs=",
+ "lastModified": 1699821751,
+ "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=",
"owner": "erikarvstedt",
"repo": "extra-container",
- "rev": "9a594f75cc782c481df9d108624409d429a23f19",
+ "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49",
"type": "github"
},
"original": {
@@ -148,11 +148,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1694529238,
- "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "lastModified": 1701680307,
+ "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -181,11 +181,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1692799911,
- "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@@ -199,11 +199,11 @@
"systems": "systems_4"
},
"locked": {
- "lastModified": 1694529238,
- "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "lastModified": 1701680307,
+ "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -219,11 +219,11 @@
]
},
"locked": {
- "lastModified": 1699368917,
- "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=",
+ "lastModified": 1703368619,
+ "narHash": "sha256-ZGPMYL7FMA6enhuwby961bBANmoFX14EA86m2/Jw5Jo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3",
+ "rev": "a2523ea0343b056ba240abbac90ab5f116a7aa7b",
"type": "github"
},
"original": {
@@ -242,11 +242,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1699368836,
- "narHash": "sha256-lAFB3TC2jej9DcOcIAkVVPf35V/LaeG/cP1sYks1t4M=",
+ "lastModified": 1703420431,
+ "narHash": "sha256-WM0i8/BtL+Ew/0eymSmdmFaBdxd52AlKCHmIugUmvOQ=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "47654a84c2dc68d478d044fd0589ec5cc96dbc66",
+ "rev": "ff75f991a50d9e82bb4ee4cacace551225ef2038",
"type": "github"
},
"original": {
@@ -262,11 +262,11 @@
]
},
"locked": {
- "lastModified": 1701083314,
- "narHash": "sha256-LVtzGyRan2XV/EpDYYqwPd5cKdSwTJmVuOYeCUD0He4=",
+ "lastModified": 1702823915,
+ "narHash": "sha256-ZHnEiOmV/d+fGslT/rLqPTf8e6i5nLxgNzGjUv7b+IA=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
- "rev": "b225987d6c3b0b962f8bc67164966c6fdc9b3f74",
+ "rev": "28c119162091c54dbc81d31ee9db408b3b392fcd",
"type": "github"
},
"original": {
@@ -307,11 +307,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1698688760,
- "narHash": "sha256-VuHPeAho57EheieFdWUBQwnB6o9EHSvJLStFs05766U=",
+ "lastModified": 1702661989,
+ "narHash": "sha256-586PylKD7Vh5KAbKO04wyU/OXF6qwtFS83UmiI/MK3o=",
"owner": "chriscochrun",
"repo": "lumina",
- "rev": "4cb57b0b96e73e2f3eab1141b66d61820d8a51b0",
+ "rev": "7061ec2ed8b2446f9619ac32eeedda31848357b2",
"type": "gitlab"
},
"original": {
@@ -325,11 +325,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1694081375,
- "narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=",
+ "lastModified": 1698420672,
+ "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community",
"repo": "naersk",
- "rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89",
+ "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github"
},
"original": {
@@ -346,11 +346,11 @@
"nixpkgs-unstable": "nixpkgs-unstable"
},
"locked": {
- "lastModified": 1698064538,
- "narHash": "sha256-Z0WK2+b2jkhGT74N1K0is9LKVqcP3N+5s8aPRfIJ9bk=",
+ "lastModified": 1702564002,
+ "narHash": "sha256-AJfaPpDc7gzaD4nEIdDCN5BMA0gwJbNzaSRj4o00Tko=",
"owner": "fort-nix",
"repo": "nix-bitcoin",
- "rev": "8a8f32a4fa8fa4d97bea60c19d587a4523d10a2a",
+ "rev": "a2e1478a7cedffe1bf08988764f32f579ae69e5f",
"type": "github"
},
"original": {
@@ -362,11 +362,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1699159446,
- "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=",
+ "lastModified": 1702453208,
+ "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "627bc9b88256379578885a7028c9e791c29fb581",
+ "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
"type": "github"
},
"original": {
@@ -378,11 +378,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1698134075,
- "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
+ "lastModified": 1702312524,
+ "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
+ "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "github"
},
"original": {
@@ -409,11 +409,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1699291058,
- "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
+ "lastModified": 1703034876,
+ "narHash": "sha256-4bMPFv/bs5g1nEsXQwXlrAGJgjv1Ilr0ejdaTkBwQLs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
+ "rev": "312ab59e8ade69e6083017bd9b98a2919f1fb86a",
"type": "github"
},
"original": {
@@ -425,11 +425,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1701952659,
- "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
+ "lastModified": 1703068421,
+ "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
+ "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f",
"type": "github"
},
"original": {
@@ -441,11 +441,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1697915759,
- "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
+ "lastModified": 1701336116,
+ "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
+ "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
"type": "github"
},
"original": {
@@ -457,11 +457,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1694032533,
- "narHash": "sha256-I8cfCV/4JNJJ8KHOTxTU1EphKT8ARSb4s9pq99prYV0=",
+ "lastModified": 1701040486,
+ "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4",
+ "rev": "45827faa2132b8eade424f6bdd48d8828754341a",
"type": "github"
},
"original": {
@@ -471,11 +471,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1693844670,
- "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
+ "lastModified": 1700794826,
+ "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
+ "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"type": "github"
},
"original": {
@@ -487,27 +487,27 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1697851979,
- "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
+ "lastModified": 1702233072,
+ "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
+ "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.05",
+ "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1699099776,
- "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
+ "lastModified": 1703255338,
+ "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
+ "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
"type": "github"
},
"original": {
@@ -671,18 +671,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
- "lastModified": 1697909146,
- "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=",
+ "lastModified": 1701368958,
+ "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
"owner": "wlroots",
"repo": "wlroots",
- "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2",
+ "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
- "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2",
+ "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
}
},
@@ -702,11 +702,11 @@
]
},
"locked": {
- "lastModified": 1697981233,
- "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=",
+ "lastModified": 1702334919,
+ "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2",
+ "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 50d5161..4feec8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,7 +66,7 @@
./systems/syl/configuration.nix
home-manager.nixosModules.home-manager
hyprland.nixosModules.default
- nixos-hardware.nixosModules.framework
+ nixos-hardware.nixosModules.framework-11th-gen-intel
# libre-presenter.defaultPackage
{
home-manager.useGlobalPkgs = true;
diff --git a/home/home.nix b/home/home.nix
index 1d3a5ad..9ddb32d 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -40,9 +40,10 @@
services.gpg-agent = {
enable = true;
- extraConfig = ''
- pinentry-program ${pkgs.pinentry.qt}/bin/pinentry
- '';
+ pinentryFlavor = "qt";
+ # extraConfig = ''
+ # pinentry-program ${pkgs.pinentry.qt}/bin/pinentry
+ # '';
};
accounts.email = {
@@ -91,7 +92,7 @@
mbsync.enable = true;
mu.enable = true;
flavor = "outlook.office365.com";
- passwordCommand = "${pkgs.rbw}/bin/rbw get --full 'Office 365' | rg 'mumailemacs' | awk '{print $2}'";
+ passwordCommand = "cat ~/.config/access";
realName = "Chris Cochrun";
imap = {
host = "outlook.office365.com";
@@ -108,7 +109,7 @@
remove = "both";
expunge = "both";
extraConfig.account = {
- AuthMechs = "LOGIN";
+ AuthMechs = "XOAUTH2";
};
};
maildir.path = "office";
@@ -138,6 +139,7 @@
programs.mu.enable = true;
programs.mbsync = {
+ package = pkgs.isync.override { withCyrusSaslXoauth2 = true; };
enable = true;
};
programs.msmtp.enable = true;
diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix
index be0b6f8..221e069 100644
--- a/pkgs/base-packages.nix
+++ b/pkgs/base-packages.nix
@@ -21,6 +21,7 @@
guile-sjson
guile-json
guile-lib
+ scsh
# unrar
p7zip
zip
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index 44ab7b1..7bfd872 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -13,6 +13,7 @@ with lib;
transmission
openssh
openssl
+ cyrus-sasl-xoauth2
ark
ifuse
dash
diff --git a/scripts/zoomin b/scripts/zoomin
index 21f4d23..34ce74d 100755
--- a/scripts/zoomin
+++ b/scripts/zoomin
@@ -1,4 +1,5 @@
#!/usr/bin/env -S sbcl --script
+;; -*-lisp-*-
(require "uiop")
(defparameter output
(with-output-to-string (out)
@@ -29,4 +30,3 @@
(run-program "hyprctl" `("keyword" "misc:cursor_zoom_factor" ,(write-to-string decrement))
:search "/run/current-system/sw/bin/"
:output *standard-output*)))
-;; -*-lisp-*-