Merge branch 'main' of https://github.com/thilobillerbeck/dotfiles

Flake lock file updates:

• Updated input 'nixpkgs-update':
    'github:ryantm/nixpkgs-update/936918ca615c6c2479e0ec4eb0fce8ab5cb7b177?narHash=sha256-acWFwjzsrUgJUcUOVE1sErhR4e9ES45AbCJiaGC%2Bdfg%3D' (2024-04-28)
  → 'github:ryantm/nixpkgs-update/df23e62c3322a6471671ec8cb4ad0da36ab7f8a7?narHash=sha256-s77XshW%2B9EoghBWmOf0tFVQZ%2B8rX4%2BbOCz0StL%2BTkvQ%3D' (2024-04-28)
• Added input 'nixpkgs-update/runtimeDeps':
    'github:NixOS/nixpkgs/c8d7c8a78fb516c0842cc65346506a565c88014d?narHash=sha256-6dFKqP/aCKIdpOgqgIQUrRT0NOfVc14ftNcdELa4Pu4%3D' (2024-04-27)
• Added input 'nixpkgs-update/treefmt-nix':
    'github:numtide/treefmt-nix/49dc4a92b02b8e68798abd99184f228243b6e3ac?narHash=sha256-N3QDhoaX%2BpaWXHbEXZapqd1r95mdshxToGowtjtYkGI%3D' (2024-04-01)
• Added input 'nixpkgs-update/treefmt-nix/nixpkgs':
    follows 'nixpkgs-update/nixpkgs'

configs/fedora/home.nix

@@ -10,7 +10,7 @@ in {
     isGeneric = true;
     isGnome = false;
     noiseSuppression.enable = false;
-    isGraphical = false;
+    isGraphical = true;
   };
 
   fonts.fontconfig.enable = true;
@@ -18,9 +18,4 @@ in {
   nixpkgs.config.allowUnfree = true;
 
   nixGLPrefix = lib.getExe pkgs.nixgl.nixGLIntel;
-
-  home.packages = with pkgs; [
-    (nixGL insomnia)
-    (nixGL inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager)
-  ];
 }

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713273854,
+        "lastModified": 1714131597,
-        "narHash": "sha256-KNq2YJa9SsPKb7BvRtoJyyGKS4pw3TPKSTuhlj+sWCg=",
+        "narHash": "sha256-ucAlX+UadBzeNYRcbNhQ4Tey+0eGfRL2xlvL9whHhCA=",
         "owner": "dagger",
         "repo": "nix",
