From 1ce3d0b7dfb13f1d0dc45b4e2263c961ab762901 Mon Sep 17 00:00:00 2001 From: Rory& Date: Sat, 24 Aug 2024 16:25:51 +0200 Subject: Desktop/i686 changes --- flake.lock | 81 +++++++++++++++++++++---------------- host/Rory-desktop/configuration.nix | 5 ++- host/RoryNix/configuration.nix | 4 +- 3 files changed, 53 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 9296de9..d00ae07 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1721379485, - "narHash": "sha256-Pcfv3IB4yGiSC4N5BqD6T9u+YYBiwjJ+VGzg0WGCjK8=", + "lastModified": 1724351785, + "narHash": "sha256-LyW+qD+k32iTzv9rqauasykzzSwNs8ryHzE2ISV7Bwc=", "owner": "famedly", "repo": "conduit", - "rev": "44dd21f432a22c82adab77c25469c336976f4081", + "rev": "a9c386728767ac9295ba6c362a68364f0a322fbd", "type": "gitlab" }, "original": { @@ -399,15 +399,16 @@ "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_4", "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_4", + "rust-manifest": "rust-manifest" }, "locked": { "host": "gitlab.computer.surgery", - "lastModified": 1721619727, - "narHash": "sha256-7PzAHLyvqorY4Et1Bb7rUZ1oZC5HY5yhpoqgZcF8CIY=", + "lastModified": 1724088992, + "narHash": "sha256-e45kLOGHA6PDDhYzq3dV4SsYf+hr2+n5SDnta9NrN14=", "owner": "matrix", "repo": "grapevine-fork", - "rev": "c70cfd3d254924d42b2c3b4a7c271526bd5c29ba", + "rev": "c355e2ad394a3c925acf24c87854e0898d0e328d", "type": "gitlab" }, "original": { @@ -422,11 +423,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -456,11 +457,11 @@ "nhekoSrc": { "flake": false, "locked": { - "lastModified": 1721939227, - "narHash": "sha256-EDkW0KuRy7TIodh2McixYYymnoYMM+Iq6u7hjkd2yUQ=", + "lastModified": 1724192951, + "narHash": "sha256-pRF7xbEKk95zqsMXIDHCG/na8ebu0xztcuhwv1NgXa4=", "owner": "Nheko-reborn", "repo": "nheko", - "rev": "deba5586a3770bd41b2a3191567ad5c7da72781e", + "rev": "d1eb35197546a491ce3503c7c2582980e90b6c52", "type": "github" }, "original": { @@ -508,11 +509,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1722253092, - "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=", + "lastModified": 1724065442, + "narHash": "sha256-8ZUoyeO7Q70bLuijVYvToBSkApw9kfc5hMykTGxB64I=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2", + "rev": "0bec2bfb8a2d4dd16e5b012982ca95e57d50e6a2", "type": "github" }, "original": { @@ -539,11 +540,11 @@ }, "nixpkgs-Draupnir": { "locked": { - "lastModified": 1721675606, - "narHash": "sha256-XMDG/W/vRJzlnXN9F4wdvA8gdrEwdmW9J/Pp89cqAOk=", + "lastModified": 1723084195, + "narHash": "sha256-3K32bJQsGfTGQAAIxz3mb1w1+6I3JRpaot588lQhSSo=", "owner": "TheArcaneBrony", "repo": "nixpkgs", - "rev": "a13cc66ac9f3522bdfd0bad78552a4b74723fae4", + "rev": "dbf6ae4dd3d87392c4eb691e83962a6a24560e9d", "type": "github" }, "original": { @@ -571,11 +572,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1722738533, - "narHash": "sha256-UwMjLKgcxw+UP5UMK5EG2+0TxISIM4hCd9IwCVMC3j0=", + "lastModified": 1724475946, + "narHash": "sha256-rEseutXa9VP4HFiEChUX0cw7hbilCkMq/RBeKT3XPV4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b15628fd968bc3305e356ecaa7117a198c5e0ddd", + "rev": "77e2fa9398204bb8cda108ce1e56c282be7fdb9e", "type": "github" }, "original": { @@ -683,11 +684,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -699,11 +700,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { @@ -715,11 +716,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { @@ -795,17 +796,29 @@ "type": "github" } }, + "rust-manifest": { + "flake": false, + "locked": { + "narHash": "sha256-aZFye4UrtlcvLHrISldx4g9uGt3thDbVlLMK5keBSj0=", + "type": "file", + "url": "https://static.rust-lang.org/dist/channel-rust-1.78.0.toml" + }, + "original": { + "type": "file", + "url": "https://static.rust-lang.org/dist/channel-rust-1.78.0.toml" + } + }, "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1722114803, - "narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix index 50131b5..3e21734 100644 --- a/host/Rory-desktop/configuration.nix +++ b/host/Rory-desktop/configuration.nix @@ -230,7 +230,10 @@ args@{ nixpkgs = { config = { allowUnfree = true; - permittedInsecurePackages = [ "electron-25.9.0" ]; + permittedInsecurePackages = [ + "electron-25.9.0" + "olm-3.2.16" + ]; }; }; diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix index 90d6076..5876d2f 100644 --- a/host/RoryNix/configuration.nix +++ b/host/RoryNix/configuration.nix @@ -48,7 +48,7 @@ xkb.layout = "us"; modules = [ pkgs.xorg.xf86videointel ]; }; - libinput.enable = true; + #libinput.enable = true; gnome = { core-developer-tools.enable = false; core-utilities.enable = false; @@ -121,7 +121,7 @@ dig cloud-utils sshfs - nemo + #nemo firefox-bin #epiphany -- cgit 1.4.1