framework: merged updates

flake.lock

@@ -228,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753592768,
+        "lastModified": 1756245065,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "54b2879ce622d44415e727905925e21b8f833a98",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1754744872,
+        "lastModified": 1756451209,
-        "narHash": "sha256-rcMHMs+dFWaDXev092gfxTfxHEWcUY/6SRV+cseNevQ=",
+        "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "346fc31bcc4d2dbcc3e8ce8dbb622e4255ff54b7",
+        "rev": "cdfffe0b009582f5161dcd030a5549236287767b",
         "type": "github"
       },
       "original": {
@@ -333,11 +333,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1754742008,
+        "lastModified": 1756448032,
-        "narHash": "sha256-Tp0FG7VpLudVEC622d91z2hbdfPLCXxw0Nv43iNN4O0=",
+        "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "67361f88fd01974ebee4cf80f0e29c87d805cc39",
+        "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b",
         "type": "github"
       },
       "original": {
@@ -364,11 +364,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1754689972,
+        "lastModified": 1756217674,
-        "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=",
+        "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
+        "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620",
         "type": "github"
       },
       "original": {
@@ -380,11 +380,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1754689972,
+        "lastModified": 1756469547,
-        "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=",
+        "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
+        "rev": "41d292bfc37309790f70f4c120b79280ce40af16",
         "type": "github"
       },
       "original": {
@@ -395,11 +395,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1754214453,
+        "lastModified": 1756386758,
-        "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
+        "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
+        "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
         "type": "github"
       },
       "original": {
@@ -419,11 +419,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1754262585,
+        "lastModified": 1755727480,
-        "narHash": "sha256-Yz5dJ0VzGRzSRHdHldsWQbuFYmtP3NWNreCvPfCi9CI=",
+        "narHash": "sha256-eb9N7XFj1zirk+D2KV+rn/CjmVHDISlxhtZCWZEVpkM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "ab1b5962e1ca90b42de47e1172e0d24ca80e6256",
+        "rev": "6df0b97b39baa1c0b3002b051f307aed68e17d1b",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754328224,
+        "lastModified": 1754988908,
-        "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=",
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
         "type": "github"
       },
       "original": {
@@ -536,11 +536,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1754599117,
+        "lastModified": 1755710103,
-        "narHash": "sha256-AzAYdZlat002vCjCKWdFpGi2xUaiOU4DtIPnv1nomD8=",
+        "narHash": "sha256-VmheUy4UzWDy/u0TvCCHptgF30peL7wRxkHy7EVpDrQ=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "312dec38b2231b21f36903d1bdce96daa11548ff",
+        "rev": "79be65b20d7b8fb7e8f39ba8121cfe41b7f46808",
         "type": "github"
       },
       "original": {
@@ -701,16 +701,16 @@
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
-        "lastModified": 1748488455,
+        "lastModified": 1755491097,
-        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
         "type": "github"
       },
       "original": {
         "owner": "Supreeeme",
-        "ref": "v0.6",
+        "ref": "v0.7",
         "repo": "xwayland-satellite",
         "type": "github"
       }
@@ -718,11 +718,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1754533920,
+        "lastModified": 1756260173,
-        "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=",
+        "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c",
+        "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb",
         "type": "github"
       },
       "original": {
@@ -736,11 +736,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1754540523,
+        "lastModified": 1756526767,
-        "narHash": "sha256-Wgv2qVckt8q11/xErY7hYdLAPcoOnZ0BkMLqyXegCzQ=",
+        "narHash": "sha256-aMcUT5QOgVghB+x89xf9+Phc/BTIQfoitVIcQ66ZQWk=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "451454de40a4433174153e823994fe2ecd3c869e",
+        "rev": "3cef1d4a0b597c1746d399cc46ef98a53af9a732",
         "type": "github"
       },
       "original": {

flake.nix

@@ -42,8 +42,6 @@
     pkgs = import inputs.nixpkgs {inherit system;};
     user = "tristan";
     userFullname = "Tristan Beedell";
-    # auto-login = import ./nixos/programs/auto-login.nix;
-
     mkConf = import ./lib/mkconf.nix {inherit inputs system user userFullname;};
   in {
     formatter.${system} = pkgs.alejandra;
@@ -51,7 +49,6 @@
       zenix = mkConf {
         nixos-modules = [
           ./hardware/zenix.nix
-          ./nixos/programs/cosmic.nix
           ./nixos/programs/niri.nix
           ./nixos/programs/gamer.nix
           ./nixos/programs/personal.nix
@@ -62,7 +59,6 @@
           ./home/programs/graphical.nix
           ./home/programs/gamer.nix
           ./home/programs/personal/.
-          ./home/desktop/cosmic/.
         ];
       };
 
@@ -71,13 +67,11 @@
           ./hardware/framework-13.nix
           ./nixos/workstation.nix
           ./nixos/modules/work.nix
-          ./nixos/programs/cosmic.nix
           ./nixos/programs/niri.nix
         ];
         home-modules = [
           ./home/programs/work.nix
           ./home/programs/graphical.nix
-          ./home/desktop/cosmic/.
         ];
       };
 

