From b0e44a871398fe637d6b54f825b6e3a1ac24bec7 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Fri, 15 Dec 2023 02:21:35 +0100 Subject: [PATCH] WIP: Replace nix-ld with nixpkgs version & downgrade bitwarden --- flake.lock | 55 +++++++++++------------------------ flake.nix | 5 ---- home-mods/desktop/default.nix | 52 ++++++++++++++++----------------- os-mods/common/default.nix | 2 +- users/admin-thin.nix | 2 +- 5 files changed, 45 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index 8ba508f..f22778d 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1702495959, - "narHash": "sha256-xLYLHlF0wsBNQtC1FMYHhhu13lRUxFh8uEMkv5/427g=", + "lastModified": 1702575705, + "narHash": "sha256-j8jaOtke/iwZgXe+o4uE7dnwv8GoBrG2mpoxQoRe0SE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "7369da9bf46df08ec2d4793f72e7000d511864e4", + "rev": "ea53eaf36957528b6ec099d317b7a20430227d27", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1702479765, - "narHash": "sha256-wjNYsFhciYoJkZ/FBKvFj55k+vkLbu6C2qYQ7K+s8pI=", + "lastModified": 1702569759, + "narHash": "sha256-Ze3AdEEsVZBRJ4wn13EZpV1Uubkzi59TkC4j2G9xoFI=", "owner": "nix-community", "repo": "disko", - "rev": "bd8fbc3f274288ac905bcea66bc2a5428abde458", + "rev": "98ab91109716871f50ea8cb0e0ac7cc1e1e14714", "type": "github" }, "original": { @@ -233,12 +233,12 @@ ] }, "locked": { - "lastModified": 1702423270, - "narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=", - "rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db", - "revCount": 3189, + "lastModified": 1702537497, + "narHash": "sha256-br4Z7OFEHWN8oOnKf40BoS6QFt1EyVLqwaVGBG7/DT8=", + "rev": "7a88cdedbda35f808ed2f329a7a811e0511870f9", + "revCount": 3192, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3189%2Brev-d9297efd3a1c3ebb9027dc68f9da0ac002ae94db/018c6056-840b-7cf1-807e-7eba8b631300/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3192%2Brev-7a88cdedbda35f808ed2f329a7a811e0511870f9/018c6725-7e9b-7e8e-bb57-f493c0e4f7dc/source.tar.gz" }, "original": { "type": "tarball", @@ -286,26 +286,6 @@ "type": "github" } }, - "nix-ld": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701153607, - "narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=", - "owner": "Mic92", - "repo": "nix-ld", - "rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-ld", - "type": "github" - } - }, "nix-wallpaper": { "inputs": { "flake-utils": "flake-utils_2", @@ -498,11 +478,11 @@ "osx-kvm": "osx-kvm" }, "locked": { - "lastModified": 1702308270, - "narHash": "sha256-yHfRDaaUUAzVTnmm+l0b0HRy1DCfjUsiUZGufBcfTCI=", + "lastModified": 1702568730, + "narHash": "sha256-+0uxop69FWeraPq2glDvtGZUAXUXs5yqutWFFfrf2fQ=", "owner": "matthewcroughan", "repo": "nixtheplanet", - "rev": "1c05db4c929d8e1617c3c9f8f4fa1a5a9aca97ec", + "rev": "40b9d6f7b513b4f08273a8888645654af903e798", "type": "github" }, "original": { @@ -513,11 +493,11 @@ }, "nur": { "locked": { - "lastModified": 1702547108, - "narHash": "sha256-1SZWYPXMaQdsDPrqWd4iTORb7ZnzUWPfEHACHdc+lRI=", + "lastModified": 1702599384, + "narHash": "sha256-W39mE6STcvX6k30xzk4/DGLajrYVEtp6SIOgzN4fDHo=", "owner": "nix-community", "repo": "NUR", - "rev": "18310bf0ad74f04a57a89a70d52d78e719e46774", + "rev": "8cf518b0011e34505344cc78732a977d1d4ea453", "type": "github" }, "original": { @@ -600,7 +580,6 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", - "nix-ld": "nix-ld", "nix-wallpaper": "nix-wallpaper", "nixinate": "nixinate", "nixos-unstable": "nixos-unstable", diff --git a/flake.nix b/flake.nix index 02b1497..f97f840 100644 --- a/flake.nix +++ b/flake.nix @@ -47,10 +47,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - nix-ld = { - url = "github:Mic92/nix-ld"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nixtheplanet.url = "github:matthewcroughan/nixtheplanet"; }; @@ -107,7 +103,6 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index nur.nixosModules.nur - inputs.nix-ld.nixosModules.nix-ld chaotic.nixosModules.default nixtheplanet.nixosModules.macos-ventura ]; diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index 4abd893..c4ec781 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -19,33 +19,33 @@ in home = { file.".background".source = wallpaperPath; - packages = with pkgs.unstable-pkgs; [ - airshipper - ardour - # blender + packages = with pkgs; [ bitwarden - brave - cavalier - freetube - filelight - element-desktop - inkscape - jellyfin-media-player - miraclecast - kate - kdenlive - krita - libsForQt5.kdeconnect-kde - libsForQt5.plasma-vault - libsForQt5.plasma-browser-integration - nextcloud-client - onlyoffice-bin - protonup-qt - rustdesk - signal-desktop - tutanota-desktop - thunderbird - webcord-vencord + unstable-os.airshipper + unstable-os.ardour + # blender + unstable-pkgs.brave + unstable-os.cavalier + unstable-os.freetube + unstable-os.filelight + unstable-os.element-desktop + unstable-os.inkscape + unstable-os.jellyfin-media-player + # unstable-os.miraclecast + unstable-os.kate + unstable-os.kdenlive + unstable-os.krita + unstable-os.libsForQt5.kdeconnect-kde + unstable-os.libsForQt5.plasma-vault + unstable-os.libsForQt5.plasma-browser-integration + unstable-os.nextcloud-client + unstable-os.onlyoffice-bin + unstable-os.protonup-qt + unstable-os.rustdesk + unstable-os.signal-desktop + unstable-os.tutanota-desktop + unstable-pkgs.thunderbird + unstable-pkgs.webcord-vencord ]; }; } diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix index 69bbcd9..e6a2c74 100644 --- a/os-mods/common/default.nix +++ b/os-mods/common/default.nix @@ -119,7 +119,7 @@ "last_login" ]; }; - nix-ld.dev.enable = true; + nix-ld.enable = true; command-not-found.enable = false; nix-index-database.comma.enable = true; diff --git a/users/admin-thin.nix b/users/admin-thin.nix index f913ee5..4e9f149 100644 --- a/users/admin-thin.nix +++ b/users/admin-thin.nix @@ -9,7 +9,7 @@ ../home-mods/audio ../home-mods/common ../home-mods/firefox - ../home-mods/plasma + # ../home-mods/plasma ../home-mods/shell ];