From 71acefb35a95adcaeb7d9c4a0724d00c3edae558 Mon Sep 17 00:00:00 2001 From: Lucy Hochkamp Date: Sun, 3 Nov 2024 23:17:06 +0100 Subject: [PATCH] meow --- flake.lock | 133 +++++++++++++++++++++++--------------- flake.nix | 4 ++ hosts/theseus/swaycfg.nix | 37 ++++++++--- 3 files changed, 112 insertions(+), 62 deletions(-) diff --git a/flake.lock b/flake.lock index 7d4461d6..0fd713b1 100644 --- a/flake.lock +++ b/flake.lock @@ -25,18 +25,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -89,11 +83,11 @@ ] }, "locked": { - "lastModified": 1727003835, - "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", + "lastModified": 1730600078, + "narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", + "rev": "4652874d014b82cb746173ffc64f6a70044daa7e", "type": "github" }, "original": { @@ -108,11 +102,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -216,11 +210,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727245451, - "narHash": "sha256-dy6UVn4miQZZEqlGBJL+yGCyNMoI/Pb9UJwZAZTA6/U=", + "lastModified": 1730313564, + "narHash": "sha256-1RBs/WOH3gp2ETDruEbM2vq2tPiJmqQ3wrjiKREE5NU=", "owner": "helix-editor", "repo": "helix", - "rev": "b18a471ed189fb326a781181a28f3073f5c1fe1e", + "rev": "38faf74febf3332fb119302324bfd21229d39e14", "type": "github" }, "original": { @@ -295,11 +289,11 @@ }, "impermanence": { "locked": { - "lastModified": 1727198257, - "narHash": "sha256-/qMVI+SG9zvhLbQFOnqb4y4BH6DdK3DQHZU5qGptehc=", + "lastModified": 1730403150, + "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", "owner": "nix-community", "repo": "impermanence", - "rev": "8514fff0f048557723021ffeb31ca55f69b67de3", + "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", "type": "github" }, "original": { @@ -374,11 +368,11 @@ "pnpm2nix": "pnpm2nix" }, "locked": { - "lastModified": 1718807056, - "narHash": "sha256-HP6ZDbmI+je9hecw0g2ynAUnJTN2OfBDSpZtPYvCNrU=", + "lastModified": 1729255849, + "narHash": "sha256-P9Dw2s1LL0xluiJyRMXz+STza75UYTvS3oegpE3S3zs=", "owner": "thexyno", "repo": "lolpizza2", - "rev": "933ee937e80adf2f2195a7f04ce5ae120da6c4ab", + "rev": "6989a9dc030ce99589758d0cea682c3011a6ea31", "type": "github" }, "original": { @@ -423,11 +417,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1730537918, + "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", "type": "github" }, "original": { @@ -439,11 +433,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -455,11 +449,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1727129439, - "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", + "lastModified": 1730381317, + "narHash": "sha256-JhEY6lGAdVzpytYgVd80bLeOqqrQ2SwWYEq2RXFnofg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", + "rev": "9706f4dd0e516de529fbd15bb8337e4a10d53307", "type": "github" }, "original": { @@ -471,11 +465,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1727278180, - "narHash": "sha256-6uOTCR8Z/N/d67K+seV7DK0seUEU37I+Kvm7iTHn4aQ=", + "lastModified": 1730671215, + "narHash": "sha256-bCt0uxoFfD8aXjnwz98DZegnEyrH0tBWO/9H+pt8+k4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6e93ec99200246058b8eb727a3cd622dd5f53bf", + "rev": "ab272732b148a5f208a2a49612d67695e7fa8abb", "type": "github" }, "original": { @@ -517,11 +511,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727129439, - "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -534,11 +528,11 @@ "pandoc-latex-template": { "flake": false, "locked": { - "lastModified": 1726687471, - "narHash": "sha256-XYg6sYLiNae+HYjfyj4hQvo2DdX5HYZc00rwvQKGpEE=", + "lastModified": 1727958771, + "narHash": "sha256-CC0FGyuzuP3WV6x5HP0xwAhTvofCIYzF3IOqM84zOrM=", "owner": "Wandmalfarbe", "repo": "pandoc-latex-template", - "rev": "1ad0d6d7873bc76a2fb16f22bc28678f1e25b881", + "rev": "24a8c009368843605c212159ad8449476db87d20", "type": "github" }, "original": { @@ -587,28 +581,25 @@ "nixpkgs-master": "nixpkgs-master", "pandoc-latex-template": "pandoc-latex-template", "spoons": "spoons", - "utils": "utils", + "swaymonad": "swaymonad", + "utils": "utils_2", "x": "x", "xynoblog": "xynoblog" } }, "rust-overlay": { "inputs": { - "flake-utils": [ - "helix", - "flake-utils" - ], "nixpkgs": [ "helix", "nixpkgs" ] }, "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "type": "github" }, "original": { @@ -660,11 +651,11 @@ "spoons": { "flake": false, "locked": { - "lastModified": 1723246395, - "narHash": "sha256-StdD+r2Hg3H4uW38F+ar6FT0rhbzrmzvFbQiSS/906A=", + "lastModified": 1728549662, + "narHash": "sha256-igHFHcNo/+5nYiBNa+VBddx9Pe2y7N6y7wEl7kSjHWY=", "owner": "Hammerspoon", "repo": "Spoons", - "rev": "b753f19a3318e2d5c9998c4c2d804d8bf1af1fb7", + "rev": "c12db871a179e6af29c1a290222aeb1ad9f34ffb", "type": "github" }, "original": { @@ -673,6 +664,27 @@ "type": "github" } }, + "swaymonad": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1708895016, + "narHash": "sha256-yM2sbiGM5wZ6O1yZ9FOfrXki9qrfcwPLs28a5FlcO4k=", + "owner": "nicolasavru", + "repo": "swaymonad", + "rev": "bd9b94ae756a09c185a2b2b0323b7008c19c859b", + "type": "github" + }, + "original": { + "owner": "nicolasavru", + "repo": "swaymonad", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -779,6 +791,21 @@ } }, "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { "inputs": { "systems": "systems_7" }, diff --git a/flake.nix b/flake.nix index 413cc7c2..80026cb5 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,10 @@ url = "github:JakeStanger/ironbar"; inputs.nixpkgs.follows = "nixpkgs"; }; + swaymonad = { + url = "github:nicolasavru/swaymonad"; + inputs.nixpkgs.follows = "nixpkgs"; # not mandatory but recommended + }; ## editor stuff # nixd.url = "github:nix-community/nixd"; diff --git a/hosts/theseus/swaycfg.nix b/hosts/theseus/swaycfg.nix index dcf5b74c..cf7fc657 100644 --- a/hosts/theseus/swaycfg.nix +++ b/hosts/theseus/swaycfg.nix @@ -1,5 +1,14 @@ { pkgs, config, inputs, ... }: { imports = [ inputs.ironbar.homeManagerModules.default ]; + gtk = { + enable = true; + # font.size = 10; + theme.name = "adwaita-dark"; + }; + qt = { + enable = true; + style.name = "adwaita-dark"; + }; home.packages = with pkgs; [ slurp grim @@ -22,8 +31,8 @@ @define-color color_text #ebdbb2; @define-color color_urgent #cc241d; * { - font-family: Noto Sans Nerd Font, sans-serif; - font-size: 10px; + font-family: Source Sans Pro Nerd Font, sans-serif; + font-size: 15px; border: none; border-radius: 0; } @@ -58,12 +67,12 @@ ''; config = { position = "top"; - height = 10; + height = 20; start = [ { type = "workspaces"; } { type = "sway_mode"; } ]; - middle = [ + center = [ { type = "focused"; show_icon = true; @@ -87,12 +96,13 @@ } { type = "upower"; - format = "󰁹 {percentage}%"; + format = "{icon} {percentage}%"; } { type = "sys_info"; format = [ - " {cpu_percent}% {temp_c:acpitz-acpi-0}°C" + " {cpu_percent}%" + " {temp_c:k10temp-Tctl}°C" " {memory_used}/{memory_total}GB" "󰋊 {disk_used:/persistent}/{disk_total:/persistent}GB" "󰓢 {net_down:wlan0}/{net_up:wlan0} Mbps" @@ -152,7 +162,14 @@ input * { xkb_layout us xkb_variant colemak_dh_iso - xkb_options caps:swapescape + xkb_options caps:escape + } + input type:touchpad { + tap enabled + } + output eDP-1 { + scale 1 + adaptive_sync on } bindsym $mod+Shift+Return exec $term bindsym $mod+Space exec $menu @@ -208,7 +225,7 @@ # Toggle the current focus between tiling and floating mode bindsym $mod+Shift+space floating toggle # Swap focus between the tiling area and the floating area - bindsym $mod+f focus mode_toggle + # bindsym $mod+f focus mode_toggle # Move the currently focused window to the scratchpad bindsym $mod+Shift+minus move scratchpad @@ -231,7 +248,7 @@ } bindsym $mod+Shift+e mode "$mode_system" - exec_always "pkill -f 'python3? .+/swaymonad.py'; ~/.config/sway/swaymonad/swaymonad.py" + exec_always "pkill -f 'python3? .+/swaymonad.py'; swaymonad" bindsym $mod+Return nop promote_window bindsym $mod+j nop focus_next_window @@ -283,12 +300,14 @@ bindsym $mod+r mode "resize" mode "layout" { bindsym t nop set_layout tall + bindsym 2 nop set_layout 2_col bindsym 3 nop set_layout 3_col bindsym n nop set_layout nop bindsym Return mode "default" bindsym Escape mode "default" } +# nop set_layout 2_col bindsym $mod+l mode "layout" mouse_warping container