hardware/zenix.nix

@@ -1,12 +1,9 @@
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
+  user,
   ...
-}: let
+}: {
-  user = config.user;
-in {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     ./ddc.nix
@@ -31,10 +28,6 @@ in {
     options = ["noatime"];
   };
 
-  # boot.initrd.luks.devices."usbkey" = {
-  #   device = "/dev/disk/by-label/usbkey1";
-  # };
-
   boot.initrd.luks.devices."cryptroot" = {
     device = "/dev/disk/by-uuid/cc0617df-8cbf-4618-abbc-df64c96de151";
   };

home/default.nix

@@ -41,6 +41,8 @@
 
   programs.yazi.enable = true;
 
+  programs.bat.enable = true;
+
   programs.zoxide.enable = true;
 
   programs.rbw = {

home/desktop/niri/default.nix

@@ -11,6 +11,7 @@
   ];
 
   programs.waybar.settings.mainBar.modules-left = ["niri/workspaces" "niri/window"];
+  programs.waybar.settings.mainBar.modules-right = lib.mkBefore ["niri/language"];
 
   programs.fuzzel = {
     enable = true;
@@ -32,8 +33,8 @@
   programs.niri = {
     settings = {
       input.keyboard = {
-        xkb.layout = "us";
+        xkb.layout = "us,gb";
-        xkb.variant = "dvorak";
+        xkb.variant = "dvorak,";
         xkb.options = "caps:escape";
       };
       input.mouse = {
@@ -57,7 +58,7 @@
       };
       environment = {
         NIXOS_OZONE_WL = "1";
-        DISPLAY = ":1";
+        DISPLAY = ":0";
       };
       binds = with config.lib.niri.actions; {
         "Mod+Return".action.spawn = [(lib.getExe config.programs.terminal)];
@@ -110,6 +111,7 @@
 
         "Mod+M".action = switch-preset-column-width;
         "Mod+G".action = toggle-window-floating;
+        "Mod+Shift+Ctrl+Alt+Space".action = switch-layout "next";
 
         "Print".action = screenshot;
 

home/desktop/utils/waybar.nix

@@ -7,7 +7,7 @@
         layer = "bottom";
         position = "top";
         height = 36;
-        modules-right = ["mpris" "power-profiles-daemon" "cpu" "idle_inhibitor" "pulseaudio" "clock" "tray" "battery"];
+        modules-right = ["mpris" "power-profiles-daemon" "cpu" "idle_inhibitor" "wireplumber" "clock" "tray" "battery"];
         "cpu" = {
           "format" = "{icon}";
           "format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
@@ -35,24 +35,19 @@
           tooltip-format-activated = "system sleep inhibited";
           tooltip-format-deactivated = "system will sleep when idle";
         };
-        pulseaudio = {
+        wireplumber = {
-          format-muted = "🔇 {volume}";
+          format-muted = "🔇";
-          format = "{icon} {volume}";
+          format = "{icon} {volume}%";
-          format-icons.default = ["🔈" "🔉" "🔊"];
+          format-icons = ["🔈" "🔉" "🔊"];
-          on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
+          on-click = "pwvucontrol";
         };
         mpris = {
-          format = "{player_icon} {title}";
+          format = "▶️ {title}";
-          format-paused = "⏸️ {player_icon} {title}";
+          format-paused = "⏸️ {title}";
-          player-icons = {
-            default = "▶️";
-            mpd = "🎵";
-            kdeconnect = "☎️";
-          };
         };
         battery = {
           format = "{icon} {capacity}%";
-          format-icons = ["🤏" "🪫" "🔋" "🔋"];
+          format-icons = ["🪫" "🔋" "🔋"];
           format-charging = "🔌 {capacity}%";
           states = {
             warning = 30;

home/programs/graphical.nix

@@ -25,7 +25,6 @@
     youtube-music
     transmission_4-gtk
     feishin
-    grayjay
 
     # other
     element-desktop

home/programs/work.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
   modifier = config.windowManager.modifierKey;
@@ -43,7 +44,7 @@ in {
   home.sessionVariables = {
     CYPRESS_INSTALL_BINARY = 0;
     CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
-    MONGOMS_SYSTEM_BINARY = "${pkgs.callPackage ../../pkgs/mongodb.nix pkgs}/bin/mongod";
+    MONGOMS_SYSTEM_BINARY = lib.getExe' pkgs.mongodb-7_0 "mongod";
   };
 
   gtk.gtk3.bookmarks = [

home/workstation.nix

@@ -28,7 +28,6 @@
     playerctl
     quickemu
     devenv
-    bottles
   ];
 
   services.udiskie = {

nixos/default.nix

@@ -1,13 +1,11 @@
 # https://search.nixos.org/options
 {
   inputs,
-  config,
   pkgs,
   lib,
+  user,
   ...
-}: let
+}: {
-  user = config.user;
-in {
   nix = {
     settings = {
       experimental-features = ["nix-command" "flakes" "pipe-operators"];
@@ -98,6 +96,7 @@ in {
     nix-tree
     comma
     jq
+    bat
   ];
 
   boot.kernel.sysctl = {

nixos/modules/work.nix

@@ -12,6 +12,7 @@ in {
     "steam-run"
     "postman"
     "drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623
+    "mongodb"
   ];
 
   nixpkgs.config.permittedInsecurePackages = [

nixos/programs/auto-login.nix

@@ -1,10 +0,0 @@
-command: {user, ...}: {
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        inherit command user;
-      };
-    };
-  };
-}

nixos/programs/gamer.nix

@@ -12,10 +12,13 @@
     dedicatedServer.openFirewall = true;
     gamescopeSession = {
       enable = true;
-      args = ["-r" "120" "-W" "3840" "-H" "2160" "-O" "HDMI-A-1" "--rt" "--hdr-enabled" "--adaptive-sync"];
+      args = ["-r" "120" "-W" "3840" "-H" "2160" "-O" "HDMI-A-1" "--rt" "--hdr-enabled" "--adaptive-sync" "--xwayland-count" "2"];
       env = {
+        PROTON_ENABLE_WAYLAND = "1";
+        PROTON_ENABLE_HDR = "1";
         ENABLE_HDR_WSI = "1";
         DXVK_HDR = "1";
+        STEAM_MULTIPLE_XWAYLANDS = "1";
       };
     };
   };

nixos/services/jellyfin.nix

@@ -1,10 +1,11 @@
-{
+{pkgs, ...}: {
   users.groups.media = {};
   services.jellyfin = {
     enable = true;
     group = "media"; # access to user stuff
     openFirewall = true;
   };
+  environment.variables.JELLYFIN_FFMPEG = "${pkgs.jellyfin-ffmpeg}/bin/ffmpeg";
   services.nginx.virtualHosts."movies.tristans.cloud" = {
     forceSSL = true;
     enableACME = true;

nixos/workstation.nix

@@ -3,6 +3,7 @@
   pkgs,
   lib,
   config,
+  user,
   ...
 }: {
   imports = [
@@ -21,6 +22,7 @@
 
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
+  services.power-profiles-daemon.enable = true;
 
   services.gnome.gnome-keyring.enable = true;
 
@@ -28,6 +30,8 @@
 
   virtualisation.waydroid.enable = true;
 
+  services.displayManager.cosmic-greeter.enable = true;
+
   networking.stevenblack = {
     enable = lib.mkDefault true;
     block = ["porn" "gambling"];
@@ -76,18 +80,11 @@
   };
   qt.enable = true;
 
-  nixpkgs.overlays = [
-    (final: prev: {
-      interalia = prev.callPackage ../pkgs/interalia.nix {};
-    })
-  ];
-
   fonts.packages = with pkgs; [
     nerd-fonts.symbols-only
-    interalia
   ];
 
-  home-manager.users.${config.user}.imports = [
+  home-manager.users.${user}.imports = [
     ../home/workstation.nix
   ];