diff --git a/flake.lock b/flake.lock index 56ef9ea..cee15f2 100644 --- a/flake.lock +++ b/flake.lock @@ -146,11 +146,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -422,11 +422,11 @@ ] }, "locked": { - "lastModified": 1740699498, - "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", + "lastModified": 1741217763, + "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b71edac7a3167026aabea82a54d08b1794088c21", + "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", "type": "github" }, "original": { @@ -512,11 +512,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1732053863, - "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=", + "lastModified": 1741118843, + "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "owner": "oxalica", "repo": "nil", - "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362", + "rev": "577d160da311cc7f5042038456a0713e9863d09e", "type": "github" }, "original": { @@ -535,11 +535,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740690416, - "narHash": "sha256-ZVyJvL/sEkBuxNh1+Y5K3XXzYowIz5UUyOqrzK2rkdc=", + "lastModified": 1741235303, + "narHash": "sha256-IfRYF0rW6L3qK8U3jSBXtRE/l3ahVkn/lAz8xZMIqbU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "18a5c6286802a8ef1109760d61740b6f321c810c", + "rev": "dbbd4c750d8d786e80e12459180369d7d4fb02de", "type": "github" }, "original": { @@ -568,11 +568,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1740683787, - "narHash": "sha256-Q3ZqUR1xVG9MuHxInsLfqytgqCZKICYpWDIz8L11av8=", + "lastModified": 1741001804, + "narHash": "sha256-rMc6olQE1pT8M9wxapgDLLROBgUUX11SmAcPMRSivsA=", "owner": "YaLTeR", "repo": "niri", - "rev": "311f3be5d861bfb12ee8b3d7241bd1d1fcb5110b", + "rev": "26618f8d50dffda41791a211fd2aa02479a6d6a9", "type": "github" }, "original": { @@ -620,32 +620,16 @@ "type": "github" } }, - "nixpkgs-fish": { - "locked": { - "lastModified": 1741006659, - "narHash": "sha256-kL+uKjZYg3ildMMuFzqPyGd6E9nNrV6NwnocHgPcumk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "52eebd2541779e42ae67471622aeb18bbb47991d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "fish", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", + "lastModified": 1740872140, + "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" } }, "nixpkgs-lib_2": { @@ -662,11 +646,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740603184, - "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "lastModified": 1741048562, + "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "type": "github" }, "original": { @@ -694,11 +678,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { @@ -710,11 +694,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { @@ -726,11 +710,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { @@ -765,11 +749,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740520037, - "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", + "lastModified": 1741098523, + "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", + "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "type": "github" }, "original": { @@ -785,11 +769,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1740715395, - "narHash": "sha256-K5RjsCwS60wO9Y999R2q4J1KH/pZcxOGJZmdvucs8v4=", + "lastModified": 1741243386, + "narHash": "sha256-oUxTzcEQ6qyBjQXHGEl5IPAs2JlO9s01nwz+aHs6TL0=", "owner": "nix-community", "repo": "NUR", - "rev": "0ed1a467447a04a60cdc6444de0dedd9adc55952", + "rev": "40f88079a46afdca02bf5116909478690cf2eaea", "type": "github" }, "original": { @@ -854,7 +838,6 @@ "niri": "niri", "nixd": "nixd", "nixpkgs": "nixpkgs_4", - "nixpkgs-fish": "nixpkgs-fish", "nixvim": "nixvim", "nur": "nur", "stylix": "stylix", @@ -869,11 +852,11 @@ ] }, "locked": { - "lastModified": 1731983527, - "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=", + "lastModified": 1741055476, + "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b", + "rev": "aefb7017d710f150970299685e8d8b549d653649", "type": "github" }, "original": { @@ -906,11 +889,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1740644467, - "narHash": "sha256-i2ArXwncE2OmneLBllo5OlpLB2UsXU5JX+T+7or5OX4=", + "lastModified": 1741112087, + "narHash": "sha256-dBGwN4aHmX2QUXolZDhV+p06+WM5ZykL4wd9BD6bT7k=", "owner": "danth", "repo": "stylix", - "rev": "e7c09d206680e6fe6771e1ac9a83515313feaf95", + "rev": "11780517948f214b9f93d1bf5a2d29bc181d3a33", "type": "github" }, "original": { @@ -1163,11 +1146,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "lastModified": 1741140299, + "narHash": "sha256-Y2bPO92Yg5HcH5ORvrVOQb4wRGEapGEteHXGtNvboxk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "rev": "10cb041a80bb815cc1789cfa305923f1f9e3713d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 226587c..62b3c80 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,5 @@ nh.url = "github:viperML/nh"; treefmt-nix.url = "github:numtide/treefmt-nix"; agenix.url = "github:ryantm/agenix"; - nixpkgs-fish.url = "github:NixOS/nixpkgs/fish"; }; } diff --git a/home/programs/browser/firefox.nix b/home/programs/browser/firefox.nix index 1c5f302..9a3460e 100644 --- a/home/programs/browser/firefox.nix +++ b/home/programs/browser/firefox.nix @@ -1,33 +1,34 @@ +{ pkgs, inputs, ... }: let - firefox-gnome-theme = builtins.fetchGit { - url = "https://github.com/rafaelmardojai/firefox-gnome-theme.git"; - rev = "a89108e6272426f4eddd93ba17d0ea101c34fb21"; - }; in +# firefox-gnome-theme = builtins.fetchGit { +# url = "https://github.com/rafaelmardojai/firefox-gnome-theme.git"; +# rev = "a89108e6272426f4eddd93ba17d0ea101c34fb21"; +# }; { programs.firefox = { enable = true; profiles.default = { isDefault = true; - userChrome = '' - @import "${firefox-gnome-theme}/userChrome.css"; - @import "${firefox-gnome-theme}/theme/colors/dark.css"; - /* Hide Tab bar with only one Tab - [110] */ - #tabbrowser-tabs .tabbrowser-tab:only-of-type, - #tabbrowser-tabs - .tabbrowser-tab:only-of-type - + #tabbrowser-arrowscrollbox-periphery { - display: none !important; - } - #tabbrowser-tabs, - #tabbrowser-arrowscrollbox { - min-height: 0 !important; - } - /* #TabsToolbar:not(:hover) */ - #alltabs-button { - display: none !important; - } - ''; + # userChrome = '' + # @import "${firefox-gnome-theme}/userChrome.css"; + # @import "${firefox-gnome-theme}/theme/colors/dark.css"; + # /* Hide Tab bar with only one Tab - [110] */ + # #tabbrowser-tabs .tabbrowser-tab:only-of-type, + # #tabbrowser-tabs + # .tabbrowser-tab:only-of-type + # + #tabbrowser-arrowscrollbox-periphery { + # display: none !important; + # } + # #tabbrowser-tabs, + # #tabbrowser-arrowscrollbox { + # min-height: 0 !important; + # } + # /* #TabsToolbar:not(:hover) */ + # #alltabs-button { + # display: none !important; + # } + # ''; settings = { "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.tabs.drawInTitlebar" = true; diff --git a/home/programs/desktop/scripts/tofi/colorscheme b/home/programs/desktop/scripts/tofi/colorscheme index 4274e5e..3307ab2 100755 --- a/home/programs/desktop/scripts/tofi/colorscheme +++ b/home/programs/desktop/scripts/tofi/colorscheme @@ -23,5 +23,5 @@ fi if [ "$colorscheme" = "default" ]; then colorscheme=".." fi -"$specialisations/$colorscheme"/activate +"$specialisations/$colorscheme"/activate > ~/scripts/tofi/t doas "$os_specialisations/$colorscheme"/bin/switch-to-configuration switch diff --git a/home/programs/shell/fish.nix b/home/programs/shell/fish.nix index 25439e8..297ec58 100644 --- a/home/programs/shell/fish.nix +++ b/home/programs/shell/fish.nix @@ -3,7 +3,6 @@ programs = { fish = { enable = true; - package = inputs.nixpkgs-fish.legacyPackages.${pkgs.system}.fish; shellAbbrs = { nixu = "nh os switch --ask"; homeu = "nh home switch --ask";