-        "rev": "dd0199825d18b6f47c692c4345dd28a6f6122958",
+        "rev": "1b634d4d8d78e50c6cbf8899238c946964b10249",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713906585,
+        "lastModified": 1714203603,
-        "narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=",
+        "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa",
+        "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e",
         "type": "github"
       },
       "original": {
@@ -263,14 +263,16 @@
     "nixpkgs-update": {
       "inputs": {
         "mmdoc": "mmdoc",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_3",
+        "runtimeDeps": "runtimeDeps",
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1712805493,
+        "lastModified": 1714270547,
-        "narHash": "sha256-hClY8qu4zwty2x37iiAlwTh9XaNEHzsPR5NvLLJL/gE=",
+        "narHash": "sha256-s77XshW+9EoghBWmOf0tFVQZ+8rX4+bOCz0StL+TkvQ=",
         "owner": "ryantm",
         "repo": "nixpkgs-update",
-        "rev": "fbd0e11caeb71d55ab880b09b9929cdc8e2e956e",
+        "rev": "df23e62c3322a6471671ec8cb4ad0da36ab7f8a7",
         "type": "github"
       },
       "original": {
@@ -281,11 +283,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1713714899,
+        "lastModified": 1714076141,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
         "type": "github"
       },
       "original": {
@@ -311,11 +313,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1713254108,
+        "lastModified": 1713805509,
-        "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=",
+        "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00",
+        "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4",
         "type": "github"
       },
       "original": {
@@ -338,17 +340,33 @@
         "w17": "w17"
       }
     },
+    "runtimeDeps": {
+      "locked": {
+        "lastModified": 1714247354,
+        "narHash": "sha256-6dFKqP/aCKIdpOgqgIQUrRT0NOfVc14ftNcdELa4Pu4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c8d7c8a78fb516c0842cc65346506a565c88014d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "suyu": {
       "inputs": {
         "flake-utils": "flake-utils_3",
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1713412554,
+        "lastModified": 1714016451,
-        "narHash": "sha256-jl6MEqKa+mc511xkj2X2q1jKqc8ndi/WcGSYVcH7j/0=",
+        "narHash": "sha256-7dvQhBvf8IGL2djRtVeWFLqo+AK7cvYxyj8PDJ/qvh0=",
         "owner": "Noodlez1232",
         "repo": "suyu-flake",
-        "rev": "5b5b36c4896820b632bf57e5fe7f238d8ad097c7",
+        "rev": "b3904f149f124bc485e1cb61b4e824ed9ec5c7e7",
         "type": "github"
       },
       "original": {
@@ -402,6 +420,27 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-update",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711963903,
+        "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems_3"

home-manager/modules/machine.nix

@@ -126,16 +126,6 @@ with lib; {
             ${pkgs.nodejs}/bin/npm config set prefix ${config.home.homeDirectory}/.node-global
           '';
         };
-      } // mkIf (config.machine.isGeneric && config.machine.isGraphical) {
-        linkDesktopApplications = {
-          after = [ "writeBoundary" "createXdgUserDirectories" ];
-          before = [ ];
-          data = ''
-            for dir in ${config.home.homeDirectory}/.nix-profile/share/applications/*; do
-              chmod +x $(realpath $dir) -v
-            done
-          '';
-        };
       };
       sessionPath = [ "${config.home.homeDirectory}/.node-global/bin" ];
     };

home-manager/modules/packages.nix

@@ -2,9 +2,11 @@
 
 with lib;
 let
+  nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
   electronFlags =
     "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
-in {
+in
+{
   config = {
     nixpkgs.overlays = [
       (_: prev: {
@@ -76,60 +78,70 @@ in {
         nix-output-monitor
         nodePackages.pnpm
         npm-check-updates
-      ] ++ (if config.machine.isGraphical then [
+      ] ++ (
-        corefonts
+        if (
-        vistafonts
+          config.machine.isGraphical
-        jetbrains.webstorm
+        ) then [
-        jetbrains.phpstorm
+          (nixGL insomnia)
-        jetbrains.rust-rover
-        jetbrains.goland
-        element-desktop
-        ludusavi
-        dbeaver
-        insomnia
-        onlyoffice-bin
-        spotify
-        vesktop
-        (lutris.override {
-          extraLibraries = _: [ gnome3.adwaita-icon-theme ];
-          extraPkgs = _: [
-            wineWowPackages.full
-            winetricks
-            gnome3.adwaita-icon-theme
-          ];
-        })
-        bottles
-        protontricks
-        heroic
-        (vscode.override { commandLineArgs = electronFlags; })
-        quickemu
-        quickgui
-        trilium-desktop
-        anki
-        inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
-        jetbrains-toolbox
-        mumble
-        prusa-slicer
-        trayscale
-        gnome.gnome-disk-utility
-        inkscape
-        musescore
-        obsidian
-        syncthingtray
-        reaper
-        yabridge
-        inputs.suyu.packages.x86_64-linux.suyu
-        inputs.nix-alien.packages.x86_64-linux.nix-alien
-        kdePackages.kdenlive
-        audacity
-      ] else
-        [ ]) ++ (if config.machine.isGnome then [
-          gnomeExtensions.blur-my-shell
-          gnomeExtensions.dash-to-panel
-          gnomeExtensions.user-themes
-          gnomeExtensions.vitals
-          gnomeExtensions.custom-accent-colors
         ] else
-          [ ]);
+          [ ]
+      ) ++ (
+        if (
+          config.machine.isGraphical && !config.machine.isGeneric
+        ) then [
+          corefonts
+          vistafonts
+          jetbrains.webstorm
+          jetbrains.phpstorm
+          jetbrains.rust-rover
+          jetbrains.goland
+          element-desktop
+          ludusavi
+          dbeaver
+          onlyoffice-bin
+          spotify
+          vesktop
+          (lutris.override {
+            extraLibraries = _: [ gnome3.adwaita-icon-theme ];
+            extraPkgs = _: [
+              wineWowPackages.full
+              winetricks
+              gnome3.adwaita-icon-theme
+            ];
+          })
+          bottles
+          protontricks
+          heroic
+          (vscode.override { commandLineArgs = electronFlags; })
+          quickemu
+          quickgui
+          trilium-desktop
+          anki
+          # inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
+          jetbrains-toolbox
+          mumble
+          prusa-slicer
+          trayscale
+          gnome.gnome-disk-utility
+          inkscape
+          musescore
+          obsidian
+          syncthingtray
+          reaper
+          yabridge
+          inputs.suyu.packages.x86_64-linux.suyu
+          inputs.nix-alien.packages.x86_64-linux.nix-alien
+          kdePackages.kdenlive
+          audacity
+        ] else
+          [ ]
+      ) ++ (if config.machine.isGnome then [
+        gnomeExtensions.blur-my-shell
+        gnomeExtensions.dash-to-panel
+        gnomeExtensions.user-themes
+        gnomeExtensions.vitals
+        gnomeExtensions.custom-accent-colors
+      ] else
+        [ ]);
   };
 }

home-manager/programs/alacritty.nix

@@ -1,8 +1,11 @@
 { config, pkgs, lib, ... }:
 
-{
+let
+  nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
+in {
   programs.alacritty = {
     enable = if config.machine.isGraphical then true else false;
+    package = (nixGL pkgs.alacritty);
     settings = {
       window = {
         decorations = "full";

home-manager/programs/chromium.nix

@@ -19,7 +19,7 @@ let
     "bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
     "kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
   ];
-  isEnabled = if config.machine.isGraphical then true else false;
+  isEnabled = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
   dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
   commandLineArgs = [
     "--enable-wayland-ime"

home-manager/programs/firefox.nix

@@ -2,6 +2,6 @@
 
 {
   programs.firefox = {
-    enable = if config.machine.isGraphical then true else false;
+    enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
   };
 }

home-manager/programs/mpv.nix

@@ -2,7 +2,7 @@
 
 {
   programs.mpv = {
-    enable = if config.machine.isGraphical then true else false;
+    enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
     scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ];
   };
 }