universedesktop: Add colour to Python

universedesktop: PrismLauncherm, default wayland support
universedesktop: secret magic
2024-11-27 21:57:23 -05:00 · 2024-11-27 21:57:01 -05:00 · 2024-11-27 21:56:33 -05:00 · 2024-11-27 21:56:00 -05:00 · 2024-11-27 21:55:32 -05:00 · 2024-11-27 21:54:55 -05:00
8 changed files with 55 additions and 49 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -66,11 +66,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721852138,
-        "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
+        "lastModified": 1728650932,
+        "narHash": "sha256-mGKzqdsRyLnGNl6WjEr7+sghGgBtYHhJQ4mjpgRTCsU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
+        "rev": "65ae9c147349829d3df0222151f53f79821c5134",
        "type": "github"
      },
      "original": {
@@ -108,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721719500,
-        "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=",
+        "lastModified": 1728385805,
+        "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec",
+        "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
        "type": "github"
      },
      "original": {
@@ -124,11 +124,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1721562059,
-        "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
+        "lastModified": 1731319897,
+        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
+        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
        "type": "github"
      },
      "original": {
@@ -156,11 +156,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1721524707,
-        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
+        "lastModified": 1728156290,
+        "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
+        "rev": "17ae88b569bb15590549ff478bab6494dde4a907",
        "type": "github"
      },
      "original": {
@@ -172,11 +172,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1721466660,
-        "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
+        "lastModified": 1728093190,
+        "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
+        "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da",
        "type": "github"
      },
      "original": {
@@ -201,11 +201,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1721688883,
-        "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
+        "lastModified": 1728345710,
+        "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
+        "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
        "type": "github"
      },
      "original": {
--- a/machines/universedesktop/configuration.nix
+++ b/machines/universedesktop/configuration.nix
@@ -57,11 +57,11 @@
    services.resolved.enable = true;

    sops.secrets.wireless = { };
-    networking.wireless.environmentFile = config.sops.secrets.wireless.path;
+    networking.wireless.secretsFile = config.sops.secrets.wireless.path;

    networking.wireless.enable = true;
    networking.wireless.networks = {
-      "@SSID_HOME@".psk = "@PSK_HOME@";
+      "BELL422 5G".pskRaw = "ext:PSK_HOME";
    };

    hardware.bluetooth.enable = true;
--- a/machines/universedesktop/desktop/dwl.nix
+++ b/machines/universedesktop/desktop/dwl.nix
@@ -10,11 +10,20 @@ in {

  nixpkgs.overlays = [
    (final: prev: {
-      dwl = prev.dwl.overrideAttrs (old: let
+      wlroots_0_19 = prev.wlroots_0_18.overrideAttrs (old: {
+        src = final.fetchFromGitLab {
+          domain = "gitlab.freedesktop.org";
+          owner = "wlroots";
+          repo = "wlroots";
+          rev = "47fb00f66d5a8367d0108bd960f99e51ab1a1318"; # 0.19-prev
+          hash = "sha256-HkpTML14tbYBLiHkqoFRSn/qKsVny/oso2TuG6LY/fk=";
+        };
+      });
+      dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let
        dwl-patches = pkgs.fetchgit {
          url = "https://codeberg.org/dwl/dwl-patches.git";
-          rev = "7f93815e9c9d50add8493e680b3057ed0cc6e8a0";
-          hash = "sha256-LK1+WjAlguBvITPyS4oHXW5bNP19WUEfo87GFmyv8Js=";
+          rev = "8b1f9fbdb2c3394bc26a9ff0ac872f64c38e29f7";
+          hash = "sha256-fW7cJC2uT9uV0fdB/5rjHOWnQHouvjJrcem1hENm6R0=";
        };
        patches = let
          dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch";
@@ -25,18 +34,18 @@ in {
          (dwl-patch "autostart")
        ];
      in {
-        version = "10-05-2024";
+        version = "21-09-2024";
        
        src = final.fetchFromGitea {
          domain = "codeberg.org";
          owner = "dwl";
          repo = "dwl";
-          rev = "9825c26cdd5dfed34022b77a8936c5d8f485e134";
-          hash = "sha256-p7BhCbCduMNTEK5DYNGBYXf+9WU6WlRvR9VdOuSTrVU=";
+          rev = "002c7d22043da56a54511b5d234c2e3bd997d119";
+          hash = "sha256-mgO+iTJmAM0N5Q+6fAfMAOU0O1T8xUWRdaIcbRX3Pa8=";
        };
 
        patches = (old.patches or []) ++ patches;
-        postPatch = ''
+        postPatch = (old.postPatch or "") + ''
          export termcmd=${pkgs.foot}/bin/foot
          export editcmd=${launch_emacs}
          export menucmd=${pkgs.fuzzel}/bin/fuzzel
--- a/machines/universedesktop/programs/cad.nix
+++ b/machines/universedesktop/programs/cad.nix
@@ -1,10 +1,9 @@
 { lib, config, pkgs, ... }: {
  environment.systemPackages = with pkgs; [
    openscad
-    # https://github.com/NixOS/nixpkgs/pull/326595
-    (freecad.override {python3Packages = pkgs.python311.pkgs;})
-    # https://github.com/NixOS/nixpkgs/pull/325726
-    (kicad.override {python3 = pkgs.python311;})
+
+    freecad
+    kicad

    prusa-slicer
  ];
--- a/machines/universedesktop/programs/games.nix
+++ b/machines/universedesktop/programs/games.nix
@@ -9,14 +9,6 @@
  # Game compat
  programs.gamemode.enable = true;

-  nixpkgs.overlays = [
-    (final: prev: {
-      prismlauncher = prev.prismlauncher.override {
-        withWaylandGLFW=true;
-      };
-    })
-  ];
-
  environment.systemPackages = with pkgs; [
    # For Steam
    protontricks
--- a/machines/universedesktop/programs/programming.nix
+++ b/machines/universedesktop/programs/programming.nix
@@ -1,4 +1,10 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }: let
+  mypython = let
+    packageOverrides = final: prev: {
+      matplotlib = prev.matplotlib.override {enableGtk3 = true;};
+    };
+  in pkgs.python3.override {inherit packageOverrides;};
+in {
  virtualisation = {
    podman = {
      enable = true;
@@ -9,7 +15,7 @@
    godot_4
    cbqn-replxx

-    (pkgs.python3.withPackages (p: (with p; [
+    (mypython.withPackages (p: (with p; [
      scipy
      numpy
      pandas
@@ -18,7 +24,7 @@
      beautifulsoup4
      tqdm
      matplotlib
-      pyqt5
+      colour

      ipython
      python-lsp-server
--- a/machines/universedesktop/programs/video.nix
+++ b/machines/universedesktop/programs/video.nix
@@ -1,6 +1,6 @@
 { lib, config, pkgs, ... }: {
  environment.systemPackages = with pkgs; [
    vlc
-    ffmpeg_5-full
+    ffmpeg-full
  ];
 }
--- a/machines/universedesktop/secrets/secrets.yaml
+++ b/machines/universedesktop/secrets/secrets.yaml
@@ -1,4 +1,4 @@
-wireless: ENC[AES256_GCM,data:rOnpkuFvcy3/mNPGVQXm6gjEDkIkmEMNJyugSfKddnWAlqbMbVbBhy8UQg==,iv:7/ba9+kUxsLaVG6uxZjF4WBUGa5i0/FFRyGAhkATEg8=,tag:ZD+Xy69K/txJzC1C/CLDlg==,type:str]
+wireless: ENC[AES256_GCM,data:YR4idzvkgU7RRVeCqabyPWY42FgSqIxl8RX+y947crvLOHyk3CI=,iv:yorheNy2HE9YjWJWDN4AbxJw8lsKYKjdUw79tSy1mR0=,tag:1ofvUhNOLqxfQhNQPkN68Q==,type:str]
 sops:
    kms: []
    gcp_kms: []
@@ -14,8 +14,8 @@ sops:
            WS93Uzg1UkFSSGM1eUR1UG9WRFVCYVEKbnE6DuVqtkynqphNIybtVgfVFJtgm6vI
            XywmFg8F1dOq1xDz97oFBbzbJa1J9qsMjNlPxZkC04snM9msZm9v2g==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-08T03:50:15Z"
-    mac: ENC[AES256_GCM,data:1mZG+AFeBhilH8Zenvy+0YZM60CcCil7KfX02aEci8+0ne3g8y9jrbycCyR/E2wmB/FNYuNvwfwEWroHvooayeTZ09Wlh3D9RhTWPIHIj3s6aTmdV+OkcbfJt6tpuuSLcNcpHWnKF8EBKwPiZZnZSUuoGgEKAPiznV7qPLDYqLc=,iv:GnfojCZ4G6rHOTEYvt8AfAM2Vh1GUsGv3Aevcx9gkT8=,tag:bG/nckGVmSJx4SmsTLrUPg==,type:str]
+    lastmodified: "2024-10-15T23:18:01Z"
+    mac: ENC[AES256_GCM,data:cpnUpYOTqPYHjtsbyFxuLH+1oPKAOJeKsR6B6WWux2/yX/+aXfXVDh2MW7EVCKgnnsuj6D6xhPbFU/Fawp+5G7aXIIR8yeGM4QHxJ6qmApWDWmD5SAf/R4E+EvFfID1FVEmZC+IGN7A+1y1GmO31yI6GqRCwFcmdo0ivg1DKo6s=,iv:0Dilkkit3ZDLLYABaJtXPEZVpfxDeoB7obTahMmZGA0=,tag:EHIHM7fj3QS6hGjpCLxrkg==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.1
Author	SHA1	Message	Date
David Crompton	b8038a30c8	universedesktop: Add colour to Python	2024-11-27 21:57:23 -05:00
David Crompton	e83c380ce6	universedesktop: PrismLauncherm, default wayland support	2024-11-27 21:57:01 -05:00
David Crompton	6390e72806	universedesktop: secret magic	2024-11-27 21:56:33 -05:00
David Crompton	31d8eab939	universedesktop: Update DWL	2024-11-27 21:56:00 -05:00
David Crompton	3fc89e6c2b	universedesktop: Update WIFI config	2024-11-27 21:55:32 -05:00
David Crompton	d5df512c97	Merge branch 'main' of https://git.syzygial.cc/Syzygial/NixMachines	2024-11-27 21:54:55 -05:00
David Crompton	6e6d0eb102	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09) → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)	2024-11-16 12:35:29 -05:00
David Crompton	7ba2d4fbda	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/086f619dd991a4d355c07837448244029fc2d9ab' (2024-08-11) → 'github:nix-community/home-manager/65ae9c147349829d3df0222151f53f79821c5134' (2024-10-11) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/91010a5613ffd7ee23ee9263213157a1c422b705' (2024-08-06) → 'github:LnL7/nix-darwin/48b50b3b137be5cfb9f4d006835ce7c3fe558ccc' (2024-10-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a58bc8ad779655e790115244571758e8de055e3d' (2024-08-11) → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/be0eec2d27563590194a9206f551a6f73d52fa34' (2024-08-12) → 'github:Mic92/sops-nix/06535d0e3d0201e6a8080dd32dbfde339b94f01b' (2024-10-08) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100' (2024-07-20) → 'github:NixOS/nixpkgs/e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da' (2024-10-05) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/556533a23879fc7e5f98dd2e0b31a6911a213171' (2024-07-21) → 'github:NixOS/nixpkgs/17ae88b569bb15590549ff478bab6494dde4a907' (2024-10-05)	2024-10-11 14:01:32 -04:00
David Crompton	4a62f59534	universedesktop: ffmpeg update 5->stable	2024-08-14 12:13:12 -04:00
David Crompton	8f33088cdb	(free/ki)cad: remove overrides (fixed)	2024-08-14 12:10:58 -04:00
David Crompton	fc1c4d1d98	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/304a011325b7ac7b8c9950333cd215a7aa146b0e' (2024-07-24) → 'github:nix-community/home-manager/086f619dd991a4d355c07837448244029fc2d9ab' (2024-08-11) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/884f3fe6d9bf056ba0017c132c39c1f0d07d4fec' (2024-07-23) → 'github:LnL7/nix-darwin/91010a5613ffd7ee23ee9263213157a1c422b705' (2024-08-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/68c9ed8bbed9dfce253cc91560bf9043297ef2fe' (2024-07-21) → 'github:NixOS/nixpkgs/a58bc8ad779655e790115244571758e8de055e3d' (2024-08-11) • Updated input 'sops-nix': 'github:Mic92/sops-nix/aff2f88277dabe695de4773682842c34a0b7fd54' (2024-07-22) → 'github:Mic92/sops-nix/be0eec2d27563590194a9206f551a6f73d52fa34' (2024-08-12)	2024-08-14 12:10:29 -04:00
David Crompton	b71294c885	universedesktop: Update wireless config	2024-08-14 12:07:03 -04:00