diff --git a/flake.lock b/flake.lock index c49dbd86..d82476b4 100644 --- a/flake.lock +++ b/flake.lock @@ -322,17 +322,17 @@ "base16-fish_2": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -355,11 +355,11 @@ "base16-helix_2": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -407,11 +407,11 @@ "fromYaml": "fromYaml_2" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -856,11 +856,11 @@ "firefox-gnome-theme_2": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -1070,11 +1070,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -1735,18 +1735,20 @@ "gnome-shell_2": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.1", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "guihua": { @@ -1853,16 +1855,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1767280655, + "narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "d49d2543f02dbd789ed032188c84570d929223cb", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -2955,16 +2957,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767051569, - "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "lastModified": 1767325753, + "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -3322,15 +3324,14 @@ "nixpkgs": [ "stylix-stable", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_3" + ] }, "locked": { - "lastModified": 1751320053, - "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -3876,16 +3877,16 @@ "tinted-zed": "tinted-zed_2" }, "locked": { - "lastModified": 1764695877, - "narHash": "sha256-lof6DgmEhRVt++kJPyJYdXBpwuz5clDzb773U8BIwC8=", + "lastModified": 1766603740, + "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", "owner": "nix-community", "repo": "stylix", - "rev": "3756d1d62dbe7f9497d9fbb3d1a49c4e8676185a", + "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -4380,11 +4381,11 @@ "tinted-schemes_2": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -4412,11 +4413,11 @@ "tinted-tmux_2": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -4444,11 +4445,11 @@ "tinted-zed_2": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -4601,28 +4602,6 @@ "type": "github" } }, - "treefmt-nix_3": { - "inputs": { - "nixpkgs": [ - "stylix-stable", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "typr": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 5a89201a..5bde2cb9 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; flake-utils.url = "github:numtide/flake-utils"; disko = { url = "github:nix-community/disko/latest"; @@ -18,11 +18,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix-stable = { - url = "github:nix-community/stylix/release-25.05"; + url = "github:nix-community/stylix/release-25.11"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; home-manager-stable = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; nix-darwin = { diff --git a/home/programs/fish.nix b/home/programs/fish.nix index 0f41efb9..3cb8d511 100644 --- a/home/programs/fish.nix +++ b/home/programs/fish.nix @@ -4,8 +4,8 @@ device, config, ... -}: { - stylix.targets.fish.enable = false; +}: +{ programs.fish = { enable = true; shellAbbrs = { @@ -41,3 +41,6 @@ ''; }; } +// lib.optionalAttrs (!(device.is "tsuba")) { + stylix.targets.fish.enable = false; +} diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index 453c9042..5efdfe65 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -4,8 +4,8 @@ stablePkgs, lib, ... -}: { - stylix.targets.nixvim.enable = false; +}: +{ programs = lib.optionalAttrs (device.is "ryu" || device.is "kuro" || device.is "mirai" || device.is "tako" || device.is "shiro") { nixvim = { @@ -19,3 +19,6 @@ // (import ./../../neovim {inherit pkgs stablePkgs;}); }; } +// lib.optionalAttrs (!(device.is "tsuba")) { + stylix.targets.nixvim.enable = false; +} diff --git a/home/programs/starship.nix b/home/programs/starship.nix index 61ff3e8e..a04c7df6 100644 --- a/home/programs/starship.nix +++ b/home/programs/starship.nix @@ -3,8 +3,8 @@ lib, device, ... -}: { - stylix.targets.starship.enable = false; +}: +{ programs.starship = { enable = true; enableFishIntegration = true; @@ -30,3 +30,6 @@ (pkgs.catppuccinThemes.starship + /palettes/${flavour}.toml)); }; } +// lib.optionalAttrs (!(device.is "tsuba")) { + stylix.targets.starship.enable = false; +} diff --git a/home/services/remmina.nix b/home/services/remmina.nix index d8a566d9..f779d94b 100644 --- a/home/services/remmina.nix +++ b/home/services/remmina.nix @@ -1,6 +1,6 @@ -{...}: { +{device, ...}: { services.remmina = { - enable = true; + enable = device.is "ryu"; systemdService.enable = true; addRdpMimeTypeAssoc = true; }; diff --git a/nixos/tsuba/default.nix b/nixos/tsuba/default.nix index 577d1b84..f2ff6487 100644 --- a/nixos/tsuba/default.nix +++ b/nixos/tsuba/default.nix @@ -21,7 +21,7 @@ inputs.arion.nixosModules.arion inputs.disko.nixosModules.disko inputs.sops-nix.nixosModules.sops - inputs.stylix-stable.nixosModules.stylix + # inputs.stylix-stable.nixosModules.stylix inputs.nix-minecraft.nixosModules.minecraft-servers nur.modules.nixos.default home-manager-stable.nixosModules.home-manager @@ -53,7 +53,7 @@ ./disk-config.nix ./${name}.nix ../../sops.nix - ../../stylix.nix + # ../../stylix.nix ]; } )