This repository was archived by the owner on Jul 6, 2024. It is now read-only.
Commit 82442a2 1 parent 0e06f42 commit 82442a2 Copy full SHA for 82442a2
File tree 8 files changed +19
-18
lines changed
8 files changed +19
-18
lines changed Original file line number Diff line number Diff line change 3
3
4
4
inputs = {
5
5
# Nixpkgs and unstable
6
- nixpkgs . url = "github:nixos/nixpkgs/nixos-23.11 " ;
6
+ nixpkgs . url = "github:nixos/nixpkgs/nixos-24.05 " ;
7
7
nixpkgs-unstable . url = "github:nixos/nixpkgs/nixpkgs-unstable" ;
8
8
9
9
# Home manager
10
10
home-manager = {
11
- url = "github:nix-community/home-manager/release-23.11 " ;
11
+ url = "github:nix-community/home-manager/release-24.05 " ;
12
12
inputs . nixpkgs . follows = "nixpkgs" ;
13
13
} ;
14
14
26
26
27
27
# NixVim
28
28
nixvim = {
29
- url = "github:nix-community/nixvim/nixos-23.11 " ;
29
+ url = "github:nix-community/nixvim/nixos-24.05 " ;
30
30
inputs . nixpkgs . follows = "nixpkgs" ;
31
31
} ;
32
32
Original file line number Diff line number Diff line change 13
13
home . packages = with pkgs ; [
14
14
cue
15
15
nixd
16
- nixfmt
16
+ nixfmt-rfc-style
17
17
nodePackages . prettier
18
18
pre-commit
19
19
shellcheck
Original file line number Diff line number Diff line change 83
83
} ;
84
84
} ;
85
85
} ;
86
-
87
- # TODO: Remove tihs jank when home-manager 24.05 becomes stable
88
- xdg . configFile . "k9s/aliases.yaml" . source = config . lib . file . mkOutOfStoreSymlink "${ config . xdg . configHome } /k9s/aliases.yml" ;
89
- xdg . configFile . "k9s/config.yaml" . source = config . lib . file . mkOutOfStoreSymlink "${ config . xdg . configHome } /k9s/config.yml" ;
90
86
} )
91
87
] ;
92
88
}
Original file line number Diff line number Diff line change 6
6
} :
7
7
let
8
8
cfg = config . modules . kubernetes ;
9
- package = pkgs . unstable . kubecm . overrideAttrs ( _ : prev : {
10
- meta = prev . meta // {
11
- mainProgram = "kubecm" ;
12
- } ;
13
- } ) ;
9
+ package = pkgs . unstable . kubecm ;
14
10
in
15
11
{
16
12
config = lib . mkMerge [
Original file line number Diff line number Diff line change 7
7
extraOptions = [
8
8
"--group"
9
9
] ;
10
- enableAliases = true ;
10
+ enableBashIntegration = true ;
11
+ enableFishIntegration = true ;
11
12
} ;
12
13
} ;
13
14
}
Original file line number Diff line number Diff line change 10
10
tomlFormat = pkgs . formats . toml { } ;
11
11
in
12
12
{
13
- # TODO: Replace with official home manager module once available
14
13
options . modules . shell . mise = {
15
14
enable = lib . mkEnableOption "mise" ;
16
15
package = lib . mkPackageOption pkgs "mise" { } ;
16
+ globalConfig = lib . mkOption {
17
+ inherit ( tomlFormat ) type ;
18
+ default = { } ;
19
+ } ;
17
20
settings = lib . mkOption {
18
21
inherit ( tomlFormat ) type ;
19
22
default = { } ;
27
30
] ;
28
31
29
32
xdg . configFile = {
30
- "mise/settings.toml" = {
33
+ "mise/config.toml" = lib . mkIf ( cfg . globalConfig != { } ) {
34
+ source = tomlFormat . generate "mise-config" cfg . globalConfig ;
35
+ } ;
36
+ "mise/settings.toml" = lib . mkIf ( cfg . settings != { } ) {
31
37
source = tomlFormat . generate "mise-settings" (
32
38
{
33
39
experimental = true ;
Original file line number Diff line number Diff line change 3
3
colorschemes = {
4
4
catppuccin = {
5
5
enable = true ;
6
- flavour = "macchiato" ;
6
+ settings = {
7
+ flavour = "macchiato" ;
8
+ } ;
7
9
} ;
8
10
} ;
9
11
} ;
Original file line number Diff line number Diff line change 1
1
_ :
2
2
{
3
3
config = {
4
- options = {
4
+ opts = {
5
5
updatetime = 100 ; # Faster completion
6
6
swapfile = false ; # Disable the swap file
7
7
You can’t perform that action at this time.
0 commit comments