diff --git a/Cargo.lock b/Cargo.lock index 86368d2..7bef099 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -689,9 +689,9 @@ dependencies = [ [[package]] name = "niri-ipc" -version = "25.5.1" +version = "26.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc3e165f7854b2f83054a2e8f7024baa49666ad25cdb95b8fb9fd17c48045605" +checksum = "6a4adbddf4037ce047854d36a60b5bf80a7990b8db2f0a0b9ede7534b0bae09a" dependencies = [ "serde", "serde_json", @@ -1028,18 +1028,28 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1048,14 +1058,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", + "serde_core", + "zmij", ] [[package]] @@ -1731,3 +1742,9 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/common.nix b/common.nix index 54e2dcf..5e9b714 100644 --- a/common.nix +++ b/common.nix @@ -14,7 +14,7 @@ with builtins; environment = { systemPackages = with pkgs; [ - nixfmt-rfc-style + nixfmt overskride transmission_4-gtk @@ -22,6 +22,10 @@ with builtins; gnucobol + patchage + musescore + material-maker + intiface-central ausweisapp @@ -36,6 +40,7 @@ with builtins; iw nodejs nautilus + lixPackageSets.latest.colmena cmatrix sl @@ -85,7 +90,7 @@ with builtins; nixpkgs-review nix-eval-jobs nix-fast-build - colmena + # colmena ; }) ]; diff --git a/flake.lock b/flake.lock index e426b5d..3266ecd 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "crane": { "locked": { - "lastModified": 1777689689, - "narHash": "sha256-HGdYOOU4j7w5I/Tlve6z/Q/P9cGHZMhSlALlgfikjsU=", + "lastModified": 1781825982, + "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", "owner": "ipetkov", "repo": "crane", - "rev": "709b316b6ba9424932b33761549e2117bbb3c5ae", + "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1777708550, - "narHash": "sha256-Qif3UXT0l5OQq8H9pRWt4/ia4gF48MWK2oHKL8uVx8U=", + "lastModified": 1781947848, + "narHash": "sha256-IergMRaafR+NBhWxgHuSRfsVKKnB7mSiYAsW728RYJM=", "owner": "nix-community", "repo": "fenix", - "rev": "74c1591efaff494756b8d35ebe357c6c2bbdca96", + "rev": "ab90d0629159f412313b6bde02bdc346bd9c8b3b", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1775176642, - "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", + "lastModified": 1779670703, + "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "179704030c5286c729b5b0522037d1d51341022c", + "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1777678872, - "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -197,11 +197,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1777760447, - "narHash": "sha256-6Tq5I0u85ROgesFWvFUrWsJvPtIn51nsPU+EgXAMl/0=", + "lastModified": 1781906751, + "narHash": "sha256-6Ld1PqmptFtFKblE+SynhRgyBApUWcmrISetWqWHeeo=", "owner": "nix-community", "repo": "home-manager", - "rev": "561bd674646db26ebfccc79b4fbef89f335505db", + "rev": "37f21dfa5d27e71b75bacd9418b156f9265e312e", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1777740049, - "narHash": "sha256-O8rXPZaARIjp4fh20wkeRWeElYbp4Dgp8pKk3Ikkj40=", + "lastModified": 1781918107, + "narHash": "sha256-Fva6sbK1BiMgi9b+F7zDcBDNUeUlavWpO7hGi27xu4A=", "owner": "kaylorben", "repo": "nixcord", - "rev": "853aa014283c1d3e58df7213c36d3a739cab1b6f", + "rev": "d9aad20784cb2fe8142f2e934d29e1c722cc71d6", "type": "github" }, "original": { @@ -303,12 +303,15 @@ } }, "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1776983936, - "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", + "lastModified": 1781622756, + "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", + "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", "type": "github" }, "original": { @@ -318,16 +321,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1780453794, + "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -361,27 +364,27 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1780453794, + "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1781509190, + "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", "type": "github" }, "original": { @@ -392,11 +395,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1777718177, - "narHash": "sha256-qq56SczKpUNKcm8xdOsXYLzaX37p1bLS0fFaCMB7s3Y=", + "lastModified": 1781836206, + "narHash": "sha256-BGjXqZOcLbkjwt8smyUskR8hNl7piTg8ccpQdSTw09s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e59d8bfa2cc42b1e1104595ac4292cfedce7f1a4", + "rev": "d4fea6b6bfce7b55c6df36fb973205b89d7fe761", "type": "github" }, "original": { @@ -407,11 +410,24 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777578337, - "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -420,13 +436,13 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -436,7 +452,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1726937504, "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", @@ -464,11 +480,11 @@ ] }, "locked": { - "lastModified": 1775228139, - "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", + "lastModified": 1780281641, + "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", "owner": "nix-community", "repo": "NUR", - "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", + "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", "type": "github" }, "original": { @@ -484,7 +500,7 @@ "home-manager": "home-manager", "nixcord": "nixcord", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable-small": "nixpkgs-unstable-small", "stylix": "stylix", @@ -494,11 +510,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1777639980, - "narHash": "sha256-6d7Hdurvbjc5uwJuc0YiK7rZBGj6Gs3uzfBFcTs+xCc=", + "lastModified": 1781933682, + "narHash": "sha256-ing9gva28bsg0g0dws5/gir/23NoyCX5wzvrRSQDI2I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "64cdaeb06f69b6b769a492edd88b022ae88e8ca2", + "rev": "501826b6fb2b87d16fb35ffceb3b01f885517320", "type": "github" }, "original": { @@ -546,7 +562,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "systems": "systems", "tinted-kitty": "tinted-kitty", @@ -555,15 +571,15 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1777580129, - "narHash": "sha256-6buSTzDtHYCJP1JNAIZCmgNcOs76oN03j+21CxdijVo=", - "owner": "danth", + "lastModified": 1781018772, + "narHash": "sha256-C+cGIUaC6dqfwTbI+BwCd572PbESGA3WYxR1sLTqxkY=", + "owner": "nix-community", "repo": "stylix", - "rev": "20ff51f523e2dd67e5f31a321719d30708c1b771", + "rev": "a378e4c09031fb15a4d65da88aa628f71fc52f6b", "type": "github" }, "original": { - "owner": "danth", + "owner": "nix-community", "repo": "stylix", "type": "github" } @@ -617,11 +633,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1772661346, - "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", + "lastModified": 1777806186, + "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "owner": "tinted-theming", "repo": "schemes", - "rev": "13b5b0c299982bb361039601e2d72587d6846294", + "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", "type": "github" }, "original": { @@ -633,11 +649,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1772934010, - "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", + "lastModified": 1778379944, + "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", + "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", "type": "github" }, "original": { @@ -649,11 +665,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1772909925, - "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", + "lastModified": 1778378178, + "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", + "rev": "9cd816033ff969415b190722cddf134e78a5665f", "type": "github" }, "original": { @@ -667,7 +683,7 @@ "crane": "crane_2", "fenix": "fenix_2", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-manifest": "rust-manifest", "systems": "systems_2" }, diff --git a/flake.nix b/flake.nix index 1b8f88f..7b48da1 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-25.11"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; - stylix.url = "github:danth/stylix"; + stylix.url = "github:nix-community/stylix"; typst-within.url = "github:schrottkatze/typst"; crane.url = "github:ipetkov/crane"; nixcord.url = "github:kaylorben/nixcord"; @@ -53,7 +53,7 @@ }; in { - formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt; devShells."x86_64-linux".default = pkgs.mkShell { buildInputs = [ rs-toolchain diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index 186c407..d17631b 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -22,7 +22,7 @@ videoEditing = true; }; syncthing.enable = true; - kdeconnect.enable = true; + kdeconnect.enable = false; social.enable = true; gaming.enable = true; }; diff --git a/modules/desktop-legacy/default.nix b/modules/desktop-legacy/default.nix index 17932c5..40f3c63 100644 --- a/modules/desktop-legacy/default.nix +++ b/modules/desktop-legacy/default.nix @@ -42,9 +42,9 @@ with lib; magic-wormhole-rs # filemanager - xfce.thunar - xfce.tumbler - xfce.thunar-archive-plugin + thunar + tumbler + thunar-archive-plugin file-roller # from environment.systemPackages cleanup diff --git a/modules/desktop-legacy/kdeconnect.nix b/modules/desktop-legacy/kdeconnect.nix index cd73159..502e042 100644 --- a/modules/desktop-legacy/kdeconnect.nix +++ b/modules/desktop-legacy/kdeconnect.nix @@ -13,13 +13,13 @@ with lib; enable = mkEnableOption "Enable KDE connect"; }; config = mkIf cfg.enable { - programs.kdeconnect.enable = true; + programs.kdeconnect.enable = false; home-manager.users.jade = { pkgs, ... }: { services.kdeconnect = { - enable = true; - indicator = true; + enable = false; + indicator = false; }; }; }; diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix index acba28b..cfcaac1 100644 --- a/modules/desktop/audio.nix +++ b/modules/desktop/audio.nix @@ -14,6 +14,8 @@ environment.systemPackages = with pkgs; [ playerctl pulsemixer + wiremix crosspipe + lmms ]; } diff --git a/modules/desktop/home/browser.nix b/modules/desktop/home/browser.nix index abe1ca1..f82f557 100644 --- a/modules/desktop/home/browser.nix +++ b/modules/desktop/home/browser.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: { home.file = { ".tridactylrc" = { @@ -15,6 +15,8 @@ pkgs.tridactyl-native ]; }; + + configPath = ".mozilla/firefox"; policies = { DefaultDownloadDirectory = "\${home}/Downloads"; Extensions.Install = map (name: "https://addons.mozilla.org/firefox/downloads/latest/${name}") [ @@ -172,7 +174,7 @@ } ]; icon = "https://lib.rs/favicon.png"; - definedAliases = [ "libs" ]; + definedAliases = [ "rl" ]; }; "gleam packages" = { urls = [ @@ -187,7 +189,7 @@ } ]; icon = "https://packages.gleam.run/static/packages-icon.svg"; - definedAliases = [ "libs" ]; + definedAliases = [ "gl" ]; }; "rust docs" = { urls = [ diff --git a/modules/desktop/home/eww/configDir/bottomBar/bottomBar.yuck b/modules/desktop/home/eww/configDir/bottomBar/bottomBar.yuck index d955d31..ee45f82 100644 --- a/modules/desktop/home/eww/configDir/bottomBar/bottomBar.yuck +++ b/modules/desktop/home/eww/configDir/bottomBar/bottomBar.yuck @@ -24,7 +24,7 @@ ) (box :halign "center" - (traveldings) + ; (traveldings) ) (box :halign "end" @@ -63,15 +63,15 @@ ) ) -(defwidget iceTacho [] - (box - :class "iceTacho" - :tooltip "Tz${iceTachoData.tzn} (BR ${iceTachoData.br})" - (label :text "${iceTachoData.speed} km/h") - ) -) +; (defwidget iceTacho [] +; (box +; :class "iceTacho" +; :tooltip "Tz${iceTachoData.tzn} (BR ${iceTachoData.br})" +; (label :text "${iceTachoData.speed} km/h") +; ) +; ) -(deflisten iceTachoData - :initial "null" - { "~/.config/eww/scripts/iceTacho.nu" } -) +; (deflisten iceTachoData +; :initial "null" +; { "~/.config/eww/scripts/iceTacho.nu" } +; ) diff --git a/modules/desktop/home/eww/default.nix b/modules/desktop/home/eww/default.nix index f7ce3c1..27ee4b3 100644 --- a/modules/desktop/home/eww/default.nix +++ b/modules/desktop/home/eww/default.nix @@ -2,6 +2,12 @@ { programs.eww = { enable = true; - configDir = ./configDir; + yuckConfig = null; + scssConfig = null; + }; + xdg.configFile."eww" = { + source = ./configDir; + recursive = true; + force = true; }; } diff --git a/modules/desktop/home/niri/default.nix b/modules/desktop/home/niri/default.nix index 83655b9..9615afc 100644 --- a/modules/desktop/home/niri/default.nix +++ b/modules/desktop/home/niri/default.nix @@ -14,9 +14,23 @@ |> lib.mapAttrsToList (filename: _value: "include \"${./kdl}/${filename}\""); startups = [ - [ "eww" "open-many" "topBar" "bottomBar" ] - [ "${pkgs.swaybg}/bin/swaybg" "-i" "${./wallpaper.jpg}" "-m" "fill" ] - [ "touch" ".config/niri/live.kdl" ] + [ + "eww" + "open-many" + "topBar" + "bottomBar" + ] + [ + "${pkgs.swaybg}/bin/swaybg" + "-i" + "${./wallpaper.jpg}" + "-m" + "fill" + ] + [ + "touch" + ".config/niri/live.kdl" + ] ] |> map (map (word: "\"${word}\"")) |> map (lib.concatStringsSep " ") @@ -24,7 +38,8 @@ other = [ "include \"live.kdl\"" "output \"eDP-1\" { scale 1.1; }" - "animations { window-open { duration-ms 3000; curve \"linear\"; custom-shader r\"\n${builtins.readFile ./shaders/arc.frag}\";};}" + # conflicts with blur + # "animations { window-open { duration-ms 3000; curve \"linear\"; custom-shader r\"\n${builtins.readFile ./shaders/arc.frag}\";};}" "binds {Mod+Shift+I { spawn \"${./scripts/cpdate.sh}\"; }; }" ]; in diff --git a/modules/desktop/home/niri/kdl/style.kdl b/modules/desktop/home/niri/kdl/style.kdl index 59f658f..449d5a0 100644 --- a/modules/desktop/home/niri/kdl/style.kdl +++ b/modules/desktop/home/niri/kdl/style.kdl @@ -1,3 +1,5 @@ +prefer-no-csd + cursor { xcursor-theme "phinger-cursors-dark" xcursor-size 32 @@ -80,3 +82,35 @@ layer-rule { } baba-is-float true } + +layer-rule { + match namespace="^launcher$" + background-effect { + blur true + xray false + } + opacity 0.8 +} + +window-rule { + match is-floating=true + draw-border-with-background false + background-effect { + blur true + xray false + } + opacity 0.85 +} + +window-rule { + match app-id="cool-retro-term." + open-floating true + opacity 1.0 +} + +blur { + passes 3 + offset 4 + noise 0.05 + saturation 2 +} diff --git a/modules/desktop/home/swayidle.nix b/modules/desktop/home/swayidle.nix index 427023e..ee7b453 100644 --- a/modules/desktop/home/swayidle.nix +++ b/modules/desktop/home/swayidle.nix @@ -4,15 +4,9 @@ services.swayidle = { enable = true; - events = [ - { - event = "before-sleep"; - command = "${pkgs.swaylock}/bin/swaylock -fF -c 442244"; - } - { - event = "lock"; - command = "swaylock -c 441144"; - } - ]; + events = { + "before-sleep" = "${pkgs.swaylock}/bin/swaylock -fF -c 442244"; + "lock" = "swaylock -c 441144"; + }; }; } diff --git a/modules/desktop/themeing.nix b/modules/desktop/themeing.nix index 6264aa4..08721ad 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -27,7 +27,7 @@ }; }; home-manager.users.jade = - { pkgs, ... }: + { config, pkgs, ... }: { stylix.targets = { firefox = { @@ -43,6 +43,7 @@ }; gtk = { enable = true; + # gtk4.theme = config.gtk.theme; cursorTheme = { package = pkgs.phinger-cursors; name = "phinger-cursors"; diff --git a/modules/editors/helix/default.nix b/modules/editors/helix/default.nix index 408fef7..4771a20 100644 --- a/modules/editors/helix/default.nix +++ b/modules/editors/helix/default.nix @@ -126,7 +126,7 @@ "discord-presence-lsp" ]; formatter = { - command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; + command = "${pkgs.nixfmt}/bin/nixfmt"; args = [ "--quiet" ]; }; auto-format = true; diff --git a/modules/hardware/wacom.nix b/modules/hardware/wacom.nix index 62873b3..102a63b 100644 --- a/modules/hardware/wacom.nix +++ b/modules/hardware/wacom.nix @@ -1,13 +1,13 @@ { ... }: { - services.xserver.wacom.enable = true; + services.xserver.wacom.enable = false; home-manager.users.jade = { pkgs, ... }: { home.packages = [ # TODO: figure out if the previous enabled option depends on these anyway - pkgs.libwacom - pkgs.kdePackages.wacomtablet + # pkgs.libwacom + # pkgs.kdePackages.wacomtablet ]; }; } diff --git a/modules/shell/git.nix b/modules/shell/git.nix index fbccfe7..3e86776 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -19,15 +19,6 @@ signByDefault = true; }; }; - programs.jujutsu = { - enable = true; - settings = { - user = { - name = config.programs.git.userName; - email = config.programs.git.userEmail; - }; - }; - }; programs.gitui = { enable = true; keyConfig = '' diff --git a/modules/shell/tty.nix b/modules/shell/tty.nix index 3384e63..dcf37c4 100644 --- a/modules/shell/tty.nix +++ b/modules/shell/tty.nix @@ -27,7 +27,7 @@ in services.kmscon = { enable = true; - extraConfig = "font-size=14"; + # extraConfig = "font-size=14"; extraOptions = generateOptions { xkb-layout = config.services.xserver.xkb.layout; xkb-variant = config.services.xserver.xkb.variant; diff --git a/programs/bar-ws-monitor/Cargo.toml b/programs/bar-ws-monitor/Cargo.toml index 583cc4f..9359951 100644 --- a/programs/bar-ws-monitor/Cargo.toml +++ b/programs/bar-ws-monitor/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" [dependencies] serde = { version = "1.0.209", features = [ "derive" ] } serde_json = "1.0.127" -niri-ipc = "25.5.1" +niri-ipc = "26.4" diff --git a/programs/bar-ws-monitor/src/main.rs b/programs/bar-ws-monitor/src/main.rs index 090ca9b..03240ad 100644 --- a/programs/bar-ws-monitor/src/main.rs +++ b/programs/bar-ws-monitor/src/main.rs @@ -1,5 +1,5 @@ use core::panic; -use std::{collections::HashMap, io::Write}; +use std::collections::HashMap; use niri_ipc::{ socket::Socket, @@ -19,18 +19,14 @@ const COLORS: [[&str; 2]; 7] = [ ["#cc241d", "#fb4934"], // red ]; +const ERR_COLORS: [&str; 2] = ["#ff0000", "#ffff00"]; + +// tildes because they're at the end of the ascii +const BROKEN_NAME: &str = "~~~~~~~"; + fn main() -> Result<(), std::io::Error> { let mut state = EventStreamState::default(); let mut sock = Socket::connect()?; - // let mut func = sock.send(Request::EventStream).and_then(|it| match it { - // (Ok(Response::Handled), func) => Ok(func), - // _ => unreachable!(), - // })?; - // let mut func = sock.send(Request::EventStream).and_then(|it| match it { - // Ok(Response::Handled) => {} - // Ok(_) => panic!("???"), - // Err(e) => panic!("e"), - // }); let r = sock.send(Request::EventStream)?; match r { Ok(Response::Handled) => {} @@ -38,7 +34,7 @@ fn main() -> Result<(), std::io::Error> { } let mut receiver = sock.read_events(); - while let Ok(ev) = receiver() { + 'outer: while let Ok(ev) = receiver() { // check only relevant later, only done here to avoid a clone let ev_is_ws_related = matches!( &ev, @@ -55,21 +51,26 @@ fn main() -> Result<(), std::io::Error> { .workspaces .workspaces .values() - .map(|it| it.clone()) + .cloned() .collect::>(); - workspaces.sort_by(|a, b| a.idx.cmp(&b.idx)); + workspaces.sort_by_key(|a| a.idx); workspaces.sort_by(|a, b| { a.output .clone() - .expect("unreachable") + .unwrap_or_else(|| BROKEN_NAME.to_string()) .to_lowercase() - .cmp(&b.output.clone().expect("unreachable").to_lowercase()) + .cmp( + &b.output + .clone() + .unwrap_or_else(|| BROKEN_NAME.to_string()) + .to_lowercase(), + ) }); let output_colors_lut = workspaces .iter() - .map(|it| it.output.clone().expect("unreachable")) + .map(|it| it.output.clone().unwrap_or_else(|| BROKEN_NAME.to_string())) .fold(Vec::new(), |mut acc, it| { if !acc.contains(&it) { acc.push(it); @@ -92,15 +93,16 @@ fn main() -> Result<(), std::io::Error> { name, .. }| WsData { - color: output_colors_lut[&output.clone().expect("unreachable")] - [if *is_active { 1 } else { 0 }], + color: output + .as_ref() + .map(|output| output_colors_lut[output]) + .unwrap_or(&ERR_COLORS)[if *is_active { 1 } else { 0 }], idx: *idx, focused: *is_focused, active: *is_active, icon: name.as_ref().map(|name| match name.as_str() { - "aaa social" => "󰭹", - "bbb browser" => "󰈹", - "ccc notes" => "󰎚", + "social" => "󰭹", + "browser" => "󰈹", &_ => "!", }), },