erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:4e713b60a313e3a61daab10030b6b38d11a176e8
Branches Tags
erwin:main
..
compare: erwin:acb1977c7f9f7d83c7c3de9428d1db6ca8a034da
Branches Tags
erwin:main

No commits in common. "4e713b60a313e3a61daab10030b6b38d11a176e8" and "acb1977c7f9f7d83c7c3de9428d1db6ca8a034da" have entirely different histories.
4e713b60a3 ... acb1977c7f

3 changed files with 35 additions and 63 deletions
Show stats Expand all files Collapse all files

60
flake.lock
View file

@ -56,11 +56,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722262249, "lastModified": 1721946698,
"narHash": "sha256-lUKDWPgfT6mr50WZgSq3/hJtZ8gYxr3PCLghek5EFaE=", "narHash": "sha256-jx+xuNZ/8azfFYMlZyYa6e+OiTlf+4GVYtbfv1+Tows=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "db2d6c3d83e927185068aab457396ee1a21994ff", "rev": "c32bbcc7edc2cf99da52b1407c90238bc781a804",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722217815, "lastModified": 1721871128,
"narHash": "sha256-8r5AJ3n8WEDw3rsZLALSuFQ5kJyWOcssNZvPxYLr2yc=", "narHash": "sha256-NyWVCnSeePnJHGJxZ0l3zdGQGrVjUcx2IJbV8KIsPf0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "1e6f8a7b4634fc051cc9361959bf414fcf17e094", "rev": "55e874b9c14764cb791e5740f0e92202e41393fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +221,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1722273087, "lastModified": 1721985045,
"narHash": "sha256-uELMts/UTJ4jTPQbQgOnE75flmdbWm672yDvL3QLWOI=", "narHash": "sha256-EGeUu2Veg2p4fiGZ+22kNSpucrYxZn6NTdXVS989GGk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "087cf45264b4487b2848e08548bb4c5f933d460c", "rev": "24c391d8fe03854d1eedea66c241b176e97f5f6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -609,11 +609,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722321190, "lastModified": 1721852138,
"narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -702,11 +702,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722257939, "lastModified": 1721394956,
"narHash": "sha256-SUHIztj/CoqqtwEjSA9cnJb+IIFIr2ntrzn0Ly1DCB8=", "narHash": "sha256-VnayJVKngasaNNiMlBhkeA//+V9EpEuT/mkOsFUbFDg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-ld-rs", "repo": "nix-ld-rs",
"rev": "178b100f4dda6b1280e9619270009fc8c0938e73", "rev": "2f1fe38bc69d2400652e0848d9d2ce2955a39cf6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,11 +717,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1722278305, "lastModified": 1721911538,
"narHash": "sha256-xLBAegsn9wbj+pQfbX07kykd5VBV3Ywk3IbObVAAlWA=", "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "eab049fe178c11395d65a858ba1b56461ba9652d", "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -776,11 +776,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1722087241, "lastModified": 1721821769,
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", "narHash": "sha256-PhmkdTJs2SfqKzSyDB74rDKp1MH4mGk0pG/+WqrnGEw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c50662509100d53229d4be607f1a3a31157fa12", "rev": "d0907b75146a0ccc1ec0d6c3db287ec287588ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -824,11 +824,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1722062969, "lastModified": 1721924956,
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -983,11 +983,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722305989, "lastModified": 1721960387,
"narHash": "sha256-ljiuTGSFuEtudqFqp/5Wr1OuEsVCjur/F2CmlNujSjc=", "narHash": "sha256-o21ax+745ETGXrcgc/yUuLw1SI77ymp3xEpJt+w/kks=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "38c2f156fca1868c8be7195ddac150522752f6ab", "rev": "9cbf831c5b20a53354fc12758abd05966f9f1699",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1004,11 +1004,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1722114803, "lastModified": 1721688883,
"narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=", "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab", "rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
"type": "github" "type": "github"
}, },
"original": { "original": {

35
machines/loki/configuration.nix
View file

@ -103,16 +103,11 @@
# high-resolution display # high-resolution display
# hardware.video.hidpi.enable = lib.mkDefault true; # hardware.video.hidpi.enable = lib.mkDefault true;
hardware = { # Enable firmware
# Enable firmware hardware.enableAllFirmware = true;
enableAllFirmware = true;
graphics = {
enable32Bit = true;
};
# i2c support # i2c support
i2c.enable = true; hardware.i2c.enable = true;
};
boot = { boot = {
initrd.availableKernelModules = [ initrd.availableKernelModules = [
@ -237,9 +232,6 @@
enable = true; enable = true;
}; };
sudo.enable = false; sudo.enable = false;
apparmor = {
enable = true;
};
pam.services.swaylock = { pam.services.swaylock = {
unixAuth = true; unixAuth = true;
setLoginUid = true; setLoginUid = true;
@ -510,27 +502,10 @@
]; ];
}; };
# Workaround for packages that has HIP paths hardcoded
systemd.tmpfiles.rules =
let
rocmEnv = pkgs.symlinkJoin {
name = "rocm-combined";
paths = with pkgs.rocmPackages; [
rocblas
hipblas
clr
];
};
in
[ "L+ /opt/rocm - - - - ${rocmEnv}" ];
nix.settings.post-build-hook = nix.settings.post-build-hook =
let let
inherit (attic.packages.${pkgs.system}) attic-client; inherit (attic.packages.${pkgs.system}) attic-client;
cachedPackagePatterns = builtins.concatStringsSep "|" [ cachedPackagePatterns = builtins.concatStringsSep "|" [ "mongodb" ];
"mongodb"
"qgis"
];
in in
pkgs.writeScript "upload-to-cache" '' pkgs.writeScript "upload-to-cache" ''
set -eu set -eu

3
machines/odin/configuration.nix
View file

@ -45,9 +45,6 @@
enable = true; enable = true;
}; };
sudo.enable = false; sudo.enable = false;
apparmor = {
enable = true;
};
}; };
boot = { boot = {