Merge pull request 'Misc.' (#26) from nixos-refactor into main

Reviewed-on: #26

dotfiles/README.md

@@ -1,13 +1 @@
-## Dotfiles TODO
-
-### TODO
-- Write a shell application to manage display brightness on laptop. Use `brightnessctl`. Call the script via hyprland bindings.
-- Devise a maximally-portable method to get "autofill" from Bitwarden vault. (E.g. "Ctrl+Super+P" -> Search+Select app -> Automatically fills username, password, copies TOTP to clipboard).
-- Determine how to facilitate theme hotswapping. Hyprpaper? Stylix?
-- Polish waybar appearance. Add some transparency, improve handling of dark vs. light polarities. Add widget for Spotify playback.
-- Migrate flatpak apps to native if possible (Zen for laptop, everything listed in `services.flatpak.packages` for desktop).
-- Reorganize nix files such that "roles" or "tasks" are tightly coupled (e.g. "games" should contain all system and hm options necessary to do games), and common (i.e. always wanted) configuration options are consolidated.
-- Look into [impermanence](https://nixos.wiki/wiki/Impermanence) for maximal reproducibility. 
-- Migrate desktop to nixos.
-- Build declarative browser configuration (possible with Zen?).
-- Build specialization for professional work.
+# Dotfiles: NixOS Configuration

dotfiles/flake.lock

@@ -277,11 +277,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1736372994,
-        "narHash": "sha256-iCb3+KniUL0Ic1AUkaM3CpO2UGNW6CQSigVzuVUQ8T0=",
+        "lastModified": 1736545605,
+        "narHash": "sha256-SoIi++cPQmOjpl+7mI4YvFsaUm3+g/ve9XxOIJA+Vt8=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "eb40cce45e6593a4065a32681d27c75c4ca3a9c9",
+        "rev": "8e52c6d12bde93fd02c83bf912547b70de50c6ac",
         "type": "github"
       },
       "original": {
@@ -501,11 +501,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1736370994,
-        "narHash": "sha256-0rt/+Ma9a3HMmvxziMMmUTb5dPu4gN+lSbW+K/zxG6o=",
+        "lastModified": 1736542519,
+        "narHash": "sha256-gGxZNtLLqDPtXB5OZbEltfLW5ZzB6zXGobcuKPt02lg=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "c9822b08f914da2997e8ef47c8bef8016e5ff313",
+        "rev": "cef09fbfe6624d2133d81be863bd48bcfc5939d3",
         "type": "github"
       },
       "original": {
@@ -731,11 +731,11 @@
     },
     "nixpkgs-unstable_2": {
       "locked": {
-        "lastModified": 1736012469,
-        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+        "lastModified": 1736344531,
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
         "type": "github"
       },
       "original": {
@@ -837,11 +837,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736203741,
-        "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=",
+        "lastModified": 1736515725,
+        "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773",
+        "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
         "type": "github"
       },
       "original": {
@@ -871,11 +871,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1736300250,
-        "narHash": "sha256-xyEutjs7pWQ7cLqfdTnhvWWeJ136wu6Jlxz5ez4htHE=",
+        "lastModified": 1736381946,
+        "narHash": "sha256-k66y4eMHZiJO3N43wuZOdoRmGmNwIj3EZq6NGK+AEM8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "743ad1da11fec9711f46c2fcf46e7142da0594cd",
+        "rev": "c62df1918d178ade64dc8a2df99e78a5d5f20514",
         "type": "github"
       },
       "original": {
@@ -1059,11 +1059,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1736267677,
-        "narHash": "sha256-7FH/gFShKOzf46yKqA4VWAaWxuyHBRnXOdaffbTxVo4=",
+        "lastModified": 1736520301,
+        "narHash": "sha256-yfbnywGJyx1n+xRet1P5T+6gOUVSbR0p9XasU/q7XjY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "c96c6a1ebf1bea782f9528dc316d986a6087ebc0",
+        "rev": "0c7995b493e72c642766fa7668651a5351299eb8",
         "type": "github"
       },
       "original": {

dotfiles/systems/desktop/desktop-environment.nix

@@ -249,79 +249,66 @@
     };
     programs.mangohud = {
       enable = true;
-      settings = {
-        fps = false;
-        fps_color_change = false;
-        fps_text = "";
-        fps_value = "59,239";
-        fps_metrics = false;
-
-        frame_timing = true;
-        frame_timing_detailed = false;
-        dynamic_frame_timing = true;
-        frametime = false;
-        histogram = true;
-        show_fps_limit = false;
-
-        gamemode = false;
-        present_mode = false;
-        vulkan_driver = false;
-        engine_version = false;
-        engine_short_names = false;
-
-        exec_name = false;
-        vkbasalt = false;
-        wine = false;
-        winesync = false;
-
-        cpu_text = "";
-        cpu_stats = false;
-        core_load = false;
-        core_bars = false;
-        cpu_power = false;
-        cpu_temp = false;
-
-        gpu_text = "";
-        gpu_stats = false;
-        gpu_power = false;
-        gpu_temp = false;
-        gpu_core_clock = false;
-        gpu_mem_clock = false;
-        gpu_fan = false;
-        gpu_voltage = false;
-        throttling_status = false;
-        throttling_status_graph = false;
-
-        procmem = false;
-        procmem_shared = false;
-        procmem_virt = false;
-        ram = false;
-        vram = false;
-        swap = false;
-
-        network = false;
-
-        time = false;
-        time_format = "%r";
-        time_no_label = true;
-
-        graphs = "";
-
-        toggle_hud = "Shift_R+F12";
-        toggle_logging = "Shift_L+F2";
-        toggle_hud_position = "Shift_R+F11";
-        toggle_preset = "Shift_R+F10";
-        toggle_fps_limit = "Shift_L+F1";
-        reload_cfg = "Shift_L+F4";
-        reload_log = "Shift_L+F3";
-        reset_fps_metrics = "Shift_R+F9";
-
-        output_folder = "/home/${sys.username}/.config/MangoHud";
-
-
-      };
       settingsPerApplication = {
-        Overwatch = {
+        wine-Overwatch = {
+          fps = false;
+          fps_color_change = false;
+          fps_text = "";
+          fps_value = "59,239";
+          fps_metrics = false;
+          frame_timing = true;
+          frame_timing_detailed = false;
+          dynamic_frame_timing = true;
+          frametime = false;
+          histogram = true;
+          show_fps_limit = false;
+          gamemode = false;
+          present_mode = false;
+          vulkan_driver = false;
+          engine_version = false;
+          engine_short_names = false;
+          exec_name = false;
+          vkbasalt = false;
+          wine = false;
+          winesync = false;
+          cpu_text = "";
+          cpu_stats = false;
+          core_load = false;
+          core_bars = false;
+          cpu_power = false;
+          cpu_temp = false;
+          gpu_text = "";
+          gpu_stats = false;
+          gpu_power = false;
+          gpu_temp = false;
+          gpu_core_clock = false;
+          gpu_mem_clock = false;
+          gpu_fan = false;
+          gpu_voltage = false;
+          throttling_status = false;
+          throttling_status_graph = false;
+          procmem = false;
+          procmem_shared = false;
+          procmem_virt = false;
+          ram = false;
+          vram = false;
+          swap = false;
+          network = false;
+          time = false;
+          time_format = "%r";
+          time_no_label = true;
+          graphs = "";
+
+          toggle_hud = "Shift_R+F12";
+          toggle_logging = "Shift_L+F2";
+          toggle_hud_position = "Shift_R+F11";
+          toggle_preset = "Shift_R+F10";
+          toggle_fps_limit = "Shift_L+F1";
+          reload_cfg = "Shift_L+F4";
+          reload_log = "Shift_L+F3";
+          reset_fps_metrics = "Shift_R+F9";
+          output_folder = "/home/${sys.username}/.config/MangoHud";
+
           width = 240;
           table_columns = 2;
           offset_x = 3;

projects/kernel-frametime-testing/Linux_6_12_2_zen1.Overwatch_2025-01-10_13-56-39_summary.csv

@@ -1,2 +1,2 @@
 0.1% Min FPS,1% Min FPS,97% Percentile FPS,Average FPS,GPU Load,CPU Load,Average Frame Time,Average GPU Temp,Average CPU Temp,Average VRAM Used,Average RAM Used,Average Swap Used,Peak GPU Load,Peak CPU Load,Peak GPU Temp,Peak CPU Temp,Peak VRAM Used,Peak RAM Used,Peak Swap Used
-121.9,140.6,458.7,282.2,77.1,38.1,3.5,71.0,73.0,4.2,12.2,0.0,85,40.5,72,74,4.3,12.2,0.0
+125.0,148.3,452.1,304.7,83.1,36.4,3.3,74.0,72.0,3.8,10.9,0.0,90,41.3,75,74,3.8,11.0,0.0

projects/kernel-frametime-testing/Linux_6_12_8.Overwatch_2025-01-10_13-44-23_summary.csv

@@ -0,0 +1,2 @@
+0.1% Min FPS,1% Min FPS,97% Percentile FPS,Average FPS,GPU Load,CPU Load,Average Frame Time,Average GPU Temp,Average CPU Temp,Average VRAM Used,Average RAM Used,Average Swap Used,Peak GPU Load,Peak CPU Load,Peak GPU Temp,Peak CPU Temp,Peak VRAM Used,Peak RAM Used,Peak Swap Used
+123.0,142.8,432.0,288.8,79.6,35.9,3.5,73.0,72.0,4.4,10.8,0.0,81,43.5,74,73,4.4,10.8,0.0