Compare commits

..

No commits in common. "b51ed19d1692cd364af1fc59c68e7602409866e4" and "ac990d6f3193049fe4dd3cb3c6bdc17dfcaa8dc4" have entirely different histories.

6 changed files with 66 additions and 109 deletions

View file

@ -30,11 +30,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1711742460, "lastModified": 1707922053,
"narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,11 +168,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711934712, "lastModified": 1711588700,
"narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", "rev": "502241afa3de2a24865ddcbe4c122f4546e32092",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1712021653, "lastModified": 1711642640,
"narHash": "sha256-Yr+cDDESdm2E9C/nj1nlhrMpyYt1/Va9yXvlRYD9SyA=", "narHash": "sha256-sgOjTsGAityIoUxXPYyRrzZzH4O2yg+NvM1X2fah0C4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "5dee04f5269dffad92faf3a8210c03e639d86db2", "rev": "0ecb38ec45621eaacffb62fcbf9595d7bc200c7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -216,11 +216,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711884036, "lastModified": 1710935108,
"narHash": "sha256-DkJBMFUG8GLCoZ5yEXRDb4iWQjH+V6hrB4QQuRrn2F8=", "narHash": "sha256-O4zGpwaXhnD+01zTn6cQZDgU3HagGt4DBPpQyDbD6fk=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "149727ce1f7dd4f461ab1d61d560546f3d1f32a1", "rev": "f1ec00a1c9a24c0738fb5d5ac309d6af16e67415",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +351,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1709336216,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -447,11 +447,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711698730, "lastModified": 1711664525,
"narHash": "sha256-/rCvMprkNJHIJUIUB+jjzv1ZSZkcIK5wMn3I/QoAsFk=", "narHash": "sha256-xC0oXL6FA79FJ6ZZDfaSceIRxGIzxHulJkPCXl9vtQc=",
"ref": "main", "ref": "main",
"rev": "5807cf59b93d937b3804e7b73e30221337c598ad", "rev": "6dcf1480d660f1888a4f4e35179cc6646e8679fe",
"revCount": 5, "revCount": 4,
"type": "git", "type": "git",
"url": "ssh://git@git.datarift.nl/erwin/git-fs-monitor.git" "url": "ssh://git@git.datarift.nl/erwin/git-fs-monitor.git"
}, },
@ -520,11 +520,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712016346, "lastModified": 1711625603,
"narHash": "sha256-O2nO7pD+krq+4HgkLB4VThRtAucIPfXDs/jJqCGlK1w=", "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4be0464472675212654dedf3e021bd5f1d58b92f", "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -544,11 +544,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1711753492, "lastModified": 1711159783,
"narHash": "sha256-lLlXQBebD6wd2m7vjXg2zQ8tfJF2a70RL+zXdbaQqn0=", "narHash": "sha256-nwl2Cygq7NrV9QcebJE/T/vXv7w+zLERD7ygHz0F5g8=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "1b7c70b198554d0f0306ec153c94906623437aed", "rev": "d31f7c7d3194c51372134832a3a2a256773c161a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -642,11 +642,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711401922, "lastModified": 1702539185,
"narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -659,11 +659,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1711703276, "lastModified": 1709237383,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +676,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711460390, "lastModified": 1702780907,
"narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -692,11 +692,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1711668574, "lastModified": 1711460390,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -724,11 +724,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1711819797, "lastModified": 1711233294,
"narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=", "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c", "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,11 +740,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1711703276, "lastModified": 1711523803,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -795,11 +795,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1712033542, "lastModified": 1711519547,
"narHash": "sha256-werD6WtgYo+ZGopbLENP0phwoWyd73CWz01VgrFOSL0=", "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "642dce09c85b1478b509416f83e72bd59b6b3ac2", "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -870,11 +870,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712024007, "lastModified": 1711592024,
"narHash": "sha256-52cf+mHZJbSaDFdsBj6vN1hH52AXsMgEpS/ajzc9yQE=", "narHash": "sha256-oD4OJ3TRmVrbAuKZWxElRCyCagNCDuhfw2exBmNOy48=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d45d957dc3c48792af7ce58eec5d84407655e8fa", "rev": "aa858717377db2ed8ffd2d44147d907baee656e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -891,11 +891,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1711855048, "lastModified": 1711249319,
"narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=", "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10", "rev": "405987a66cce9a4a82f321f11b205982a7127c88",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,3 +1,7 @@
* {
all: unset;
}
// Color variables // Color variables
$background: #000000; $background: #000000;
$foreground: #ffffff; $foreground: #ffffff;
@ -14,11 +18,6 @@ $cyan: #7dcfff;
$navy: #285577; $navy: #285577;
$white: $foreground; $white: $foreground;
* {
all: unset;
background-color: inherit;
}
// EWW BAR // EWW BAR
.eww_bar { .eww_bar {
background-color: $background; background-color: $background;
@ -222,5 +221,3 @@ calendar:indeterminate {
color: $blue; color: $blue;
} }
} }
// systray

View file

