Compare commits

..

No commits in common. "1167c16c1fd767e8be314b1e9e51274c4571d3ea" and "5dda9ad9576fdad4f51cecf23837ffc96cd5c364" have entirely different histories.

12 changed files with 11 additions and 67 deletions

View File

@ -110,11 +110,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1785454630, "lastModified": 1743964447,
"narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -52,7 +52,7 @@
specialArgs = attrs; specialArgs = attrs;
modules = [ modules = [
flakes flakes
(applyOverlays [ unfree-overlay unstable-overlay unstable-unfree-overlay python-overlay package-overlays ]) (applyOverlays [ unfree-overlay unstable-overlay python-overlay package-overlays ])
vscode-server.nixosModules.default vscode-server.nixosModules.default
./machines/kcnhub/configuration.nix ./machines/kcnhub/configuration.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops

View File

@ -20,11 +20,10 @@
./nosleep.nix ./nosleep.nix
]; ];
sops.age.keyFile = "/root/.config/sops/age/keys.txt"; sops.age.keyFile = "/root/.config/sops/age/keys.txt";
sops.defaultSopsFile = ./secrets/system.yaml; sops.defaultSopsFile = ./secrets/system.yaml;
# networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# Support NTFS(3g) # Support NTFS(3g)
boot.supportedFilesystems = ["ntfs"]; boot.supportedFilesystems = ["ntfs"];
@ -45,28 +44,6 @@
# Enable the X11 forwarding over ssh # Enable the X11 forwarding over ssh
programs.ssh.forwardX11 = true; programs.ssh.forwardX11 = true;
programs.ssh.setXAuthLocation = true; programs.ssh.setXAuthLocation = true;
environment.etc."vnc/xstartup-minimal".mode = "0755";
environment.etc."vnc/xstartup-plasma".mode = "0755";
environment.etc."vnc/xstartup-xfce".mode = "0755";
# trying to install matlab runtime
programs.nix-ld = {
enable = true;
package = pkgs.nix-ld;
libraries = with pkgs; [
glibc
gcc.cc.lib
zlib
pam
libuuid
libxcrypt
openssl
xorg.libX11
xorg.libXext
xorg.libXrender
xorg.libXtst
];
};
# Enable KDE Plasma # Enable KDE Plasma
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
@ -107,6 +84,7 @@
# Used for Key Generation # Used for Key Generation
age age
# To try to make X11 forwarding work we install xauth # To try to make X11 forwarding work we install xauth
xorg.xauth xorg.xauth
xorg.xhost xorg.xhost

View File

@ -1,6 +1,5 @@
{ ... }: { { ... }: {
imports = [ imports = [
./packages/ai.nix
./packages/ngilab.nix ./packages/ngilab.nix
./packages/office.nix ./packages/office.nix
./packages/terminal.nix ./packages/terminal.nix

View File

@ -1,9 +0,0 @@
{ config, pkgs, lib, ... }: {
environment.systemPackages = with pkgs; [
# v-- Proprietary (hence unfree)
unstable-unfree.claude-code
unstable.pi-coding-agent
# v-- Depends on CUDA (hence unfree)
unstable-unfree.llama-cpp
];
}

View File

@ -13,7 +13,6 @@
cmake cmake
gnumake gnumake
((pkgs.python3.withPackages config.pythonPackages).override (args: { ignoreCollisions = true; })) ((pkgs.python3.withPackages config.pythonPackages).override (args: { ignoreCollisions = true; }))
pkgs.unstable.uv
]; ];
pythonPackages = (p: with p; [ pythonPackages = (p: with p; [
# Common Python Libraries # Common Python Libraries

View File

@ -3,7 +3,6 @@
./services/ssh.nix ./services/ssh.nix
./services/xrdp.nix ./services/xrdp.nix
./services/vnc-startup.nix ./services/vnc-startup.nix
./services/earlyoom.nix
]; ];
services.vscode-server.enable = true; services.vscode-server.enable = true;
} }

View File

@ -1,9 +0,0 @@
{ config, pkgs, lib, ... }: {
services.earlyoom = {
enable = true;
# What % Memory Needs to Be left to send SIGTERM
freeMemThreshold = 10;
# What % Memory Needs to Be left to send SIGKILL
freeMemKillThreshold = 5;
};
}

View File

@ -46,7 +46,7 @@
''; '';
# Make scripts executable # Make scripts executable
#system.activationScripts.vnc-scripts = '' system.activationScripts.vnc-scripts = ''
# sudo chmod +x /etc/vnc/xstartup-* chmod +x /etc/vnc/xstartup-*
#''; '';
} }

View File

@ -24,12 +24,10 @@
./users/umar.nix ./users/umar.nix
./users/arthur.nix ./users/arthur.nix
./users/raiyan.nix ./users/raiyan.nix
./users/elena.nix
# Groups # Groups
./users/groups/admin.nix ./users/groups/admin.nix
./users/groups/nfrf.nix ./users/groups/nfrf.nix
./users/groups/ngilab_shared.nix
./users/groups/nsbspl.nix ./users/groups/nsbspl.nix
]; ];
} }

View File

@ -1,11 +0,0 @@
{ pkgs, ... }: {
users.users.elena = {
isNormalUser = true;
extraGroups = [ ];
homeSize = "50g";
homeProjectId = 125;
packages = with pkgs; [
];
};
}

View File

@ -2,7 +2,7 @@ final: final-py: prev-py: {
nestml = let nestml = let
pname = "nestml"; pname = "nestml";
# Newer versions require newer antlr4 # Newer versions require newer antlr4
version = "8.3.0"; version = "7.0.2";
in final-py.buildPythonPackage { in final-py.buildPythonPackage {
inherit pname version; inherit pname version;
@ -10,7 +10,7 @@ final: final-py: prev-py: {
owner = "nest"; owner = "nest";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-JR5f8783IlHI1D0kBazl04TwWCJXFmwI7kCtesJxaK8="; hash = "sha256-BQzwIh2Gdq+rLwIwe7dyltDfEzpaIWGlXF0AfZGBUDw=";
}; };
doCheck = false; doCheck = false;