Compare commits

..

No commits in common. "d2ba9f04ca8c3e184aeda365909ba2b2f17de748" and "cd4f127e27cb70c7d1f68a424458223230f70982" have entirely different histories.

4 changed files with 32 additions and 42 deletions

View file

@ -193,11 +193,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726396892, "lastModified": 1726153585,
"narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=", "narHash": "sha256-ShZ3YeEutJk+QoY/VrpujzZgocmyXYqhOC8I8pudO9U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce", "rev": "59fb64b36b0a1961f6d4c6d5b8db45cc35d040f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1726454673, "lastModified": 1726193009,
"narHash": "sha256-cvgXPCeiDIDrEE8VijX5uZ2GAOHldOJXuKOb95goxUo=", "narHash": "sha256-Lvz+t8KlBAolMAr3gtaUb/kgYjFY6EMFiQksPwxcAlQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "3723f9e35635612c470db1b0aea08d9ff22b39ec", "rev": "f91cf70ac3a0698db119789cf00e8882bd69aec0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -551,11 +551,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726440980, "lastModified": 1726209430,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "narHash": "sha256-ski2Is3VGChR1LR5U8qw8mqNfl5FDPCCAOsz2RrvJCE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "rev": "c82fc8cf3f75e667ad9dd3e5df721119b63723b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -658,11 +658,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726454253, "lastModified": 1725885300,
"narHash": "sha256-ikQs0QZGmCfk5cJ2N5nTT6oULMvWgxN6ebk4WsOq9io=", "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b9ab7e57c5d1d456cdeef252d345f3bca9c55851", "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,11 +717,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1726320982, "lastModified": 1725930920,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -765,11 +765,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1725983898,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -864,11 +864,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726453838, "lastModified": 1726194362,
"narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", "narHash": "sha256-cM7zFscFqdsA5KohUUYndzIp20kUqjj39qnj6Voj+f8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", "rev": "a71b1240e29f1ec68612ed5306c328086bed91f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -885,11 +885,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1726218807, "lastModified": 1725922448,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "rev": "cede1a08039178ac12957733e97ab1006c6b6892",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,6 +7,8 @@
nixos-hardware.nixosModules.common-gpu-amd nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
# microvm.nixosModules.host
# ./vm.nix # ./vm.nix
../../users/erwin ../../users/erwin
@ -100,6 +102,9 @@
swapDevices = [ { device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; } ]; swapDevices = [ { device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; } ];
# high-resolution display
# hardware.video.hidpi.enable = lib.mkDefault true;
hardware = { hardware = {
# Enable firmware # Enable firmware
enableAllFirmware = true; enableAllFirmware = true;
@ -381,6 +386,7 @@
}; };
envfs.enable = true; envfs.enable = true;
cpupower-gui.enable = true;
teamviewer.enable = true; teamviewer.enable = true;
sunshine = { sunshine = {
enable = true; enable = true;
@ -415,6 +421,7 @@
river.enable = true; river.enable = true;
gnome-disks.enable = true; gnome-disks.enable = true;
# ssh.startAgent = true;
gamemode = { gamemode = {
enable = true; enable = true;

View file

@ -186,14 +186,6 @@
useXkbConfig = true; useXkbConfig = true;
}; };
# Enable new implementation of switch-to-configuration built in Rust
system = {
switch = {
enable = false;
enableNg = true;
};
};
networking = { networking = {
hostName = "mimir"; hostName = "mimir";
useDHCP = false; useDHCP = false;
@ -457,15 +449,6 @@
openFirewall = false; openFirewall = false;
openBroadcast = true; openBroadcast = true;
}; };
ollama = {
enable = true;
acceleration = "cuda";
host = "100.119.162.110";
loadModels = [
"mistral"
];
};
}; };
environment = { environment = {

View file

@ -35,7 +35,7 @@ in
dunst.enable = false; dunst.enable = false;
emacs = { emacs = {
enable = true; enable = true;
package = pkgs.emacs29-pgtk; package = pkgs.emacs-unstable-pgtk;
daemon = true; daemon = true;
}; };
electron = { electron = {