modified: flake.lock

modified:   hosts/blackstar/nixos/configuration.nix
	modified:   hosts/shared/nixos/shared_config.nix
	modified:   flake.lock
	modified:   flake.nix
	modified:   hosts/blackstar/nixos/configuration.nix
	modified:   hosts/shared/nixos/shared_config.nix
	modified:   pkgs/default.nix
	modules/default.nix
	modules/desktop/
	modules/system/
This commit is contained in:
Mrrp 2024-08-20 10:27:32 -07:00
parent 264e556311
commit 1a995140bc
3 changed files with 77 additions and 49 deletions

36
flake.lock generated
View file

@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1722752898, "lastModified": 1723271337,
"narHash": "sha256-8BwcY0yYlUxpoqpAoeXKxVG+w97LUBp+pfzUiISOmeY=", "narHash": "sha256-IUnCQ0xo0sJRhHbsXVDQ9ULpiQrkxbavmVOilhAXdlk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "0caa626457f1f4f8273a89775bf9081b7fc09823", "rev": "ca0a8350f4c278204475112dd600ba6f0d09110e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722630065, "lastModified": 1723015306,
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "afc892db74d65042031a093adb6010c4c3378422", "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722651103, "lastModified": 1722987190,
"narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=", "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51", "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1722630782, "lastModified": 1723175592,
"narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -85,11 +85,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722589793, "lastModified": 1723195244,
"narHash": "sha256-OYDIo1Iqb6ldcC6JdqzKAKSRiXjDOwOAJKKMH8OZutk=", "narHash": "sha256-UdydOPxlUpEE+uparyCgxTCSumwCn2URpxPm70G1K+Q=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "aa00ddcf654a35ba0eafe17247cf189958d33182", "rev": "56f63dfd8aeebf80e3fc87894fa3d5a40f98a329",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722738111, "lastModified": 1723256423,
"narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=", "narHash": "sha256-9iDTrfVM+mbcad31a47oqW8t8tfSA4C/si6F8F2DO/w=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280", "rev": "615cfd85b4d9c51811a8d875374268fab5bd4089",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -100,6 +100,7 @@
# TODO: Set your hostname # TODO: Set your hostname
networking.hostName = "blackstar"; networking.hostName = "blackstar";
networking.firewall.allowedTCPPorts = [ 8000 80 443 5173 ];
# TODO: Configure your system-wide user settings (groups, etc), add more users as needed. # TODO: Configure your system-wide user settings (groups, etc), add more users as needed.
users.users = { users.users = {
@ -185,7 +186,7 @@
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.production; package = config.boot.kernelPackages.nvidiaPackages.latest;
}; };
# Programs installed for all users # Programs installed for all users
@ -195,13 +196,14 @@
krita krita
# code # code
cargo rustc rustup# Rust rustc rustup# Rust
# pkgs.rust-bin.stable.latest.default # pkgs.rust-bin.stable.latest.default
jetbrains.intellij
jetbrains.rust-rover
jetbrains.rider jetbrains.rider
jetbrains.clion jetbrains.clion
jetbrains.pycharm-professional jetbrains.pycharm-professional
jetbrains.datagrip
jetbrains.webstorm
vim vim
python3 python3
lua lua
@ -211,11 +213,14 @@
steam steam
alvr alvr
xivlauncher xivlauncher
modrinth-app
# cad # cad
prusa-slicer prusa-slicer
freecad freecad
blender (blender.override {
cudaSupport = true;
})
# other # other
discord discord
@ -224,9 +229,21 @@
gnupg ffmpeg unzip gnupg ffmpeg unzip
mpv mpv
hyfetch hyfetch
pgadmin4 dbeaver-bin
openssl
pkg-config
element-desktop
python311
python311Packages.pip
]; ];
programs.nix-ld.enable = true;
environment.variables = {
PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig";
};
programs.git.enable = true; programs.git.enable = true;
programs.firefox.enable = true; programs.firefox.enable = true;

View file

@ -10,39 +10,50 @@
# code # code
cargo rustc # Rust cargo rustc # Rust
jetbrains.rust-rover
jetbrains.rider jetbrains.rider
jetbrains.clion
jetbrains.pycharm-professional jetbrains.pycharm-professional
vim vim
python3 python3
lua lua
git git
(vscode-with-extensions.override { # (vscode-with-extensions.override {
vscodeExtensions = with vscode-extensions; [ # vscodeExtensions = with vscode-extensions; [
dracula-theme.theme-dracula # dracula-theme.theme-dracula
yzhang.markdown-all-in-one # yzhang.markdown-all-in-one
rust-lang.rust-analyzer # rust-lang.rust-analyzer
# # dependi
# jscearcy.rust-doc-viewer # jscearcy.rust-doc-viewer
# swellaby.vscode-rust-test-adapter # swellaby.vscode-rust-test-adapter
tamasfe.even-better-toml # tamasfe.even-better-toml
ms-vsliveshare.vsliveshare # ms-vsliveshare.vsliveshare
aaron-bond.better-comments # aaron-bond.better-comments
bbenoist.nix # bbenoist.nix
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ # vue.volar
{ # ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
name = "remote-ssh-edit"; # {
publisher = "ms-vscode-remote"; # name = "remote-ssh-edit";
version = "0.47.2"; # publisher = "ms-vscode-remote";
sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g"; # version = "0.47.2";
} # sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
]; # }
}) # ];
#})
vscode.fhs
blockbench
# other # other
discord discord
nodejs_22
# sys utils # sys utils
gnupg ffmpeg unzip gnupg ffmpeg unzip
mpv mpv gparted
]; ];
services.postgresql = {
enable = true;
ensureDatabases = [ "test" ];
authentication = pkgs.lib.mkOverride 10 ''
#type database DBuser auth-method
local all all trust
'';
};
} }