diff --git a/TODO b/TODO index 1b72860..f7c7058 100644 --- a/TODO +++ b/TODO @@ -1 +1,4 @@ -finish swayosd services setup +create generic Pake/web2app style nix packager +package emojimart: https://github.com/vemonet/EmojiMart +implement agenix +add to launcher for logseq: --enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform-hint=auto diff --git a/flake.lock b/flake.lock index b7255f6..bbc1fbb 100644 --- a/flake.lock +++ b/flake.lock @@ -227,11 +227,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1707238033, - "narHash": "sha256-82Jp3nhizT04zFHOGXPzrEvy204pAvRQOCqK8KK6ncw=", + "lastModified": 1708299992, + "narHash": "sha256-5IWaa1eTFlq25PSJySmW/s69rXE00fP5P3rhy5jGpn4=", "owner": "helix-editor", "repo": "helix", - "rev": "28a39e6efc79b9aac53d49ac8325e8e32fb127e2", + "rev": "ebf155d6351a84dec010447af88b8246103537da", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1708294481, + "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", "type": "github" }, "original": { @@ -283,11 +283,11 @@ ] }, "locked": { - "lastModified": 1707016097, - "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=", + "lastModified": 1708225687, + "narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "3e3dad2808379c522138e2e8b0eb73500721a237", + "rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127", "type": "github" }, "original": { @@ -361,11 +361,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707197474, - "narHash": "sha256-fnqDxI6R3f1vpuRYUQMxUJzmhedRMw+PVoyojNl/3Wg=", + "lastModified": 1707749130, + "narHash": "sha256-GGcLEg546mjyQbUzbd/z79sGHPK8jYbQKeHrbl8Zb/U=", "owner": "nix-community", "repo": "nixd", - "rev": "e6dedde5e9600b7f07ab72333221274e18c8867f", + "rev": "548226eca2994b2e9e1592c6910410b4a2d0575c", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -525,11 +525,11 @@ }, "nur": { "locked": { - "lastModified": 1707284699, - "narHash": "sha256-tt2ZM+I23cEdYwqF0TgkttmgJytNfYbm4iguWuTYeEY=", + "lastModified": 1708294799, + "narHash": "sha256-CXpBIBqeWiarwpJk2DLTEooy0uX7at1mqFNCnho5kRo=", "owner": "nix-community", "repo": "NUR", - "rev": "94ca168756e90b856bb94a40b0c4cbc403ec4c10", + "rev": "8abbb1212ff453b65fe998f01e644584fff79f6d", "type": "github" }, "original": { @@ -574,7 +574,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Y212y4V8m+gO36xL0PyVLKcdiddnd24g6d/cleSPQpY=", + "narHash": "sha256-MRa0TFXRei+B+/TlmI0IPpH1hdtnLfSpVdKP0gKeTVQ=", "path": "pywlroots", "type": "path" }, @@ -610,7 +610,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-lQz10JCtiBwGhfi0IPM9KrUHKxdddhxW+/t3X/w+MbM=", + "narHash": "sha256-7WNxEpUZUnC7ouHP86QtymKhE0yzbdwPIR2SQzRVzbs=", "path": "flakes/qtile", "type": "path" }, @@ -622,11 +622,11 @@ "qtile-src": { "flake": false, "locked": { - "lastModified": 1707208090, - "narHash": "sha256-zlMVW9Lax5IP0r5dnL4UhaDXFHY3tLTzQ12j44QzePQ=", + "lastModified": 1708218053, + "narHash": "sha256-hlVLj/ZGBAfIPWBHTZ6JI6igmqPifV0gtifO/2g/uMY=", "owner": "qtile", "repo": "qtile", - "rev": "e11aec2d8124f43e7e1ab2827e4c95551e6b3d01", + "rev": "3a61a2789b06b53bd66171499791541bb838fe23", "type": "github" }, "original": { @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1707271822, - "narHash": "sha256-/DZsoPH5GBzOpVEGz5PgJ7vh8Q6TcrJq5u8FcBjqAfI=", + "lastModified": 1708241671, + "narHash": "sha256-zSulX9tP4R35Y8A842dGSzaHMVP91W2Ry0SXvQKD2BQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7a94fe7690d2bdfe1aab475382a505e14dc114a6", + "rev": "d500e370b26f9b14303cb39bf1509df0a920c8b0", "type": "github" }, "original": { diff --git a/home/dots/qtile/config.py b/home/dots/qtile/config.py index 30d3af2..3d60b1b 100755 --- a/home/dots/qtile/config.py +++ b/home/dots/qtile/config.py @@ -112,11 +112,11 @@ keys.append( ) groups = [] -land_groups = "135" -port_groups = "246" -groups.extend([Group(str(i), screen_affinity=(i+1)%2) for i in range(1,7)]) -# groups.extend([Group(i, screen_affinity=1) for i in land_groups]) -# groups.extend([Group(i, screen_affinity=0) for i in port_groups]) +land_groups = "123" +port_groups = "456" +# groups.extend([Group(str(i), screen_affinity=(i+1)%2) for i in range(1,7)]) +groups.extend([Group(i, screen_affinity=1) for i in land_groups]) +groups.extend([Group(i, screen_affinity=0) for i in port_groups]) for i in groups: keys.extend( diff --git a/home/home.nix b/home/home.nix index 2d3dea7..bb5f197 100644 --- a/home/home.nix +++ b/home/home.nix @@ -53,6 +53,11 @@ in { kooha + onlyoffice-bin + + croc + logseq + xorg.xrdb culr @@ -192,6 +197,17 @@ in { "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ]; + xdg.desktopEntries.logseq = { + name = "Logseq"; + exec = "logseq --enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform-hint=auto %u"; + icon = "logseq"; + type = "Application"; + categories = ["Utility"]; + mimeType = ["x-scheme-handler/logseq"]; + terminal = false; + comment = "A privacy-first, open-source platform for knowledge management and collaboration."; + }; + gtk = with pkgs.rice; { enable = true; theme = with gtk-theme; { diff --git a/system/configuration.nix b/system/configuration.nix index ae166fd..7874ea0 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -34,18 +34,13 @@ substituters = []; trusted-public-keys = []; }; + extraOptions = '' + keep-outputs = true + keep-derivations = true + ''; }; - imports = [ - ../util/temp-iproute-patch.nix - ]; - - disabledModules = ["config/iproute2.nix"]; - - nix.extraOptions = '' - keep-outputs = true - keep-derivations = true - ''; + imports = []; systemd.services.NetworkManager-wait-online.enable = true; # for some reason nm doesn't enable without this @@ -101,7 +96,6 @@ enable = true; settings = { default_session = { - # command = "${lib.getExe pkgs.greetd.tuigreet} -r -g \"what's good\" --time --cmd sway"; command = "${lib.getExe pkgs.greetd.tuigreet} -r -g \"what's good\" --time --cmd \"qtile start -b wayland\""; user = "greeter"; }; @@ -115,13 +109,15 @@ xdg.autostart.enable = true; xdg.portal = { enable = true; + wlr.enable = true; + gtkUsePortal = true; extraPortals = with pkgs; [ xdg-desktop-portal-gtk - xdg-desktop-portal-wlr ]; config = { common = { - default = "wlr"; + default = ["wlr" "gtk"]; + "org.freedesktop.impl.portal.FileChooser" = "gtk"; }; }; }; @@ -197,12 +193,10 @@ package = pkgs.nix-ld-rs; }; - networking.firewall.enable = true; networking.firewall = { - # TODO: use tailscale with interface blacklist patch? - # trustedInterfaces = ["tailscale0"]; checkReversePath = "loose"; }; + networking.nftables.enable = true; # programs.sway = { # # to use home-manager diff --git a/util/temp-iproute-patch.nix b/util/temp-iproute-patch.nix deleted file mode 100644 index 78bd07d..0000000 --- a/util/temp-iproute-patch.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.networking.iproute2; -in -{ - options.networking.iproute2 = { - enable = mkEnableOption (lib.mdDoc "copying IP route configuration files"); - rttablesExtraConfig = mkOption { - type = types.lines; - default = ""; - description = lib.mdDoc '' - Verbatim lines to add to /etc/iproute2/rt_tables - ''; - }; - }; - - config = mkIf cfg.enable { - environment.etc."iproute2/rt_tables" = { - mode = "0644"; - text = (fileContents "${pkgs.iproute2}/lib/iproute2/rt_tables") - + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); - }; - }; -}