about summary refs log tree commit diff stats
path: root/modules/common
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--modules/common/default.nix28
-rw-r--r--modules/common/nixos_shell_configuration.nix2
-rw-r--r--modules/common/projects.json69
3 files changed, 19 insertions, 80 deletions
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 504782f3..a272bd52 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -24,6 +24,8 @@
   externalBinaries,
   ...
 }: {
+  # TODO(@bpeetz): Move this file to default options in their respective modules. <2025-05-31>
+
   soispha = {
     age.enable = true;
     boot.enable = true;
@@ -168,8 +170,6 @@
           "~/.local/share"
           "~/.local/.Trash-1000"
 
-          "~/.mozilla/firefox"
-
           "~/media"
           "~/school"
           "~/repos"
@@ -178,6 +178,13 @@
     };
 
     programs = {
+      i3bar-river.enable = true;
+      i3status-rust.enable = true;
+
+      qutebrowser = {
+        enable = true;
+      };
+
       nvim = {
         enable = true;
         shell = pkgs.zsh;
@@ -228,12 +235,12 @@
               title = "*";
               action = "ssd";
             }
-            # This remove the focus border around Firefox (which is useful because the Firefox is nearly always in its own tag.)
-            {
-              app-id = "firefox";
-              title = "*";
-              action = "csd";
-            }
+            # # This remove the focus border around Firefox (which is useful because the Firefox is nearly always in its own tag.)
+            # {
+            #   app-id = "firefox";
+            #   title = "*";
+            #   action = "csd";
+            # }
           ];
           generalSettings = {
             # background
@@ -256,8 +263,8 @@
             pointer-12951-6505-ZSA_Technology_Labs_Moonlander_Mark_I = [["pointer-accel" "0"] ["accel-profile" "none"]];
           };
           backgroundStart = [
+            # TODO(@bpeetz): Move these to systemd units/their own modules <2025-05-18>
             pkgs.gammastep
-            pkgs.yambar
 
             pkgs.mako
             ["${lib.getExe pkgs.swaybg}" "--image" "${./abstract-nord.png}"]
@@ -266,7 +273,6 @@
           ];
         };
       };
-      firefox.enable = true;
       mpv.enable = true;
       steam.enable = true;
       ssh.enable = true;
@@ -283,7 +289,7 @@
         projects = builtins.fromJSON (builtins.readFile ./projects.json);
       };
       nix-index.enable = true;
-      yambar.enable = true;
+      yambar.enable = false;
       yt.enable = true;
       zathura.enable = true;
       zsh.enable = true;
diff --git a/modules/common/nixos_shell_configuration.nix b/modules/common/nixos_shell_configuration.nix
index bbaa8477..1bec0145 100644
--- a/modules/common/nixos_shell_configuration.nix
+++ b/modules/common/nixos_shell_configuration.nix
@@ -56,8 +56,6 @@
   soispha = {
     hardware = {
       enable = false;
-      enableGraphics = false;
-      cpuType = "vm";
     };
 
     disks.enable = false;
diff --git a/modules/common/projects.json b/modules/common/projects.json
index 48a10f03..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"
   },
@@ -36,45 +20,10 @@
       "bank": {},
       "google": {},
       "health": {},
+      "job": {},
       "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": {
@@ -86,15 +35,8 @@
       "sudo-less": {}
     }
   },
-  "serverphone": {
-    "prefix": "programming/rust"
-  },
   "smartphone": {
-    "prefix": "hardware",
-    "subprojects": {
-      "airdrop": {},
-      "airplay": {}
-    }
+    "prefix": "hardware"
   },
   "system": {
     "prefix": "config",
@@ -121,12 +63,5 @@
       "netflix": {},
       "youtube": {}
     }
-  },
-  "trinitrix": {
-    "prefix": "programming/rust",
-    "subprojects": {
-      "documentation": {},
-      "testing": {}
-    }
   }
 }