misschloe/nix-config
1
0
Fork 0
mirror of https://github.com/harryssecret/homelab-nix.git synced 2025-08-08 06:30:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: mise à jour des dépendances et ajout de nouvelles fonctionnalités dans la configuration Nix

Browse source
This commit is contained in:
kity 2025-04-11 16:37:21 +02:00
parent 5ef6dabdd8
commit 2d26165acc
7 changed files with 367 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

261
flake.lock generated
View file

@ -78,6 +78,46 @@
} }
}, },
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"miovim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
@ -98,7 +138,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": { "flake-parts_4": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
@ -119,7 +159,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_3": { "flake-parts_5": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixvim", "nixvim",
@ -158,6 +198,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakeCompat": { "flakeCompat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -221,7 +279,7 @@
}, },
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_4",
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
"nixpkgs" "nixpkgs"
@ -244,7 +302,7 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgsUnstable"
] ]
}, },
"locked": { "locked": {
@ -262,6 +320,36 @@
} }
}, },
"ixx": { "ixx": {
"inputs": {
"flake-utils": [
"miovim",
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"miovim",
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"ixx_2": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"nixvim", "nixvim",
@ -289,14 +377,34 @@
"type": "github" "type": "github"
} }
}, },
"miovim": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs",
"nixvim": "nixvim"
},
"locked": {
"lastModified": 1741816984,
"narHash": "sha256-veUgTCQ3bCb1/w+4rRdzGxXwUEZKyys/gunMWvWYT4k=",
"ref": "refs/heads/main",
"rev": "bb97adbf0e81cc591c0f67c0b88a476f25a2fe17",
"revCount": 5,
"type": "git",
"url": "https://git.hypervirtual.world/harry123/miovim"
},
"original": {
"type": "git",
"url": "https://git.hypervirtual.world/harry123/miovim"
}
},
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_3",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
@ -332,7 +440,7 @@
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgsUnstable"
] ]
}, },
"locked": { "locked": {
@ -419,20 +527,35 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742206328, "lastModified": 1741310760,
"narHash": "sha256-q+AQ///oMnyyFzzF4H9ShSRENt3Zsx37jTiRkLkXXE0=", "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "096478927c360bc18ea80c8274f013709cf7bdcd", "rev": "de0fe301211c267807afd11b12613f5511ff7433",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1740877520,
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgsSmall": { "nixpkgsSmall": {
"locked": { "locked": {
"lastModified": 1742268799, "lastModified": 1742268799,
@ -466,6 +589,38 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1738797219,
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1da52dd49a127ad74486b135898da2cef8c62665",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1742206328,
"narHash": "sha256-q+AQ///oMnyyFzzF4H9ShSRENt3Zsx37jTiRkLkXXE0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "096478927c360bc18ea80c8274f013709cf7bdcd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1742268799, "lastModified": 1742268799,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
@ -481,7 +636,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1741865919, "lastModified": 1741865919,
"narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
@ -497,7 +652,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1738142207, "lastModified": 1738142207,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
@ -515,12 +670,32 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": {
"lastModified": 1741098523,
"narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"nixvim_2": {
"inputs": {
"flake-parts": "flake-parts_5",
"nixpkgs": [
"nixpkgsUnstable"
],
"nuschtosSearch": "nuschtosSearch_2"
},
"locked": { "locked": {
"lastModified": 1742255305, "lastModified": 1742255305,
"narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=",
@ -539,6 +714,30 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"ixx": "ixx", "ixx": "ixx",
"nixpkgs": [
"miovim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1738508923,
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
"owner": "NuschtOS",
"repo": "search",
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"nuschtosSearch_2": {
"inputs": {
"flake-utils": "flake-utils_2",
"ixx": "ixx_2",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
@ -562,15 +761,16 @@
"inputs": { "inputs": {
"alejandra": "alejandra", "alejandra": "alejandra",
"home-manager": "home-manager", "home-manager": "home-manager",
"miovim": "miovim",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-secrets": "nix-secrets", "nix-secrets": "nix-secrets",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_4",
"nixpkgsSmall": "nixpkgsSmall", "nixpkgsSmall": "nixpkgsSmall",
"nixpkgsUnstable": "nixpkgsUnstable", "nixpkgsUnstable": "nixpkgsUnstable",
"nixvim": "nixvim", "nixvim": "nixvim_2",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"walker": "walker" "walker": "walker"
} }
@ -594,7 +794,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1742239755, "lastModified": 1742239755,
@ -626,6 +826,21 @@
} }
}, },
"systems_2": { "systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -663,8 +878,8 @@
}, },
"walker": { "walker": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_6",
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1740745001, "lastModified": 1740745001,

44
flake.nix
View file

@ -8,7 +8,7 @@
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
home-manager.url = "github:nix-community/home-manager/"; home-manager.url = "github:nix-community/home-manager/";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgsUnstable";
alejandra.url = "github:kamadorueda/alejandra/3.0.0"; alejandra.url = "github:kamadorueda/alejandra/3.0.0";
alejandra.inputs.nixpkgs.follows = "nixpkgs"; alejandra.inputs.nixpkgs.follows = "nixpkgs";
@ -18,8 +18,13 @@
flake = false; flake = false;
}; };
nix-secrets-next = {
url = "git+https://git.hypervirtual.world/harry123/nix-secrets-next.git";
flake = false;
};
miovim = { miovim = {
url = "https://git.hypervirtual.world/harry123/miovim"; url = "git+https://git.hypervirtual.world/harry123/miovim";
}; };
nixos-generators = { nixos-generators = {
@ -28,10 +33,18 @@
}; };
nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin.url = "github:LnL7/nix-darwin";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgsUnstable";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nixvim = {
url = "github:nix-community/nixvim";
# If you are not running an unstable channel of nixpkgs, select the corresponding branch of nixvim.
# url = "github:nix-community/nixvim/nixos-24.11";
inputs.nixpkgs.follows = "nixpkgsUnstable";
};
walker.url = "github:abenz1267/walker"; walker.url = "github:abenz1267/walker";
}; };
@ -136,24 +149,7 @@
format = "proxmox"; format = "proxmox";
}; };
dionysos = nixos-generators.nixosGenerate { # vps for tracking errors
system = "x86_64-linux";
specialArgs = {
diskSize = 20 * 1024;
inherit specialArgs;
};
modules = [
(
{ ... }:
{
nix.registry.nixpkgs.flake = nixpkgs;
}
)
./hosts/dionysos/configuration.nix
];
format = "proxmox";
};
diva = nixos-generators.nixosGenerate { diva = nixos-generators.nixosGenerate {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
@ -170,6 +166,12 @@
darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem { darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem {
modules = [ modules = [
./hosts/dadarwin/configuration.nix ./hosts/dadarwin/configuration.nix
home-manager.darwinModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.harry123 = ./home-manager/home.nix;
}
{ system.configurationRevision = self.rev or self.dirtyRev or null; } { system.configurationRevision = self.rev or self.dirtyRev or null; }
]; ];

109
home-manager/home.nix
View file

@ -32,74 +32,69 @@
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = with pkgs; [ home.packages =
# # Adds the 'hello' command to your environment. It prints a friendly with pkgs;
# # "Hello, world!" when run. [
# pkgs.hello # # Adds the 'hello' command to your environment. It prints a friendly
# # "Hello, world!" when run.
# pkgs.hello
nerd-fonts.code-new-roman nerd-fonts.code-new-roman
ffmpegthumbnailer ffmpegthumbnailer
xfce.tumbler dm-sans
dm-sans zoxide
zoxide btop
btop bitwarden-cli
bitwarden-cli weechat
weechat cava
cava hyfetch
hyfetch kittysay
kittysay nextcloud-client
nextcloud-client thunderbird-bin
thunderbird-bin feh
feh waybar
waybar p7zip
p7zip
libreoffice-qt libreoffice-qt
playerctl playerctl
wf-recorder wf-recorder
file file
osu-lazer-bin osu-lazer-bin
qbittorrent qbittorrent
i2pd i2pd
ripgrep ripgrep
vscode vscode
zathura zathura
tor-browser tor-browser
gammastep gammastep
lazygit lazygit
xfce.thunar gimp-with-plugins
gimp-with-plugins fzf
fzf lf
lf why3
why3 alt-ergo
alt-ergo cvc4
cvc4 z3
z3 prismlauncher
prismlauncher
audacious audacious
audacious-plugins audacious-plugins
udiskie libsixel
unzip
p7zip
libsixel nixfmt-rfc-style
unzip ]
p7zip ++ lib.optionals pkgs.stdenv.isLinux [
kdePackages.dolphin
nixfmt-rfc-style ];
# # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your
# # environment:
# (pkgs.writeShellScriptBin "my-hello" ''
# echo "Hello, ${config.home.username}!"
# '')
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage # Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'. # plain files is through 'home.file'.

62
hosts/dadarwin/configuration.nix
View file

@ -1,31 +1,45 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
# List packages installed in system profile. To search by name, run: nixpkgs.config.allowUnfreePredicate =
# $ nix-env -qaP | grep wget pkg:
environment.systemPackages = with pkgs; builtins.elem (lib.getName pkg) [
[ "terraform"
neovim "beeper"
kitty ];
kittysay # List packages installed in system profile. To search by name, run:
terraform # $ nix-env -qaP | grep wget
]; environment.systemPackages = with pkgs; [
neovim
kitty
kittysay
terraform
nixfmt-rfc-style
beeper
direnv
zoxide
git-crypt
];
programs.direnv.enable = true; programs.direnv = {
# Auto upgrade nix package and the daemon service. enable = true;
services.nix-daemon.enable = true; nix-direnv.enable = true;
# nix.package = pkgs.nix; };
# Necessary for using flakes on this system. # nix.package = pkgs.nix;
nix.settings.experimental-features = "nix-command flakes";
# Create /etc/zshrc that loads the nix-darwin environment. # Necessary for using flakes on this system.
programs.zsh.enable = true; # default shell on catalina nix.settings.experimental-features = "nix-command flakes";
# programs.fish.enable = true;
# Used for backwards compatibility, please read the changelog before changing. # Create /etc/zshrc that loads the nix-darwin environment.
# $ darwin-rebuild changelog programs.zsh = {
system.stateVersion = 5; enable = true; # default shell on catalina
};
# programs.fish.enable = true;
# The platform the configuration will be used on. # Used for backwards compatibility, please read the changelog before changing.
nixpkgs.hostPlatform = "x86_64-darwin"; # $ darwin-rebuild changelog
system.stateVersion = 5;
# The platform the configuration will be used on.
nixpkgs.hostPlatform = "x86_64-darwin";
} }

12
hosts/diva/features/bsky-pds.nix Normal file
View file

@ -0,0 +1,12 @@
{config, ...}:
{
services.pds = {
enable = true;
pdsadmin.enable = true;
environmentFiles = [];
settings = {
"PDS_HOSTNAME" = "pds.rougebordeaux.xyz";
};
};
}

1
hosts/goober/features/software/workstation.nix
View file

@ -10,6 +10,7 @@
"davinci-resolve" "davinci-resolve"
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zathura
# music editing software # music editing software
reaper reaper

3
shared/default.nix
View file

@ -14,6 +14,9 @@
inputs.miovim.packages.${system}.default inputs.miovim.packages.${system}.default
pkgs.curl pkgs.curl
pkgs.unzip pkgs.unzip
pkgs.kitty.terminfo
pkgs.foot.terminfo
pkgs.kittysay
]; ];
environment.variables.EDITOR = "nvim"; environment.variables.EDITOR = "nvim";