Compare commits
3 Commits
cef4d8654a
...
ef753f2450
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef753f2450 | ||
|
|
b4055e9364 | ||
|
|
53f8093cdb |
24
flake.lock
generated
24
flake.lock
generated
@@ -64,11 +64,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753617834,
|
"lastModified": 1755442500,
|
||||||
"narHash": "sha256-WEVfKrdIdu5CpppJ0Va3vzP0DKlS+ZTLbBjugMO2Drg=",
|
"narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "72cc1e3134a35005006f06640724319caa424737",
|
"rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -83,11 +83,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753623188,
|
"lastModified": 1755446937,
|
||||||
"narHash": "sha256-+32GZoXlUgnxQsmDZt8AeUUy1nzcZlSZQES8FGcbm3M=",
|
"narHash": "sha256-nQyj7NS2R979/BqDtscfSesmY5UOTM/JpTTZ/i8p8H8=",
|
||||||
"owner": "ggerganov",
|
"owner": "ggerganov",
|
||||||
"repo": "llama.cpp",
|
"repo": "llama.cpp",
|
||||||
"rev": "bf78f5439ee8e82e367674043303ebf8e92b4805",
|
"rev": "21c17b5befc5f6be5992bc87fc1ba99d388561df",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -142,11 +142,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753429684,
|
"lastModified": 1755186698,
|
||||||
"narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
|
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
|
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -188,11 +188,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752544651,
|
"lastModified": 1754988908,
|
||||||
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
|
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "2c8def626f54708a9c38a5861866660395bb3461",
|
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
15
flake.nix
15
flake.nix
@@ -85,6 +85,7 @@
|
|||||||
gui = {
|
gui = {
|
||||||
enable = true;
|
enable = true;
|
||||||
protonmail = true;
|
protonmail = true;
|
||||||
|
secrets = true;
|
||||||
gtk = false;
|
gtk = false;
|
||||||
|
|
||||||
sway = {
|
sway = {
|
||||||
@@ -111,7 +112,7 @@
|
|||||||
|
|
||||||
school = {
|
school = {
|
||||||
enable = true;
|
enable = true;
|
||||||
citrix = false;
|
citrix = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
games = {
|
games = {
|
||||||
@@ -238,10 +239,21 @@
|
|||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
"electron-31.7.7"
|
"electron-31.7.7"
|
||||||
|
# TODO: Remove when fixed https://github.com/NixOS/nixpkgs/issues/433004
|
||||||
|
"libsoup-2.74.3"
|
||||||
|
"libxml2-2.13.8"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# TODO: Remove when Citrix is fixed
|
||||||
|
pkgs_stable_tmp = import nixpkgs-stable {
|
||||||
|
inherit system;
|
||||||
|
config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
localPackages = pkgs.lib.genAttrs flake-utils.lib.defaultSystems (system: {
|
localPackages = pkgs.lib.genAttrs flake-utils.lib.defaultSystems (system: {
|
||||||
kickoff-dot-desktop = pkgs.callPackage ./pkgs/kickoff-dot-desktop.nix {};
|
kickoff-dot-desktop = pkgs.callPackage ./pkgs/kickoff-dot-desktop.nix {};
|
||||||
jhelioviewer = pkgs.callPackage ./pkgs/jhelioviewer.nix {};
|
jhelioviewer = pkgs.callPackage ./pkgs/jhelioviewer.nix {};
|
||||||
@@ -267,6 +279,7 @@
|
|||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit localPackages;
|
inherit localPackages;
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
|
inherit pkgs_stable_tmp;
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" "wl" ];
|
boot.kernelModules = [ "kvm-amd" "wl" ];
|
||||||
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/c9d87455-b02f-465d-8d63-1858dc2164fe";
|
{ device = "/dev/disk/by-uuid/c9d87455-b02f-465d-8d63-1858dc2164fe";
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, pkgs
|
, pkgs
|
||||||
, config
|
, config
|
||||||
|
, localPackages
|
||||||
|
, pkgs_stable_tmp
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib; let
|
with lib; let
|
||||||
cfg = config.simmer.school;
|
cfg = config.simmer.school;
|
||||||
extraCerts = [ ./incommon-rsa-ca2.pem ];
|
extraCerts = [ ./incommon-rsa-ca2.pem ];
|
||||||
citrix = pkgs.citrix_workspace_23_09_0.override { inherit extraCerts; };
|
citrix = pkgs_stable_tmp.citrix_workspace_23_09_0.override { inherit extraCerts; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|||||||
Reference in New Issue
Block a user