about summary refs log tree commit diff stats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/by-name/bo/boot/module.nix4
-rw-r--r--modules/by-name/qu/qutebrowser/module.nix2
-rw-r--r--modules/common/projects.json68
3 files changed, 4 insertions, 70 deletions
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index 404352ac..dfcd14b7 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -84,7 +84,7 @@ in {
       # This should only be necessary for `lanzaboote`, but that is the current default in
       # this module.
       soispha.impermanence.directories = [
-        "/etc/secureboot"
+        "/var/lib/sbctl"
       ];
 
       boot = {
@@ -96,7 +96,7 @@ in {
 
         lanzaboote = {
           enable = true;
-          pkiBundle = "/etc/secureboot";
+          pkiBundle = "/var/lib/sbctl";
 
           settings = {
             # Disable editing the kernel command line (which could allow someone to become root)
diff --git a/modules/by-name/qu/qutebrowser/module.nix b/modules/by-name/qu/qutebrowser/module.nix
index 20ab8e4b..4e0695f0 100644
--- a/modules/by-name/qu/qutebrowser/module.nix
+++ b/modules/by-name/qu/qutebrowser/module.nix
@@ -18,7 +18,7 @@
         ];
       }
       ''
-        makeWrapper ${pkgs.qutebrowser-patched} "$out/bin/qutebrowser-${name}" \
+        makeWrapper ${lib.getExe pkgs.qutebrowser-patched} "$out/bin/qutebrowser-${name}" \
           --add-flags --no-err-windows \
           --add-flags --basedir \
           --add-flags "${xdg_data_home}/qutebrowser/${name}" \
diff --git a/modules/common/projects.json b/modules/common/projects.json
index 36a2ae45..df3b0c60 100644
--- a/modules/common/projects.json
+++ b/modules/common/projects.json
@@ -1,7 +1,4 @@
 {
-  "3d-printer": {
-    "prefix": "hardware"
-  },
   "aoc": {
     "prefix": "programming/advent_of_code"
   },
@@ -15,19 +12,6 @@
       "pc": {}
     }
   },
-  "camera": {
-    "prefix": "programming/zig"
-  },
-  "hardware": {
-    "prefix": "research"
-  },
-  "input": {
-    "prefix": "research",
-    "subprojects": {
-      "dotfiles": {},
-      "read-things": {}
-    }
-  },
   "latex": {
     "prefix": "programming/latex"
   },
@@ -40,42 +24,6 @@
       "sweden": {}
     }
   },
-  "possible-projects": {
-    "prefix": "research"
-  },
-  "presentation": {
-    "prefix": "research"
-  },
-  "school": {
-    "prefix": "research",
-    "subprojects": {
-      "biologie": {},
-      "chemie": {
-        "subprojects": {
-          "facharbeit": {}
-        }
-      },
-      "deutsch": {},
-      "english": {},
-      "extern": {
-        "subprojects": {
-          "bwinf": {},
-          "dsa": {}
-        }
-      },
-      "geographie": {},
-      "geschichte": {},
-      "infomatik": {},
-      "klausuren": {},
-      "latein": {},
-      "mathematik": {},
-      "musik": {},
-      "philosophie": {},
-      "physik": {},
-      "sozialkunde": {},
-      "sport": {}
-    }
-  },
   "server": {
     "prefix": "config",
     "subprojects": {
@@ -87,15 +35,8 @@
       "sudo-less": {}
     }
   },
-  "serverphone": {
-    "prefix": "programming/rust"
-  },
   "smartphone": {
-    "prefix": "hardware",
-    "subprojects": {
-      "airdrop": {},
-      "airplay": {}
-    }
+    "prefix": "hardware"
   },
   "system": {
     "prefix": "config",
@@ -122,12 +63,5 @@
       "netflix": {},
       "youtube": {}
     }
-  },
-  "trinitrix": {
-    "prefix": "programming/rust",
-    "subprojects": {
-      "documentation": {},
-      "testing": {}
-    }
   }
 }