Update nix

This commit is contained in:
muon 2025-05-24 09:49:31 +00:00
parent 7597c9eb6c
commit e4451da88d
7 changed files with 28 additions and 37 deletions

18
flake.lock generated
View file

@ -256,11 +256,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747793476, "lastModified": 1747978958,
"narHash": "sha256-2qAOSixSrbb9l6MI+SI4zGineOzDcc2dgOOFK9Dx+IY=", "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2468b2d35512d093aeb04972a1d8c20a0735793f", "rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -297,11 +297,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1747293822, "lastModified": 1747908601,
"narHash": "sha256-1R3Ro+RQCUUnIFZDObP9/2QBLk3xvgbXU67Qii+YZ8s=", "narHash": "sha256-cSzec5IT7Imx9g+Rhpt4GxrLiNF++V+guzYCnWUjhAI=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "ea7eb3a76520fa8d92879afb819756ffc0bc629e", "rev": "798541edff98cfa895941abe35f3e056f319a193",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -515,11 +515,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1747813884, "lastModified": 1748028561,
"narHash": "sha256-XKkGD2a3GAFNjs1z58K4wb7as2gNqFzc11uvgvWwYQs=", "narHash": "sha256-IgtJU6n9vR3nBUdcXrc7K9E+Y/G/4P6hFifGRr1tXMU=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "4830942fa2a475c2be5d45ca1267fa77036bf9a6", "rev": "34b5930894d8315401d93bd8a9a6635e1cd28eff",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -51,7 +51,7 @@
meta = { meta = {
nixpkgs = import inputs.nixpkgs { inherit system; }; nixpkgs = import inputs.nixpkgs { inherit system; };
specialArgs = { inherit nixpkgs inputs system; }; specialArgs = { inherit nixpkgs inputs system sources; };
}; };
# Remote host name # Remote host name

View file

@ -1,4 +1,4 @@
{ pkgs, lib, osConfig, ... }: { pkgs, lib, osConfig, sources, ... }:
let cfg = osConfig.mods; let cfg = osConfig.mods;
in { in {
# Modules # Modules

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, inputs, system, ... }: { config, lib, pkgs, inputs, system, sources, ... }:
let cfg = config.mods; let cfg = config.mods;
in { in {

View file

@ -54,7 +54,7 @@
languages.language-server = { languages.language-server = {
glsl.command = "${pkgs.glsl_analyzer}/bin/glsl_analyzer"; glsl.command = "${pkgs.glsl_analyzer}/bin/glsl_analyzer";
wgsl.command = "${pkgs.wgsl-analyzer}/bin/wgsl_analyzer"; wgsl.command = "${pkgs.wgsl-analyzer}/bin/wgsl-analyzer";
}; };
languages.language = [ languages.language = [

View file

@ -2,14 +2,10 @@
let let
cfg = config.mods.terminal; cfg = config.mods.terminal;
aliases = { aliases = { la = "ls -lah"; };
la = "ls -lah";
};
in { in {
options.mods.terminal = { options.mods.terminal = { zsh.enable = lib.mkEnableOption "enables zsh"; };
zsh.enable = lib.mkEnableOption "enables zsh";
};
config = { config = {
programs.starship.enable = true; programs.starship.enable = true;
@ -29,20 +25,18 @@ in {
path = "${config.xdg.dataHome}/zsh/history"; path = "${config.xdg.dataHome}/zsh/history";
}; };
initExtra = '' initContent = ''
autoload -U compinit autoload -U compinit
setopt no_auto_remove_slash setopt no_auto_remove_slash
''; '';
shellAliases = aliases; shellAliases = aliases;
plugins = with pkgs; [ plugins = with pkgs; [{
{ name = "zsh-vi-mode";
name = "zsh-vi-mode"; src = zsh-vi-mode;
src = zsh-vi-mode; file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh"; }];
}
];
}; };
}; };
} }

View file

@ -1,19 +1,16 @@
{ pkgs, lib, config, inputs, system, ... }: let { pkgs, lib, config, inputs, system, sources, ... }:
cfg = config.mods; let cfg = config.mods;
in { in {
options.mods.home.file = lib.mkOption { options.mods.home.file =
description = "home-manager configuration file"; lib.mkOption { description = "home-manager configuration file"; };
};
config = { config = {
home-manager = { home-manager = {
extraSpecialArgs = { inherit system pkgs inputs; }; extraSpecialArgs = { inherit system pkgs inputs sources; };
users."${cfg.user.name}" = { users."${cfg.user.name}" = {
imports = [ imports =
cfg.home.file [ cfg.home.file inputs.self.outputs.homeManagerModules.default ];
inputs.self.outputs.homeManagerModules.default
];
}; };
backupFileExtension = "bak"; backupFileExtension = "bak";
}; };