mirror of
https://codeberg.org/muon/home.git
synced 2025-12-05 23:57:46 +00:00
Update nix
This commit is contained in:
parent
7597c9eb6c
commit
e4451da88d
7 changed files with 28 additions and 37 deletions
18
flake.lock
generated
18
flake.lock
generated
|
|
@ -256,11 +256,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747793476,
|
||||
"narHash": "sha256-2qAOSixSrbb9l6MI+SI4zGineOzDcc2dgOOFK9Dx+IY=",
|
||||
"lastModified": 1747978958,
|
||||
"narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2468b2d35512d093aeb04972a1d8c20a0735793f",
|
||||
"rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -297,11 +297,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747293822,
|
||||
"narHash": "sha256-1R3Ro+RQCUUnIFZDObP9/2QBLk3xvgbXU67Qii+YZ8s=",
|
||||
"lastModified": 1747908601,
|
||||
"narHash": "sha256-cSzec5IT7Imx9g+Rhpt4GxrLiNF++V+guzYCnWUjhAI=",
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"rev": "ea7eb3a76520fa8d92879afb819756ffc0bc629e",
|
||||
"rev": "798541edff98cfa895941abe35f3e056f319a193",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -515,11 +515,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747813884,
|
||||
"narHash": "sha256-XKkGD2a3GAFNjs1z58K4wb7as2gNqFzc11uvgvWwYQs=",
|
||||
"lastModified": 1748028561,
|
||||
"narHash": "sha256-IgtJU6n9vR3nBUdcXrc7K9E+Y/G/4P6hFifGRr1tXMU=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "4830942fa2a475c2be5d45ca1267fa77036bf9a6",
|
||||
"rev": "34b5930894d8315401d93bd8a9a6635e1cd28eff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
meta = {
|
||||
nixpkgs = import inputs.nixpkgs { inherit system; };
|
||||
|
||||
specialArgs = { inherit nixpkgs inputs system; };
|
||||
specialArgs = { inherit nixpkgs inputs system sources; };
|
||||
};
|
||||
|
||||
# Remote host name
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, osConfig, ... }:
|
||||
{ pkgs, lib, osConfig, sources, ... }:
|
||||
let cfg = osConfig.mods;
|
||||
in {
|
||||
# Modules
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, inputs, system, ... }:
|
||||
{ config, lib, pkgs, inputs, system, sources, ... }:
|
||||
let cfg = config.mods;
|
||||
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
|
||||
languages.language-server = {
|
||||
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 = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,10 @@
|
|||
let
|
||||
cfg = config.mods.terminal;
|
||||
|
||||
aliases = {
|
||||
la = "ls -lah";
|
||||
};
|
||||
aliases = { la = "ls -lah"; };
|
||||
|
||||
in {
|
||||
options.mods.terminal = {
|
||||
zsh.enable = lib.mkEnableOption "enables zsh";
|
||||
};
|
||||
options.mods.terminal = { zsh.enable = lib.mkEnableOption "enables zsh"; };
|
||||
|
||||
config = {
|
||||
programs.starship.enable = true;
|
||||
|
|
@ -29,20 +25,18 @@ in {
|
|||
path = "${config.xdg.dataHome}/zsh/history";
|
||||
};
|
||||
|
||||
initExtra = ''
|
||||
initContent = ''
|
||||
autoload -U compinit
|
||||
setopt no_auto_remove_slash
|
||||
'';
|
||||
|
||||
shellAliases = aliases;
|
||||
|
||||
plugins = with pkgs; [
|
||||
{
|
||||
name = "zsh-vi-mode";
|
||||
src = zsh-vi-mode;
|
||||
file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
|
||||
}
|
||||
];
|
||||
plugins = with pkgs; [{
|
||||
name = "zsh-vi-mode";
|
||||
src = zsh-vi-mode;
|
||||
file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
|
||||
}];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,16 @@
|
|||
{ pkgs, lib, config, inputs, system, ... }: let
|
||||
cfg = config.mods;
|
||||
{ pkgs, lib, config, inputs, system, sources, ... }:
|
||||
let cfg = config.mods;
|
||||
|
||||
in {
|
||||
options.mods.home.file = lib.mkOption {
|
||||
description = "home-manager configuration file";
|
||||
};
|
||||
options.mods.home.file =
|
||||
lib.mkOption { description = "home-manager configuration file"; };
|
||||
|
||||
config = {
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit system pkgs inputs; };
|
||||
extraSpecialArgs = { inherit system pkgs inputs sources; };
|
||||
users."${cfg.user.name}" = {
|
||||
imports = [
|
||||
cfg.home.file
|
||||
inputs.self.outputs.homeManagerModules.default
|
||||
];
|
||||
imports =
|
||||
[ cfg.home.file inputs.self.outputs.homeManagerModules.default ];
|
||||
};
|
||||
backupFileExtension = "bak";
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue