[emacs] Add org/projects agenda directory

This was changed in a new version of nix

flake.lock

@@ -1,5 +1,44 @@
 {
   "nodes": {
+    "doomemacs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733434763,
+        "narHash": "sha256-sebujw5VvBWMS+wXyjiGF81iyjPM/QQDnw5l7tDJCvk=",
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "rev": "ba1dca322f9a07bc2b7bec6a98f2c3c55c0bbd77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "type": "github"
+      }
+    },
+    "emacs-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-doom-emacs-unstraightened"
+        ],
+        "nixpkgs-stable": [
+          "nix-doom-emacs-unstraightened"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734315266,
+        "narHash": "sha256-k6ekQwIK/TASoPwTyeY2JiBHzwmPZSLGrYNXF+fLhC8=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "fce2b6224adae5f9b6d43d74ecb996a3133a63f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728041527,
+        "lastModified": 1734344598,
-        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
+        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
+        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
         "type": "github"
       },
       "original": {
@@ -20,13 +59,36 @@
         "type": "github"
       }
     },
+    "nix-doom-emacs-unstraightened": {
+      "inputs": {
+        "doomemacs": "doomemacs",
+        "emacs-overlay": "emacs-overlay",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1734338553,
+        "narHash": "sha256-KEuh2nsgl8iiPWMg4wfrnCoZqPssw6dbMCy9MheLJZg=",
+        "owner": "marienz",
+        "repo": "nix-doom-emacs-unstraightened",
+        "rev": "728040b0b7c2c0baa47fb3365b57bd3e1658207a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "marienz",
+        "repo": "nix-doom-emacs-unstraightened",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727802920,
+        "lastModified": 1734119587,
-        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
         "type": "github"
       },
       "original": {
@@ -36,26 +98,35 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1725762081,
+        "lastModified": 1733858086,
-        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
+        "narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=",
-        "owner": "NixOS",
+        "owner": "nix-community",
-        "repo": "nixpkgs",
+        "repo": "plasma-manager",
-        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
+        "rev": "7e2010249529931a3848054d5ff0dbf24675ab68",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nix-community",
-        "ref": "release-24.05",
+        "repo": "plasma-manager",
-        "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
         "nixpkgs": "nixpkgs",
+        "plasma-manager": "plasma-manager",
         "sops-nix": "sops-nix"
       }
     },
@@ -63,15 +134,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1727423009,
+        "lastModified": 1733965552,
-        "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=",
+        "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "127a96f49ddc377be6ba76964411bab11ae27803",
+        "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
         "type": "github"
       },
       "original": {
@@ -79,6 +149,21 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -13,6 +13,17 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    plasma-manager = {
+      url = "github:nix-community/plasma-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
+
+    nix-doom-emacs-unstraightened = {
+      url = "github:marienz/nix-doom-emacs-unstraightened";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, ... } @ inputs: let
@@ -23,6 +34,10 @@
       {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
+        home-manager.sharedModules = [
+          inputs.plasma-manager.homeManagerModules.plasma-manager
+          inputs.nix-doom-emacs-unstraightened.hmModule
+        ];
       }
     ];
   in {
@@ -33,8 +48,6 @@
         ./machines/z790prors/configuration.nix
         {
           home-manager.users.johno = import ./home/home-z790prors.nix;
-          home-manager.extraSpecialArgs.customPkgs =
-            nixpkgs.legacyPackages."${system}".callPackage ./packages {};
         }
       ];
     };
@@ -45,8 +58,6 @@
         ./machines/nix-book/configuration.nix
         {
           home-manager.users.johno = import ./home/home-nix-book.nix;
-          home-manager.extraSpecialArgs.customPkgs =
-            nixpkgs.legacyPackages."${system}".callPackage ./packages {};
         }
       ];
     };
@@ -58,8 +69,6 @@
         inputs.home-manager.nixosModules.home-manager
         {
           home-manager.users.johno = import ./home/home-default.nix;
-          home-manager.extraSpecialArgs.customPkgs =
-            nixpkgs.legacyPackages."${system}".callPackage ./packages {};
         }
       ];
     };

home/home-default.nix

@@ -1,5 +1,8 @@
 { pkgs, customPkgs, ... }:
 
+let
+  customPkgs = pkgs.callPackage ../packages {};
+in
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
@@ -95,6 +98,7 @@
   #  /etc/profiles/per-user/johno/etc/profile.d/hm-session-vars.sh
   #
   home.sessionVariables = {
+    ENABLE_GAMESCOPE_WSI = "1";
   };
 
   home.sessionPath = [
@@ -104,8 +108,9 @@
 
   imports = [
     ./modules/emacs
-    ./modules/lutris
     ./modules/i3+sway
+    ./modules/lutris
+    ./modules/plasma-manager
   ];
 
   programs.bash.enable = true;

home/home-nix-book.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ./home-default.nix
-    ./modules/hyprland/nix-book.nix
   ];
 
   home.i3_sway.extraSwayConfig = {

home/home-z790prors.nix

@@ -3,6 +3,5 @@
 {
   imports = [
     ./home-default.nix
-    ./modules/hyprland/z790prors.nix
   ];
 }

home/modules/emacs/default.nix

@@ -2,21 +2,15 @@
 
 with lib;
 
-let
+{
-  doomSync = (let
-    git = pkgs.git;
-  in ''
-    export PATH=${pkgs.emacs}/bin:${git}/bin:$PATH
-    ${config.xdg.configHome}/emacs/bin/doom sync -u -j $((`nproc`/4*3))
-  '');
-in {
   config = {
     home.packages = [
       pkgs.emacs-all-the-icons-fonts
       pkgs.fontconfig
       pkgs.graphviz
       pkgs.isort
-      pkgs.nerdfonts
+      pkgs.nerd-fonts.fira-code
+      pkgs.nerd-fonts.droid-sans-mono
       pkgs.nil # nix lsp language server
       pkgs.nixfmt-rfc-style
       (pkgs.ripgrep.override {withPCRE2 = true;})
@@ -25,43 +19,15 @@ in {
       pkgs.python3
     ];
 
+    programs.doom-emacs = {
+      enable = true;
+      doomDir = ./doom;
+    };
+
     fonts.fontconfig.enable = true;
 
-    home.file = {
-      ".config/emacs" = {
-        source = fetchGit {
-          url = "https://github.com/doomemacs/doomemacs.git";
-          # When updating me, remember to run `doom sync`
-          rev = "5ad99220b86ae1bf421861dfad24492d768ac4d9";
-        };
-        # We need to use recursive mode here or else doom fails to sync for
-        # some reason related to the permissions on the synced path. I'm not
-        # quite sure of everything that's going on here.
-        recursive = true;
-
-        # Because `recursive = true` will cause this to sync every single
-        # activation, we turn this off here.
-        #
-        # There's probably a way we could do better detection of this within
-        # our onChange shell?
-        #
-        # onChange = doomSync;
-      };
-    };
-
     home.sessionVariables = {
-      DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
       EDITOR = "emacs -nw";
     };
-
-    home.sessionPath = [
-      "${config.xdg.configHome}/emacs/bin"
-    ];
-
-    xdg.configFile."doom" = {
-      source = ./doom;
-      # Sync doom if we updated the config
-      onChange = doomSync;
-    };
   };
 }

home/modules/emacs/doom/config.el

@@ -28,6 +28,7 @@
 ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
 ;; refresh your font settings. If Emacs still can't find your font, it likely
 ;; wasn't installed correctly. Font issues are rarely Doom issues!
+(setq doom-font (font-spec :family "Fira Code"))
 
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
@@ -43,7 +44,11 @@
 (setq org-directory "~/org/")
 (after! org
   (setq org-agenda-span 'week
-        org-agenda-files `(,org-directory ,(concat org-directory "roam/"))
+        my-agenda-dirs '("projects" "roam")
+        org-agenda-files (cons org-directory (mapcan (lambda (x) (directory-files-recursively
+                                                                  (expand-file-name x org-directory)
+                                                                  "\.org$"))
+                                                     my-agenda-dirs))
         org-log-done 'time
         org-agenda-custom-commands '(("n" "Agenda"
                                       ((agenda "")

home/modules/emacs/doom/init.el

@@ -149,7 +149,7 @@
        ;;lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
-       (nix +tree-sitter +lsp)               ; I hereby declare "nix geht mehr!"
+       (nix +tree-sitter)               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        (org +roam2)               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother

home/modules/hyprland/default.nix

@@ -1,94 +0,0 @@
-{ inputs, ... }:
-
-{
-  imports = [
-    ./hyprpaper.nix
-  ];
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    plugins = [ inputs.hy3.packages.x86_64-linux.hy3 ];
-    settings = {
-      "$mod" = "SUPER";
-      "$terminal" = "kitty";
-      "$fileManager" = "dolphin";
-      "$menu" = "wofi --show drun";
-
-      exec-once = [
-        "waybar"
-        "dunst"
-      ];
-
-      xwayland = {
-        force_zero_scaling = true;
-      };
-
-      input = {
-        kb_layout = "us";
-        kb_options = "caps:escape";
-        follow_mouse = 1;
-        touchpad.natural_scroll = false;
-      };
-
-      windowrulev2 = [
-        # I can guess, but I should figure out what this actually does
-        "suppressevent maximize, class:.*"
-      ];
-
-      general.layout = "hy3";
-
-      bind =
-        [
-          "SHIFT_$mod, Q, killactive"
-          "SHIFT_$mod, M, exit"
-
-          "$mod, D, exec, $menu"
-          "$mod, Return, exec, $terminal"
-
-          "$mod, H, hy3:movefocus, l"
-          "$mod, L, hy3:movefocus, r"
-          "$mod, K, hy3:movefocus, u"
-          "$mod, J, hy3:movefocus, d"
-
-          "SHIFT_$mod, H, hy3:movewindow, l"
-          "SHIFT_$mod, L, hy3:movewindow, r"
-          "SHIFT_$mod, K, hy3:movewindow, u"
-          "SHIFT_$mod, J, hy3:movewindow, d"
-
-          "$mod, V, hy3:makegroup, opposite"
-          "$mod, W, hy3:changegroup, toggletab"
-
-          "$mod, A, hy3:changefocus, raise"
-          "SHIFT_$mod, A, hy3:changefocus, lower"
-
-          "$mod, M, fullscreen, 0"
-          "$mod, E, hy3:expand, expand"
-          "SHIFT_$mod, E, hy3:expand, base"
-
-          "$mod, Q, hy3:warpcursor"
-        ]
-        ++ (
-          # workspaces
-          # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-          builtins.concatLists (builtins.genList (
-            x: let
-              ws = let
-                c = (x + 1) / 10;
-              in
-                builtins.toString (x + 1 - (c * 10));
-            in [
-              "$mod, ${ws}, workspace, ${toString (x + 1)}"
-              "$mod SHIFT, ${ws}, hy3:movetoworkspace, ${toString (x + 1)}"
-            ]
-          )
-            10)
-        );
-
-      bindm =
-        [
-          "$mod, mouse:272, movewindow"
-          "$mod, mouse:273, resizewindow"
-        ];
-    };
-  };
-}

home/modules/hyprland/hyprpaper.nix

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      ipc = "on";
-      splash = false;
-      preload = [
-        "${config.xdg.dataHome}/wallpaper.jpg"
-      ];
-      wallpaper = [
-        ",${config.xdg.dataHome}/wallpaper.jpg"
-      ];
-    };
-  };
-
-  xdg.dataFile."wallpaper.jpg" = {
-    source = ./wallpaper.jpg;
-  };
-}

home/modules/hyprland/nix-book.nix

@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  wayland.windowManager.hyprland.settings.monitor = ",preferred,2880x1800@90.00Hz,1.33333";
-}

home/modules/hyprland/z790prors.nix

@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  wayland.windowManager.hyprland.settings.monitor = "DP-1,3440x1440@164.90,0x0,1.33333,vrr,1";
-  wayland.windowManager.hyprland.settings.env = [
-    "LIBVA_DRIVER_NAME,nvidia"
-    "XDG_SESSION_TYPE,wayland"
-    "GBM_BACKEND,nvidia-drm"
-    "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-    "NVD_BACKEND,direct"
-    "ELECTRON_OZONE_PLATFORM_HINT,auto"
-    "NIXOS_OZONE_WL,1"
-  ];
-
-  wayland.windowManager.hyprland.settings.cursor.no_hardware_cursors = true;
-}

home/modules/i3+sway/default.nix

@@ -6,13 +6,13 @@ let
   cfg = config.home.i3_sway;
   i3_cfg = config.xsession.windowManager.i3.config;
 
-  shared_config = recursiveUpdate {
+  shared_config = recursiveUpdate rec {
     modifier = "Mod4";
     terminal = "kitty";
     defaultWorkspace = "workspace number 1";
 
     keybindings = {
-      "${shared_config.modifier}+Return" = "exec ${i3_cfg.terminal}";
+      "${shared_config.modifier}+Return" = "exec ${terminal}";
       "${shared_config.modifier}+Shift+q" = "kill";
       "${shared_config.modifier}+d" = "exec ${i3_cfg.menu}";
 
@@ -129,6 +129,13 @@ in {
           "type:keyboard" = {
             xkb_options = "caps:escape";
           };
+          "type:touchpad" = {
+            tap = "enabled";
+            tap_button_map = "lrm";
+            drag = "enabled";
+            natural_scroll = "disabled";
+            dwt = "enabled";
+          };
         };
       };
     in {

home/modules/plasma-manager/default.nix

@@ -0,0 +1,127 @@
+{ config, lib, pkgs, ... }:
+
+
+# The current KDE config can be output with the command:
+# nix run github:nix-community/plasma-manager
+#
+# Plasma-manager options documentation
+# https://nix-community.github.io/plasma-manager/options.xhtml
+#
+# TODO: (ambitious) Add Kmail support to plasma-manager
+{
+  programs.plasma = {
+    enable = true;
+    overrideConfig = true;
+
+    hotkeys.commands."launch-konsole" = {
+      name = "Launch Konsole";
+      key = "Meta+Return";
+      command = "konsole";
+    };
+
+    shortcuts = {
+      kmix = {
+        "decrease_microphone_volume" = "Microphone Volume Down";
+        "decrease_volume" = "Volume Down";
+        "decrease_volume_small" = "Shift+Volume Down";
+        "increase_microphone_volume" = "Microphone Volume Up";
+        "increase_volume" = "Volume Up";
+        "increase_volume_small" = "Shift+Volume Up";
+        "mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
+        "mute" = "Volume Mute";
+      };
+
+      mediacontrol = {
+        "mediavolumedown" = "none,,Media volume down";
+        "mediavolumeup" = "none,,Media volume up";
+        "nextmedia" = "Media Next";
+        "pausemedia" = "Media Pause";
+        "playmedia" = "none,,Play media playback";
+        "playpausemedia" = "Media Play";
+        "previousmedia" = "Media Previous";
+        "stopmedia" = "Media Stop";
+      };
+
+      ksmserver = {
+        "Lock Session" = ["Meta+Ctrl+Q" "Screensaver" "Screensaver,Lock Session"];
+      };
+
+      kwin = {
+        "Window Close" = "Meta+Shift+Q";
+        "Kill Window" = "Meta+Ctrl+Esc";
+        "Window Operations Menu" = "Alt+F3";
+        "Window Resize" = "Meta+R,,Resize Window";
+
+        "Overview" = "Meta+W";
+        "Grid View" = "Meta+G";
+        "Edit Tiles" = "Meta+T";
+
+        "Activate Window Demanding Attention" = "Meta+Ctrl+A";
+
+        "Show Desktop" = "Meta+D";
+
+        "Walk Through Windows" = "Alt+Tab";
+        "Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
+        "Walk Through Windows of Current Application" = "Alt+`";
+        "Walk Through Windows of Current Application (Reverse)" = "Alt+~";
+        "Window Fullscreen" = "Meta+Shift+F,,Make Window Fullscreen";
+
+        "Window Quick Tile Bottom" = "Meta+Down";
+        "Window Quick Tile Left" = "Meta+Left";
+        "Window Quick Tile Right" = "Meta+Right";
+        "Window Quick Tile Top" = "Meta+Up";
+
+        "view_actual_size" = "Meta+0";
+        "view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
+        "view_zoom_out" = "Meta+-";
+      };
+      "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down";
+      "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down";
+      "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down";
+      "org_kde_powerdevil"."Hibernate" = "Hibernate";
+      "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up";
+      "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up";
+      "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up";
+      "org_kde_powerdevil"."PowerDown" = "Power Down";
+      "org_kde_powerdevil"."PowerOff" = "Power Off";
+      "org_kde_powerdevil"."Sleep" = "Sleep";
+      "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off";
+      "org_kde_powerdevil"."Turn Off Screen" = [ ];
+      "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"];
+
+      plasmashell = {
+        "activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
+        "activate task manager entry 1" = "none,,";
+        "activate task manager entry 2" = "none,,";
+        "activate task manager entry 3" = "none,,";
+        "activate task manager entry 4" = "none,,";
+        "activate task manager entry 5" = "none,,";
+        "activate task manager entry 6" = "none,,";
+        "activate task manager entry 7" = "none,,";
+        "activate task manager entry 8" = "none,,";
+        "activate task manager entry 9" = "none,,";
+        "activate task manager entry 10" = "none,,";
+        "show activity switcher" = "none,,";
+      };
+    };
+
+    configFile = {
+      kwinrc.Desktops.Number = {
+        value = 10;
+        immutable = true;
+      };
+
+      kcminputrc.Libinput = {
+        AccelerationProfile = "adaptive";
+        PointerAcceleration = 0.5;
+      };
+
+      kcminputrc.Mouse = {
+        X11LibInputXAccelProfileFlat = false;
+        XLbInptAccelProfileFlat = false;
+      };
+
+      kdeglobals.KDE.LookAndFeelPackage = "org.kde.breezedark.desktop";
+    };
+  };
+}

machines/nix-book/configuration.nix

@@ -12,9 +12,13 @@
   roles = {
     audio.enable = true;
     bluetooth.enable = true;
-    desktop.enable = true;
+    desktop = {
+      enable = true;
+      waylandOnly = true;
+    };
     nfs-mounts.enable = true;
     printing.enable = true;
+    spotifyd.enable = true;
     users = {
       enable = true;
       extraGroups = [ "video" ];

machines/z790prors/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, modulesPath, ... }:
+{ config, lib, modulesPath, pkgs, ... }:
 
 {
   imports =
@@ -15,6 +15,11 @@
     "nvidia_uvm"
     "nvidia_drm"
   ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelParams = [
+    "nvidia_drm.fbdev=1"
+    "nvidia_drm.modeset=1"
+  ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
@@ -28,7 +33,19 @@
     powerManagement.finegrained = false;
     open = false;
     nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.production;
+    package = config.boot.kernelPackages.nvidiaPackages.latest;
+    #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      #version = "555.58";
+
+      #sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew=";
+      #sha256_aarch64 = lib.fakeSha256;
+      #openSha256 = lib.fakeSha256;
+      #settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M=";
+      #persistencedSha256 = lib.fakeSha256;
+    #};
+  };
+  environment.sessionVariables = {
+    KWIN_DRM_ALLOW_NVIDIA_COLORSPACE = "1";
   };
 
   fileSystems."/" =
@@ -41,13 +58,16 @@
       fsType = "vfat";
     };
 
-  fileSystems."/arch" =
-    { device = "/dev/disk/by-label/endeavouros";
-      fsType = "btrfs";
-    };
-
   swapDevices = [ ];
 
+  services.beesd.filesystems = {
+    root = {
+      spec = "LABEL=nixos";
+      hashTableSizeMB = 4096;
+      verbosity = "crit";
+    };
+  };
+
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

packages/default.nix

@@ -1,4 +1,6 @@
 { pkgs, ... }:
 {
   nextcloudTalkDesktop = pkgs.callPackage ./nextcloud-talk-desktop {};
+  modrinthNvidia = pkgs.callPackage ./modrinth-nvidia {};
+  vulkanHDRLayer = pkgs.callPackage ./vulkan-hdr-layer {};
 }

packages/modrinth-nvidia/default.nix

@@ -0,0 +1,43 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.stdenv.mkDerivation {
+  pname = "modrinth-nvidia";
+  version = "0.1.0";
+  src = null;
+  dontUnpack = true;
+  dontBuild = true;
+  dontConfigure = true;
+
+  nativeBuildInputs = [ pkgs.makeWrapper
+                        pkgs.modrinth-app ];
+
+  # Propagate the required Java versions so they are available at runtime
+  propagatedBuildInputs = [
+    pkgs.openjdk8
+    pkgs.openjdk17
+    pkgs.openjdk21
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    # Copy the original binary
+    cp ${pkgs.modrinth-app}/bin/ModrinthApp $out/bin/modrinth-nvidia-real
+    chmod +x $out/bin/modrinth-nvidia-real
+
+    # Wrap the binary with makeWrapper, producing a new script at 'modrinth-nvidia'
+    makeWrapper $out/bin/modrinth-nvidia-real $out/bin/modrinth-nvidia \
+      --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
+      --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/modrinth-nvidia.desktop <<EOF
+[Desktop Entry]
+Name=Modrinth (NVIDIA)
+Comment=Launch Modrinth with environment variables tuned for NVIDIA systems
+Exec=$out/bin/modrinth-nvidia
+Icon=modrinth-app
+Terminal=false
+Type=Application
+Categories=Game;
+EOF
+  '';
+}

packages/nextcloud-talk-desktop/default.nix

@@ -1,39 +1,40 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchzip
+  stdenv,
-, autoPatchelfHook
+  fetchzip,
-
+  autoPatchelfHook,
-, nss
+  nss,
-, cairo
+  cairo,
-, xorg
+  xorg,
-, libxkbcommon
+  libxkbcommon,
-, alsa-lib
+  alsa-lib,
-, at-spi2-core
+  at-spi2-core,
-, mesa
+  mesa,
-, pango
+  pango,
-, libdrm
+  libdrm,
-, vivaldi-ffmpeg-codecs
+  vivaldi-ffmpeg-codecs,
-, gtk3
+  gtk3,
-, libGL
+  libGL,
-, libglvnd
+  libglvnd,
-, systemd
+  systemd,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: rec {
   pname = "nextcloud-talk-desktop";
-  version = "0.29.0";
+  version = "0.39.0";
 
   # Building from source would require building also building Server and Talk components
   # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
   src = fetchzip {
     url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64-${finalAttrs.version}.zip";
-    hash = "sha256-fBIeNv8tfrVTFExLQDBPhIazvbsJ7a76+W9G0cuQDlw=";
+    hash = "sha256-f8X6I2Je9wgstMTuYGaX7AXAqpZC92RUAltDVsHr9Vo=";
     stripRoot = false;
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];
 
-  buildInputs = [
+  buildInputs =
+    [
       nss
       cairo
       alsa-lib
@@ -46,7 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
       mesa
       libGL
       libglvnd
-  ] ++ (with xorg; [libX11 libXcomposite libXdamage libXrandr libXfixes libXcursor]);
+    ]
+    ++ (with xorg; [
+      libX11
+      libXcomposite
+      libXdamage
+      libXrandr
+      libXfixes
+      libXcursor
+    ]);
 
   # Required to launch the application and proceed past the zygote_linux fork() process
   # Fixes `Zygote could not fork`
@@ -55,25 +64,23 @@ stdenv.mkDerivation (finalAttrs: {
   preInstall = ''
     mkdir -p $out/bin
     mkdir -p $out/opt
-
     cp -r $src/* $out/opt/
   '';
 
   installPhase = ''
     runHook preInstall
-
     # Link the application in $out/bin away from contents of `preInstall`
-    ln -s "$out/opt/Nextcloud Talk-linux-x64/Nextcloud Talk" $out/bin/${finalAttrs.pname}
+    ln -s "$out/opt/Nextcloud Talk" $out/bin/nextcloud-talk-desktop
-
     runHook postInstall
   '';
 
   meta = with lib; {
-    description = "Nextcloud Talk Desktop Client Preview";
+    description = "Nextcloud Talk Desktop Client";
     homepage = "https://github.com/nextcloud/talk-desktop";
     changelog = "https://github.com/nextcloud/talk-desktop/blob/${finalAttrs.version}/CHANGELOG.md";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ kashw2 ];
-    mainProgram = finalAttrs.pname;
+    mainProgram = "nextcloud-talk-desktop";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
 })

packages/vulkan-hdr-layer/default.nix

@@ -0,0 +1,34 @@
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, vulkan-loader, ninja, writeText, vulkan-headers, vulkan-utility-libraries,  jq, libX11, libXrandr, libxcb, wayland, wayland-scanner }:
+
+stdenv.mkDerivation rec {
+  pname = "vulkan-hdr-layer";
+  version = "63d2eec";
+
+  src = (fetchFromGitHub {
+    owner = "Zamundaaa";
+    repo = "VK_hdr_layer";
+    rev = "869199cd2746e7f69cf19955153080842b6dacfc";
+    fetchSubmodules = true;
+    hash = "sha256-xfVYI+Aajmnf3BTaY2Ysg5fyDO6SwDFGyU0L+F+E3is=";
+  }).overrideAttrs (_: {
+    GIT_CONFIG_COUNT = 1;
+    GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
+    GIT_CONFIG_VALUE_0 = "git@github.com:";
+  });
+
+  nativeBuildInputs = [ vulkan-headers meson ninja pkg-config jq ];
+
+  buildInputs = [ vulkan-headers vulkan-loader vulkan-utility-libraries libX11 libXrandr libxcb wayland wayland-scanner ];
+
+  # Help vulkan-loader find the validation layers
+  setupHook = writeText "setup-hook" ''
+    addToSearchPath XDG_DATA_DIRS @out@/share
+  '';
+
+  meta = with lib; {
+    description = "Layers providing Vulkan HDR";
+    homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+}

roles/default.nix

@@ -1,10 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
-let
-  cfg = config.roles;
-in
 {
   imports = [
     ./audio
@@ -19,10 +16,6 @@ in
     ./virtualisation
   ];
 
-  options.roles = {
-    enable = mkEnableOption "Enable roles";
-  };
-
   config = {
     i18n.defaultLocale = "en_US.UTF-8";
     i18n.extraLocaleSettings = {
@@ -38,16 +31,26 @@ in
     };
     time.timeZone = "America/Los_Angeles";
 
+    # Don't go to emergency mode if we aren't able to mount filesystems.
+    # This is silly if you have multiple hard drives or partitions
+    # configured on a machine and then one goes away intentionally or
+    # unintentionally. If the system is already booting, let it continue
+    # to try and boot.
+    systemd.enableEmergencyMode = false;
+
     # Enable the OpenSSH daemon.
     services.openssh.enable = true;
 
     environment.systemPackages = with pkgs; [
-      vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
       git
+      pciutils
+      tree
+      usbutils
+      vim
     ];
 
     nix = {
-      package = pkgs.nixFlakes;
+      package = pkgs.nix;
       distributedBuilds = true;
       buildMachines = [{
         hostName = "z790prors.oglehome";
@@ -63,12 +66,14 @@ in
         max-jobs = "auto";
         trusted-users = [ "johno" ];
         substituters = [
-          "https://hyprland.cachix.org"
-        ];
-        trusted-public-keys = [
-          "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         ];
       };
+
+      gc = {
+        automatic = true;
+        randomizedDelaySec = "14m";
+        options = "--delete-older-than 10d";
+      };
     };
 
     nixpkgs.config.allowUnfree = true;

roles/desktop/default.nix

@@ -5,12 +5,21 @@ with lib;
 let
   cfg = config.roles.desktop;
 
+  customPackages = pkgs.callPackage ../../packages {};
+
   basePackages = with pkgs; [
+    bambu-studio
+    blender
     brightnessctl
+    mangohud # Should probably get refactored with steam/gamescope out to a gaming role
+    modrinth-app
+    protonup-qt
+
+    #customPackages.vulkanHDRLayer
   ];
 
   x11BasePackages = with pkgs; [
-
+    customPackages.modrinthNvidia
   ];
 
   x11OnlyPackages = with pkgs; [
@@ -35,9 +44,13 @@ in
       type = types.bool;
       default = false;
     };
+    waylandOnly = mkOption {
+      type = types.bool;
+      default = false;
+    };
   };
 
-  config =
+  config = mkIf cfg.enable
     {
       services.xserver.xkb = {
         layout = "us";
@@ -71,10 +84,41 @@ in
 
       programs.kdeconnect.enable = true;
       programs.java.enable = true;
+      programs.gamemode = {
+        enable = true;
+
+      };
+      programs.gamescope = {
+        enable = true;
+        #capSysNice = true;
+        args = [
+          #"--adaptive-sync"
+          #"--nested-refresh 165"
+          #"--backend wayland"
+          "--hdr-enabled"
+          "--hdr-itm-enable"
+          "--hdr-debug-force-output"
+          "--mangoapp"
+          "--rt"
+          "--steam"
+          #"--xwayland-count 2"
+        ];
+        env = {
+          #PROTON_DISABLE_NVAPI = "1";
+          MANGOHUD = "1";
+          #MANGOHUD_CONFIG = "cpu_temp gpu_temp ram vram";
+        };
+      };
       programs.steam = {
         enable = true;
         remotePlay.openFirewall = true;
         localNetworkGameTransfers.openFirewall = true;
+        gamescopeSession = {
+          enable = true;
+        };
+        extraCompatPackages = with pkgs; [
+          proton-ge-bin
+        ];
         #package = pkgs.steam.override {
         #withJava = true;
         #withPrimus = true;
@@ -83,7 +127,7 @@ in
       };
       services.sunshine = {
         enable = true;
-        autoStart = true;
+        autoStart = false;
         capSysAdmin = true;
         openFirewall = true;
       };
@@ -93,11 +137,10 @@ in
 
       environment.systemPackages = with pkgs; mkMerge [
         basePackages
-        x11BasePackages
+        (mkIf (!cfg.waylandOnly) x11BasePackages)
         (mkIf cfg.x11Only x11OnlyPackages)
-        # TODO: Do we need a "wayland only" mode?
         (mkIf (!cfg.x11Only) waylandBasePackages)
-        (mkIf (!cfg.x11Only) waylandOnlyPackages)
+        (mkIf (cfg.waylandOnly) waylandOnlyPackages)
       ];
     };
 

roles/kodi/default.nix

@@ -35,7 +35,7 @@ in
       };
 
       services = if cfg.autologin then mkMerge [
-        mkIf cfg.wayland {
+        (mkIf cfg.wayland {
           cage = mkIf cfg.wayland {
             user = "kodi";
             program = "${kodiPkg}/bin/kodi-standalone";
@@ -45,9 +45,9 @@ in
             enable = false;
             autorun = false;
           };
-        }
+        })
 
-        mkIf (!cfg.wayland) {
+        (mkIf (!cfg.wayland) {
           xserver = {
             enable = true;
             desktopManager.kodi = {
@@ -65,7 +65,7 @@ in
             defaultSession = "kodi";
             sessionData.autologinSession = "kodi";
           };
-        }
+        })
       ] else {};
     };
 }

roles/users/default.nix

@@ -25,7 +25,7 @@ in
     users.users.johno = {
       isNormalUser = true;
       description = "John Ogle";
-      extraGroups = [ "wheel" "networkmanager" "audio" ] ++ cfg.extraGroups;
+      extraGroups = [ "wheel" "networkmanager" "audio" "video" ] ++ cfg.extraGroups;
     };
 
     users.users.eli = mkIf cfg.kids {