From 602f599823dd907329663641173236a67c646c0f Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Fri, 9 Jan 2026 14:07:12 +0800 Subject: [PATCH] chore: update flake.lock * updated noctalia-shell to v3.8.2 * removed television fish integration workaround * removed `~/.config/fish/fish_variables` entry in my.persist.homeFiles since [fish v4.3.0](https://github.com/fish-shell/fish-shell/releases/tag/4.3.0) no longer sets universal variables by default --- flake.lock | 239 ++++++++++++++++------------ flake.nix | 2 +- flake/hosts.nix | 1 - modules/cli/misc.nix | 8 +- modules/cli/shell/fish.nix | 3 - modules/desktop/style/default.nix | 2 +- modules/desktop/wm/niri/default.nix | 1 + 7 files changed, 144 insertions(+), 112 deletions(-) diff --git a/flake.lock b/flake.lock index d074107..b8eaa10 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1767016572, - "narHash": "sha256-cNxFSV35r03uHDMU/MBxq9A05R63GYcCCfkHls/853g=", + "lastModified": 1767687773, + "narHash": "sha256-feYsP0YcieYW7boIUgdO947aVbdwZkd6p7D3xoglSlg=", "owner": "linyinfeng", "repo": "angrr", - "rev": "3c4776f7ff9c3c424bfb8a28940bd3102262344e", + "rev": "adb63e8776c48fa6e72d17982d3be9835ce1bd04", "type": "github" }, "original": { @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1765990358, - "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=", + "lastModified": 1767750947, + "narHash": "sha256-zqe9esphlAFu19TGL/nAyOHyOiR+Vu8M2IWWLg9cm4U=", "owner": "catppuccin", "repo": "nix", - "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161", + "rev": "e7135074fe2a3d17bee3c229b5a7d3da26f76ce8", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1767163745, - "narHash": "sha256-sJXyT3AeB3rHPuK93VjnVI16hoLJazieFq7LP62cTHw=", + "lastModified": 1767854969, + "narHash": "sha256-kJQ920Ymo4rrgFlSdNw/ZYpdd1uWL5Ik1VKpZaKsQ0c=", "owner": "nix-community", "repo": "fenix", - "rev": "33e17a88166bba14f4017b3ee6cafe5b3376aef0", + "rev": "1ad578f9643053f87843215b1786fd8e66ddb384", "type": "github" }, "original": { @@ -209,11 +209,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1766929376, - "narHash": "sha256-Eyg78VjLzKNG2XkqLqylSvHGAwsP8gsvmUHtZxQwPq4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "236f248441a986331cda53b039e7f9fd96e03635", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -298,11 +298,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -359,11 +359,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -475,11 +475,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -544,11 +544,11 @@ ] }, "locked": { - "lastModified": 1767104570, - "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", + "lastModified": 1767930051, + "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", + "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb", "type": "github" }, "original": { @@ -559,6 +559,27 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "impermanence", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "zen", @@ -566,11 +587,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -580,12 +601,16 @@ } }, "impermanence": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1767822991, + "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5", "type": "github" }, "original": { @@ -675,17 +700,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767166320, - "narHash": "sha256-JhE7GgwcKCtkBmP4Gk7r27QmrlCV4As4Dq+fHESW+Ds=", + "lastModified": 1767936122, + "narHash": "sha256-GSHlkIV/X8oOS15fCwdH1v1HhnYDY/beK9SCgAR0loA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "947c5bc805ec346a305e00faa8cfe476b8a9c679", + "rev": "28e3e179cb997a26ffa30238f9ac700744b03a65", "type": "github" }, "original": { @@ -714,11 +739,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1767160009, - "narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=", + "lastModified": 1767792726, + "narHash": "sha256-qS4tdG2iUQwSld9dTH1gk8GcIOrRi9umMgPv8MGDIA0=", "owner": "YaLTeR", "repo": "niri", - "rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3", + "rev": "10df9f4717cbd4efd20ae796eb6b0aa400127bdc", "type": "github" }, "original": { @@ -772,11 +797,11 @@ ] }, "locked": { - "lastModified": 1766784396, - "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=", + "lastModified": 1767028240, + "narHash": "sha256-0/fLUqwJ4Z774muguUyn5t8AQ6wyxlNbHexpje+5hRo=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55", + "rev": "c31afa6e76da9bbc7c9295e39c7de9fca1071ea1", "type": "github" }, "original": { @@ -858,11 +883,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1767182031, - "narHash": "sha256-79bV6wbOEfCZ8KsYrm75gq5njjG7PvJdxoIbSWKOdJg=", + "lastModified": 1767938586, + "narHash": "sha256-+MHdvrukFATrhrUXbdHL2z2O8fy4xtBnOpWqXcibLIo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a9542aaa5e82d21d37ae3e2d904454c42800b35", + "rev": "e6061425a03f407fa17cecabb028247422ac23aa", "type": "github" }, "original": { @@ -874,11 +899,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767047869, - "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", + "lastModified": 1767799921, + "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", + "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "type": "github" }, "original": { @@ -890,11 +915,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1767181686, - "narHash": "sha256-R/0xncyuqJGeib2w+cbuCIpKmmtDlHQG0tRh0EpGuyc=", + "lastModified": 1767938226, + "narHash": "sha256-aEVqawL6l/AXrosfpsUIn5xfgQ8cUnBB/k+F3MLbvOI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c730b6fd39ebd8e88191aea2ae37901a01f1078f", + "rev": "e247353b700eed6b3c43d397da6b16533860ecc6", "type": "github" }, "original": { @@ -906,11 +931,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -954,11 +979,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -975,16 +1016,16 @@ ] }, "locked": { - "lastModified": 1767047420, - "narHash": "sha256-Bh4XcEyG6XRQugahL/2Vd42k/YeGK0f+yW3+Oc74Rp4=", + "lastModified": 1767472363, + "narHash": "sha256-ZjtdQbVPHJeWP8VHWZmSwPwD6fC7Dqmknx1KErzfDks=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "558433f9e9cc1fd75ab742b0f6fecd1c3474abc0", + "rev": "646a6142b2cad304f4ab8e9fe21d52a6971940cd", "type": "github" }, "original": { "owner": "noctalia-dev", - "ref": "v3.8.0", + "ref": "v3.8.2", "repo": "noctalia-shell", "type": "github" } @@ -1001,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -1063,11 +1104,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1767092832, - "narHash": "sha256-cZFPNglcpjQuA9MXejYELyrIvPm67jR5CZ8Sq2o5P0w=", + "lastModified": 1767830331, + "narHash": "sha256-9XF16XbXvXK3UOLFZpKnFOvvQrxD8J4Lbn+brzL1rG0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2b4263b042d9bdee370e027e4b0ea0f6101709d0", + "rev": "54f5eea26321c33a4a4acc826b9a393cb874f85d", "type": "github" }, "original": { @@ -1084,11 +1125,11 @@ ] }, "locked": { - "lastModified": 1766896955, - "narHash": "sha256-BbAUnNjaBmfR7Mvho9BN0RfvDi5fpP19wd/Hs6DMX8k=", + "lastModified": 1767848616, + "narHash": "sha256-rAVR2ucz5vn9TOjvj5hVyEl0MnXrwIJo3ee12+p0EZE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "861c32b27cce26c4bb828dfd21bd23df0dba7df2", + "rev": "994c9f014e5ce073de4bca7ebe21cf1cf90f2b0a", "type": "github" }, "original": { @@ -1119,11 +1160,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766603026, - "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", + "lastModified": 1767903301, + "narHash": "sha256-h7HUP2xjbwjXb+DvAxIH6R9G1RdGCAQao8zCw3jj+yY=", "owner": "danth", "repo": "stylix", - "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", + "rev": "2b727da436910c4a59b5fd2401609bd5cb7ec64a", "type": "github" }, "original": { @@ -1198,11 +1239,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -1214,11 +1255,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1230,11 +1271,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -1250,11 +1291,11 @@ ] }, "locked": { - "lastModified": 1767122417, - "narHash": "sha256-yOt/FTB7oSEKQH9EZMFMeuldK1HGpQs2eAzdS9hNS/o=", + "lastModified": 1767801790, + "narHash": "sha256-QfX6g3Wj2vQe7oBJEbTf0npvC6sJoDbF9hb2+gM5tf8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "dec15f37015ac2e774c84d0952d57fcdf169b54d", + "rev": "778a1d691f1ef45dd68c661715c5bf8cbf131c80", "type": "github" }, "original": { @@ -1271,11 +1312,11 @@ ] }, "locked": { - "lastModified": 1766000401, - "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", + "lastModified": 1767468822, + "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", + "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc", "type": "github" }, "original": { @@ -1304,11 +1345,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1766429945, - "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", + "lastModified": 1767932953, + "narHash": "sha256-V8+DrPOp940J6icERAaGuDQTKyEyZzFuRw363XwDKXg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", + "rev": "bc47ef59501556fc2584155ddef76493752dd727", "type": "github" }, "original": { @@ -1319,17 +1360,17 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1767119591, - "narHash": "sha256-4LqJZvu+8i0cTtwz+N3nfIvVf6Ra4xIGw0UxOOHVKAc=", + "lastModified": 1767763594, + "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "379639ecac155c03975cd6608a146bb1dc168cf9", + "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 70f82d2..fad692f 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ }; niri.url = "github:sodiboo/niri-flake"; noctalia = { - url = "github:noctalia-dev/noctalia-shell/v3.8.0"; + url = "github:noctalia-dev/noctalia-shell/v3.8.2"; inputs.nixpkgs.follows = "nixpkgs"; }; zen.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/flake/hosts.nix b/flake/hosts.nix index a02e2ef..f9b4232 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -16,7 +16,6 @@ let home-manager = { sharedModules = [ inputs.sops-nix.homeManagerModules.sops - inputs.impermanence.nixosModules.home-manager.impermanence inputs.stylix.homeModules.stylix inputs.noctalia.homeModules.default inputs.zen.homeModules.beta diff --git a/modules/cli/misc.nix b/modules/cli/misc.nix index 13ddcb3..9a1d60b 100644 --- a/modules/cli/misc.nix +++ b/modules/cli/misc.nix @@ -95,14 +95,8 @@ in programs.television = { enable = true; enableZshIntegration = true; - enableFishIntegration = builtins.warn '' - Television shell integration disabled in favor of [issue](https://github.com/nix-community/home-manager/issues/8400)! - Enable it when the issue is resolved. - '' false; + enableFishIntegration = true; }; - programs.fish.interactiveShellInit = '' - ${lib.getExe config.my.hm.programs.television.package} init fish | source - ''; programs.zoxide = { enable = true; enableZshIntegration = true; diff --git a/modules/cli/shell/fish.nix b/modules/cli/shell/fish.nix index 13dd6e4..e325687 100644 --- a/modules/cli/shell/fish.nix +++ b/modules/cli/shell/fish.nix @@ -21,9 +21,6 @@ in homeDirs = [ ".local/share/fish" ]; - homeFiles = [ - ".config/fish/fish_variables" - ]; }; my.hm = { xdg.configFile."fish/themes/tokyonight_storm.theme".source = builtins.fetchurl { diff --git a/modules/desktop/style/default.nix b/modules/desktop/style/default.nix index 3277bf4..f6f05be 100644 --- a/modules/desktop/style/default.nix +++ b/modules/desktop/style/default.nix @@ -37,7 +37,7 @@ in name = "Bibata-Modern-Classic"; size = 24; }; - iconTheme = { + icons = { enable = true; package = pkgs.papirus-icon-theme; dark = "Papirus-Dark"; diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix index 59c7883..5b02d0c 100644 --- a/modules/desktop/wm/niri/default.nix +++ b/modules/desktop/wm/niri/default.nix @@ -70,6 +70,7 @@ in programs.noctalia-shell = { enable = true; + systemd.enable = true; # modified from official Tokyo-Night theme colors = { mError = "#f7768e";