bump inputs, add netbird
This commit is contained in:
illustris
parent
4a249abf84
commit
0ff4e3ec02
GPG Key ID:
56C8FC0B899FEFA3
@ -30,7 +30,10 @@
|
||||
|
||||
environment = {
|
||||
enableDebugInfo = true;
|
||||
etc.nixpkgs.source = pkgs.path;
|
||||
etc = {
|
||||
nixpkgs.source = pkgs.path;
|
||||
hosts.mode = "0644";
|
||||
};
|
||||
systemPackages = with pkgs; [
|
||||
asciinema
|
||||
bcc
|
||||
@ -47,7 +50,7 @@
|
||||
latencytop linuxPackages.perf lsof
|
||||
mosh
|
||||
ncdu neofetch nethogs networkmanager nfs-utils
|
||||
nix-du nix-top nix-prefetch-git nix-tree
|
||||
nix-du nix-prefetch-git nix-tree
|
||||
nnn
|
||||
openvpn
|
||||
p7zip pciutils powertop pv
|
||||
@ -58,7 +61,7 @@
|
||||
unzip usbutils
|
||||
valgrind
|
||||
wget
|
||||
youtube-dl
|
||||
yt-dlp
|
||||
(pass.withExtensions (exts: [ exts.pass-otp ]))
|
||||
] ++ (with illustris; [
|
||||
fzpass
|
||||
@ -229,6 +232,7 @@
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
# containers.cdi.dynamic.nvidia.enable = true;
|
||||
docker = {
|
||||
enable = false;
|
||||
enableNvidia = true;
|
||||
@ -237,10 +241,7 @@
|
||||
daemon.settings.bip = "192.168.9.0/22";
|
||||
};
|
||||
libvirtd.enable = false;
|
||||
podman = {
|
||||
enable = true;
|
||||
enableNvidia = true;
|
||||
};
|
||||
podman.enable = true;
|
||||
};
|
||||
|
||||
xdg.portal.enable = true;
|
||||
@ -251,7 +252,7 @@
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
system.stateVersion = "22.05"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -32,7 +32,6 @@
|
||||
})
|
||||
# surf
|
||||
sxiv
|
||||
teams-for-linux
|
||||
tidal-hifi
|
||||
virt-manager
|
||||
vlc
|
||||
@ -91,7 +90,10 @@
|
||||
# desktopManager.plasma5.enable = true;
|
||||
dpi = 100;
|
||||
# enable = true;
|
||||
videoDrivers = [ "displaylink" "nvidia" ];
|
||||
videoDrivers = [
|
||||
# "displaylink"
|
||||
"nvidia"
|
||||
];
|
||||
wacom.enable = true;
|
||||
windowManager.dwm.enable = true;
|
||||
displayManager.lightdm.enable = true;
|
||||
|
||||
53
flake.lock
generated
53
flake.lock
generated
@ -9,11 +9,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1717316653,
|
||||
"narHash": "sha256-91VBjCb9A5Sv1N7LpBg0OzTG0DKpvXVAnIT01Ba4lOw=",
|
||||
"lastModified": 1721463311,
|
||||
"narHash": "sha256-zmvqafJogm5DJ8+2v/kE9Oj8AGzK7IBOdMSIPZyKuNk=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "29a3b4c8d5f21dcb359a91d88fd94ae4aa3e6a47",
|
||||
"rev": "863eb5594f8c375d1ddaa2cea84a819c5197dd76",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -45,11 +45,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717316182,
|
||||
"narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
|
||||
"lastModified": 1721534365,
|
||||
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
|
||||
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -71,11 +71,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717286932,
|
||||
"narHash": "sha256-B2nBs+OsNZBdedyYfioifC9LFyg0rWFUrb8JljhCK6I=",
|
||||
"lastModified": 1721520570,
|
||||
"narHash": "sha256-kGrNorYY9G9Twu3dSPpQZNWU3uMYBGlcmk50Qvq5VAg=",
|
||||
"owner": "illustris",
|
||||
"repo": "flake",
|
||||
"rev": "611ff0824a1fdeb7503054501025ef4d01d2985e",
|
||||
"rev": "15192cc24d00be4b31df37f4f304a4811fc78d44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -91,11 +91,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1704021921,
|
||||
"narHash": "sha256-Z9wRCtt/ufn6oKwycBrAaw5mQD1Y6fswWR7HtOQ1XQ0=",
|
||||
"lastModified": 1720662977,
|
||||
"narHash": "sha256-rk/7zcDafaHT8nUadWOZfY+5RrJUeZo05kvXUZdg/Es=",
|
||||
"owner": "illustris",
|
||||
"repo": "nixfs",
|
||||
"rev": "c1072f211fb37f4c91bc57f4da5523a79463eefd",
|
||||
"rev": "13b1d7a09825b8dc5e83351224630793ce35020a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -106,11 +106,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1716948383,
|
||||
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
|
||||
"lastModified": 1721379653,
|
||||
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
|
||||
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -120,13 +120,34 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixtop": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719550824,
|
||||
"narHash": "sha256-EvRUK9J+E7uzQEJH2EdjVszq38IxxnWHyAu6N0yD2e0=",
|
||||
"owner": "illustris",
|
||||
"repo": "nixtop",
|
||||
"rev": "ab33b604fd369efe76c64cee1bd836aa598ac847",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "illustris",
|
||||
"repo": "nixtop",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"firefox-addons": "firefox-addons",
|
||||
"home-manager": "home-manager",
|
||||
"illustris": "illustris",
|
||||
"nixfs": "nixfs",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixtop": "nixtop"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -19,13 +19,17 @@
|
||||
url = "github:illustris/nixfs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixtop = {
|
||||
url = "github:illustris/nixtop";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
firefox-addons = {
|
||||
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, home-manager, illustris, nixfs, ... }@inputs: {
|
||||
outputs = { self, nixpkgs, home-manager, illustris, nixfs, nixtop, ... }@inputs: {
|
||||
nixosConfigurations = {
|
||||
desktop = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
@ -44,6 +48,7 @@
|
||||
{
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "hm-bak";
|
||||
users.illustris = {...}: {
|
||||
imports = [
|
||||
(import (
|
||||
@ -56,6 +61,7 @@
|
||||
nixfs.nixosModules.nixfs
|
||||
{services.nixfs.enable = true;}
|
||||
illustris.nixosModules.plasmonad
|
||||
{environment.systemPackages = [ nixtop.packages.x86_64-linux.nixtop ];}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@ -75,6 +75,7 @@
|
||||
bluetooth.enable = true;
|
||||
# needed by hyperland
|
||||
nvidia.modesetting.enable = true;
|
||||
nvidia-container-toolkit.enable = true;
|
||||
opengl.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,16 +1,21 @@
|
||||
{ ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
netbird-ui
|
||||
iftop
|
||||
];
|
||||
networking = {
|
||||
firewall.enable = false;
|
||||
hostName = "desktop";
|
||||
networkmanager.enable = true;
|
||||
};
|
||||
services = {
|
||||
netbird.enable = true;
|
||||
resolved = {
|
||||
enable = true;
|
||||
# git.sr.ht fails to resolve with dnssec
|
||||
dnssec = "false";
|
||||
};
|
||||
zerotierone.enable = true;
|
||||
# zerotierone.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user