mirror of
https://github.com/davegallant/nix-config
synced 2026-03-03 12:46:34 +00:00
Compare commits
3 Commits
1990bbd1f3
...
277e4f22fe
| Author | SHA1 | Date | |
|---|---|---|---|
| 277e4f22fe | |||
| aa1a4c8a6c | |||
| c281e3f018 |
18
flake.lock
generated
18
flake.lock
generated
@@ -298,11 +298,11 @@
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1771070549,
|
||||
"narHash": "sha256-0HH+emUwcOInkv+nJDyn6KHK9uQZX6EqV8MPi1ZGGKA=",
|
||||
"lastModified": 1771205900,
|
||||
"narHash": "sha256-GDTqgUN8pI8lE55wTdaFOS+xwwOOz/w055SbCLLFTqA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0b2bde6434ccd6aa05d91303e32fd9310656f44d",
|
||||
"rev": "805ba342d424b11deabad6e1597372a3cfb39a59",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -376,11 +376,11 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1770770419,
|
||||
"narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
|
||||
"lastModified": 1771043024,
|
||||
"narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
|
||||
"rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -516,11 +516,11 @@
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771071306,
|
||||
"narHash": "sha256-TH06o9U97ZvuoZSHTCIFXYCs3T8aebOz8D5CCwH+BcI=",
|
||||
"lastModified": 1771073386,
|
||||
"narHash": "sha256-mS31U0EK9ARlSeN42N/u/92b9RdyTB4Q/47xJmfyXlQ=",
|
||||
"owner": "davegallant",
|
||||
"repo": "vpngate",
|
||||
"rev": "9892ebe864028919f9ef4b3be60e556ac0cb590a",
|
||||
"rev": "323709b0a17f1cea4af9d1c0b8640a3e5aefed27",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
27
flake.nix
27
flake.nix
@@ -55,10 +55,12 @@
|
||||
{
|
||||
hephaestus = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit unstable;
|
||||
inherit master;
|
||||
inherit vpngate;
|
||||
inherit inputs;
|
||||
inherit
|
||||
unstable
|
||||
master
|
||||
vpngate
|
||||
inputs
|
||||
;
|
||||
};
|
||||
modules = [
|
||||
./hosts/hephaestus.nix
|
||||
@@ -90,6 +92,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [ (import ./overlays) ];
|
||||
|
||||
home-manager = {
|
||||
@@ -99,10 +102,7 @@
|
||||
./home.nix
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
];
|
||||
extraSpecialArgs = {
|
||||
inherit unstable;
|
||||
inherit master;
|
||||
};
|
||||
extraSpecialArgs = { inherit unstable master; };
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -126,10 +126,7 @@
|
||||
{
|
||||
zelus = darwin.lib.darwinSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit unstable;
|
||||
inherit master;
|
||||
};
|
||||
specialArgs = { inherit unstable master; };
|
||||
|
||||
modules = [
|
||||
home-manager.darwinModules.home-manager
|
||||
@@ -139,6 +136,7 @@
|
||||
{ ... }:
|
||||
{
|
||||
config = {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [ (import ./overlays) ];
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
@@ -147,10 +145,7 @@
|
||||
./home.nix
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
];
|
||||
extraSpecialArgs = {
|
||||
inherit unstable;
|
||||
inherit master;
|
||||
};
|
||||
extraSpecialArgs = { inherit unstable master; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -64,20 +64,34 @@
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# desktop apps
|
||||
bitwarden-desktop
|
||||
bleachbit
|
||||
calibre
|
||||
clamtk
|
||||
cryptsetup
|
||||
dbeaver-bin
|
||||
discord
|
||||
freefilesync
|
||||
gimp-with-plugins
|
||||
google-chrome
|
||||
hardinfo2
|
||||
httpie-desktop
|
||||
onlyoffice-desktopeditors
|
||||
pika-backup
|
||||
pinta
|
||||
qbittorrent
|
||||
unstable.obsidian
|
||||
unstable.podman-desktop
|
||||
unstable.signal-desktop-bin
|
||||
unstable.zoom-us
|
||||
|
||||
# gaming
|
||||
heroic
|
||||
iputils
|
||||
ludusavi
|
||||
lutris
|
||||
mupen64plus
|
||||
protonup-qt
|
||||
unstable.mcpelauncher-ui-qt
|
||||
unstable.ryubing
|
||||
wine
|
||||
|
||||
# kde
|
||||
kdePackages.bluedevil
|
||||
kdePackages.kcalc
|
||||
kdePackages.kcharselect
|
||||
@@ -86,42 +100,44 @@
|
||||
kdePackages.ksystemlog
|
||||
kdePackages.partitionmanager
|
||||
kdePackages.sddm-kcm
|
||||
|
||||
# media
|
||||
calibre
|
||||
libation
|
||||
ludusavi
|
||||
lutris
|
||||
mupen64plus
|
||||
unstable.spotify
|
||||
vlc
|
||||
|
||||
# networking
|
||||
iputils
|
||||
traceroute
|
||||
unstable.ktailctl
|
||||
unstable.tailscale
|
||||
vpngate.packages.x86_64-linux.default
|
||||
whois
|
||||
|
||||
# security
|
||||
bleachbit
|
||||
clamtk
|
||||
cryptsetup
|
||||
opensnitch-ui
|
||||
pinentry-curses
|
||||
|
||||
# system utilities
|
||||
hardinfo2
|
||||
nfs-utils
|
||||
pciutils
|
||||
qemu
|
||||
unrar
|
||||
unstable.beszel
|
||||
usbutils
|
||||
virt-manager
|
||||
wayland-utils
|
||||
wl-clipboard
|
||||
|
||||
# development
|
||||
nodePackages.prettier
|
||||
nodePackages.yarn
|
||||
nodejs
|
||||
onlyoffice-desktopeditors
|
||||
opensnitch-ui
|
||||
pciutils
|
||||
pika-backup
|
||||
pinentry-curses
|
||||
pinta
|
||||
protonup-qt
|
||||
qbittorrent
|
||||
qemu
|
||||
traceroute
|
||||
unrar
|
||||
unstable.beszel
|
||||
unstable.ktailctl
|
||||
unstable.mcpelauncher-ui-qt
|
||||
unstable.obsidian
|
||||
unstable.podman-desktop
|
||||
unstable.ryubing
|
||||
unstable.signal-desktop-bin
|
||||
unstable.tailscale
|
||||
unstable.zoom-us
|
||||
usbutils
|
||||
virt-manager
|
||||
vlc
|
||||
vpngate.packages.x86_64-linux.default
|
||||
wayland-utils
|
||||
whois
|
||||
wine
|
||||
wl-clipboard
|
||||
];
|
||||
|
||||
fileSystems = {
|
||||
@@ -166,12 +182,7 @@
|
||||
emoji = [ "Noto Color Emoji" ];
|
||||
};
|
||||
|
||||
nixpkgs = {
|
||||
hostPlatform = "x86_64-linux";
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
nixpkgs.hostPlatform = "x86_64-linux";
|
||||
|
||||
networking = {
|
||||
iproute2.enable = true;
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
|
||||
networking = {
|
||||
hostName = "zelus";
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user