@ -207,13 +207,9 @@
(defwidget right [] (defwidget right []
(box :orientation "h" (box :orientation "h"
:space-evenly false :space-evenly false
:spacing 5
:halign "end" :halign "end"
(date-time) (date-time)
(power) (power)))
(systray
:spacing 5
:space-evenly false)))
(defwidget end [] (defwidget end []
(box :orientation "h" (box :orientation "h"

View file

@ -35,14 +35,9 @@ use ipc ipc-cmd
def workspaces [] { def workspaces [] {
let workspaces = (ipc-cmd "-t" "get_workspaces" | select id name focused urgent visible) let workspaces = (ipc-cmd "-t" "get_workspaces" | select id name focused urgent visible)
let mode = (ipc-cmd "-t" "get_binding_state") let mode = (ipc-cmd "-t" "get_binding_state")
let focused_title_full = ((ipc-cmd --raw "-t" "get_tree") | jaq -r '.. | (.nodes? // empty)[] | select(.focused) | {name}' | from json).name let focused_title = ((ipc-cmd --raw "-t" "get_tree") | jaq -r '.. | (.nodes? // empty)[] | select(.focused) | {name}' | from json)
mut focused_title = ($focused_title_full | str substring -g 0..150)
if ($focused_title_full | str length) > 150 { { workspaces: $workspaces, mode: $mode.name, title: $focused_title.name }
$focused_title = ($focused_title | append "..." | str join "")
}
{ workspaces: $workspaces, mode: $mode.name, title: $focused_title }
} }
def main [] { def main [] {

View file

@ -9,50 +9,19 @@ let
cfg = config.eboskma.programs.firefox; cfg = config.eboskma.programs.firefox;
profileSettings = { profileSettings = {
"app.shield.optoutstudies.enabled" = false;
"beacon.enabled" = false;
"breakpad.reportURL" = "";
"browser.chrome.guess_favicon" = false; "browser.chrome.guess_favicon" = false;
"browser.crashReports.unsubmittedCheck.autoSubmit" = false;
"browser.crashReports.unsubmittedCheck.autoSubmit2" = false;
"browser.crashReports.unsubmittedCheck.enabled" = false;
"browser.shell.checkDefaultBrowser" = false; "browser.shell.checkDefaultBrowser" = false;
"browser.tabs.crashReporting.sendReport" = false;
"browser.translations.enable" = false; "browser.translations.enable" = false;
"browser.urlbar.trimURLs" = false;
"devtools.theme" = "dark"; "devtools.theme" = "dark";
"experiments.activeExperiment" = false;
"experiments.enabled" = false;
"experiments.manifest.uri" = "";
"experiments.supported" = false;
"extensions.quarantinedDomains.enabled" = false; "extensions.quarantinedDomains.enabled" = false;
"gfx.webrender.all" = true; "gfx.webrender.all" = true;
"image.avif.enabled" = true; "image.avif.enabled" = true;
"image.webp.enabled" = true; "image.webp.enabled" = true;
"media.ffmpeg.vaapi.enabled" = true; "media.ffmpeg.vaapi.enabled" = true;
"media.rdd-ffmpeg.enabled" = true; "media.rdd-ffmpeg.enabled" = true;
"network.allow-experimens" = false;
"network.http.referer.spoofSource" = true;
"privacy.query_stripping" = true;
"privacy.webrtc.allowSilencingNotifications" = true; "privacy.webrtc.allowSilencingNotifications" = true;
"privacy.webrtc.legacyGlobalIndicator" = false; "privacy.webrtc.legacyGlobalIndicator" = false;
"security.tls.enable_0rtt_data" = false; "security.tls.enable_0rtt_data" = false;
"services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsoredTopSite" = false;
"toolkit.telemetry.archive.enabled" = false;
"toolkit.telemetry.bhrPing.enabled" = false;
"toolkit.telemetry.cachedClientID" = "";
"toolkit.telemetry.enabled" = false;
"toolkit.telemetry.firstShutdownPing.enabled" = false;
"toolkit.telemetry.hybridContent.enabled" = false;
"toolkit.telemetry.newProfilePing.enabled" = false;
"toolkit.telemetry.prompted" = 2;
"toolkit.telemetry.rejected" = true;
"toolkit.telemetry.reportingpolicy.firstRun" = false;
"toolkit.telemetry.server" = "";
"toolkit.telemetry.shutdownPingSender.enabled" = false;
"toolkit.telemetry.unified" = false;
"toolkit.telemetry.unifiedIsOptIn" = false;
"toolkit.telemetry.updatePing.enabled" = false;
"ui.key.menuAccessKeyFocuses" = false; "ui.key.menuAccessKeyFocuses" = false;
"widget.content.allow-gtk-dark-theme" = true; "widget.content.allow-gtk-dark-theme" = true;
}; };

View file

@ -2,7 +2,7 @@
pkgs, pkgs,
config, config,
lib, lib,
# flake-inputs, flake-inputs,
... ...
}: }:
with lib; with lib;
@ -111,11 +111,11 @@ in
editor = "${config.eboskma.programs.emacs.package}/bin/emacsclient"; editor = "${config.eboskma.programs.emacs.package}/bin/emacsclient";
pager = "${pkgs.bat}/bin/bat"; pager = "${pkgs.bat}/bin/bat";
untrackedCache = true; untrackedCache = true;
# fsmonitor = fsmonitor =
# let let
# git-fs-monitor = flake-inputs.git-fs-monitor.packages.${pkgs.system}.default; git-fs-monitor = flake-inputs.git-fs-monitor.packages.${pkgs.system}.default;
# in in
# "${git-fs-monitor}/bin/git-fs-monitor"; "${git-fs-monitor}/bin/git-fs-monitor";
}; };
merge = { merge = {
ff = "only"; ff = "only";