From ddc6bd7ad9262ec18847c8a7f50b2227b3bd5b8c Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 3 Dec 2021 12:30:46 +0300 Subject: [PATCH] a --- flake.lock | 250 +++++------------------------- flake.nix | 16 +- hosts/lungmen.nix | 2 +- profiles/cachix/default.nix | 2 +- users/patriot/default.nix | 2 +- users/profiles/direnv/default.nix | 5 +- 6 files changed, 49 insertions(+), 228 deletions(-) diff --git a/flake.lock b/flake.lock index 6f2a45c..902deda 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "cachix": { "locked": { - "lastModified": 1634327140, - "narHash": "sha256-d5L7oMjUVC6VU0cQMsF0tceAPkmzuAQ51DWBFNChbEQ=", + "lastModified": 1637798660, + "narHash": "sha256-MrPmoGeiOjlT17j3ZQx6iab07YVnomRiBFLcOCiCYnk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "83667ff60a88e22b76ef4b0bdf5334670b39c2b6", + "rev": "91e6a9a6568f751bb10222a937507e7e151a035e", "type": "github" }, "original": { @@ -59,26 +59,11 @@ }, "devshell": { "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "lastModified": 1637575296, + "narHash": "sha256-ZY8YR5u8aglZPe27+AJMnPTG6645WuavB+w0xmhTarw=", "owner": "numtide", "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { - "locked": { - "lastModified": 1632436039, - "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", - "owner": "numtide", - "repo": "devshell", - "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", + "rev": "0e56ef21ba1a717169953122c7415fa6a8cd2618", "type": "github" }, "original": { @@ -98,7 +83,6 @@ "home" ], "latest": "latest", - "nix": "nix", "nixlib": [ "nixos" ], @@ -108,11 +92,11 @@ ] }, "locked": { - "lastModified": 1634161492, - "narHash": "sha256-7OZz7DqAhO+3axY68xsMXAyD+b5gJgVXuKjslTSCM3Y=", + "lastModified": 1638227261, + "narHash": "sha256-CbleULqH3NRnnLdwqHqi0qk1sEmhyXE8ZOzjofilGM4=", "owner": "divnix", "repo": "digga", - "rev": "a55450a16d362b6e1c50bb4025aaa604b385d3ba", + "rev": "1ce6cef4230f82cb986ef3d08d57a2e3a0e6e80d", "type": "github" }, "original": { @@ -140,11 +124,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -174,62 +158,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "helix": { - "inputs": { - "flakeCompat": "flakeCompat", - "nixCargoIntegration": "nixCargoIntegration", - "nixpkgs": [ - "nixos" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1634993538, - "narHash": "sha256-4UBBfkxDanL4OL6xeB6BkiWNCXj6gFLp3/b+MB9Hos4=", - "ref": "master", - "rev": "0cb5e0b2caba61bbcf6f57ce58506882766d5eea", - "revCount": 1565, - "submodules": true, - "type": "git", - "url": "https://github.com/helix-editor/helix.git" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/helix-editor/helix.git" - } - }, "home": { "inputs": { "nixpkgs": [ @@ -237,11 +165,11 @@ ] }, "locked": { - "lastModified": 1634939539, - "narHash": "sha256-m+RC6it1doMjq5U5e1B36thzOOBc1GF4tVLK2SNMvzg=", + "lastModified": 1638484748, + "narHash": "sha256-Xb5X84/PUMXCyZGnixyqjtVyEt5tlCCrSp4lfJdtiHw=", "owner": "nix-community", "repo": "home-manager", - "rev": "8278c14f5f8725e1b5936d6f54e63d4626aae98c", + "rev": "fbb80207f3840785e2918143ebe709f26372f91d", "type": "github" }, "original": { @@ -253,11 +181,11 @@ }, "latest": { "locked": { - "lastModified": 1632660378, - "narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=", + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497", + "rev": "8a308775674e178495767df90c419425474582a1", "type": "github" }, "original": { @@ -267,23 +195,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1617481909, - "narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "ref": "VERSION_0_8_4", - "repo": "lowdown", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": [ @@ -291,11 +202,11 @@ ] }, "locked": { - "lastModified": 1632266297, - "narHash": "sha256-J1yeJk6Gud9ef2pEf6aKQemrfg1pVngYDSh+SAY94xk=", + "lastModified": 1638203339, + "narHash": "sha256-Sz3iCvbWrVWOD/XfYQeRJgP/7MVYL3/VKsNXvDeWBFc=", "owner": "nmattia", "repo": "naersk", - "rev": "ee7edec50b49ab6d69b06d62f1de554efccb1ccd", + "rev": "c3e56b8a4ffb6d906cdfcfee034581f9a8ece571", "type": "github" }, "original": { @@ -304,61 +215,13 @@ "type": "github" } }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": [ - "digga", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1630335771, - "narHash": "sha256-eljjEPJdLK3aDskF7qX4YM/6KCq+w9nr+IKhrKW/AIQ=", - "owner": "nixos", - "repo": "nix", - "rev": "50a35860ee9237d341948437c5f70a7f0987d393", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nix", - "type": "github" - } - }, - "nixCargoIntegration": { - "inputs": { - "devshell": "devshell_2", - "nixpkgs": [ - "helix", - "nixpkgs" - ], - "rustOverlay": [ - "helix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1634796585, - "narHash": "sha256-CW4yx6omk5qCXUIwXHp/sztA7u0SpyLq9NEACPnkiz8=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "a84a2137a396f303978f1d48341e0390b0e16a8b", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, "nixos": { "locked": { - "lastModified": 1634782485, - "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", + "lastModified": 1638376152, + "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", + "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f", "type": "github" }, "original": { @@ -380,11 +243,11 @@ ] }, "locked": { - "lastModified": 1624973746, - "narHash": "sha256-11JbJRduNwyf556gndGErR5/12ceyHOHBfEuha5Vws4=", + "lastModified": 1637655461, + "narHash": "sha256-kXZPbclN3gKwjhp2/RYFDFpAsSBwzX1iLF4EcnHZsPQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "022ef440af8dc237ab1f59fa363cb1e25783ec3e", + "rev": "05a3eb158a9c7746a5d463726d7f7cccf07500e4", "type": "github" }, "original": { @@ -395,11 +258,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1633793047, - "narHash": "sha256-XSMlHMVPKwcEqyHGdFj/ZeGMeZeKNwVExOfLlxcg4oE=", + "lastModified": 1638440530, + "narHash": "sha256-kmoNW+RmSka988iWvSrkiAxO8g6D76O0gW2cIIhL6U8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3aabf78bfcae62f5f99474f2ebbbe418f1c6e54f", + "rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a", "type": "github" }, "original": { @@ -410,11 +273,11 @@ }, "nixosPersistence": { "locked": { - "lastModified": 1611747548, - "narHash": "sha256-2z5wmWda1uI4IkTZrW52jiHq3bzhYLc+GgjvaSd544M=", + "lastModified": 1637278200, + "narHash": "sha256-nwPBJpjHU8J0hhZ6l4Ytvi3qhcxXJVy4jOWurmzSv3A=", "owner": "nix-community", "repo": "impermanence", - "rev": "58558845bc68dcf2bb32caa80564f7fe3f6cbc61", + "rev": "0616c64b0ebcf08cc74db7820e74b807274246f6", "type": "github" }, "original": { @@ -423,21 +286,6 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1628186154, - "narHash": "sha256-r2d0wvywFnL9z4iptztdFMhaUIAaGzrSs7kSok0PgmE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "06552b72346632b6943c8032e57e702ea12413bf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgsWayland": { "inputs": { "cachix": "cachix", @@ -446,11 +294,11 @@ ] }, "locked": { - "lastModified": 1634554747, - "narHash": "sha256-4KWDcFiluJIIxNzziIjjZgET3fDCOA3YkZJAXMqOl3Y=", + "lastModified": 1637983357, + "narHash": "sha256-kferWoUKAAJO17t2D2nsEMvjMmOH1zyJPFUHtm+Cgn4=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "48cd3698e3dee50c8ff13602a8ab13b7f65d9051", + "rev": "1e481bafca9e03ead4b85e4f46d8d959c5f9b11c", "type": "github" }, "original": { @@ -473,11 +321,11 @@ ] }, "locked": { - "lastModified": 1634449716, - "narHash": "sha256-JuRCU4KCIA3/pp8BjHqqF9dj1d2xtpkxKKAtSuOzTIY=", + "lastModified": 1638119397, + "narHash": "sha256-t7lGKypWtmjwymRb6e4GWedeadsV7Iw8DFTi+oV3QM8=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "a2d06d2d2910cbe35b4f323a54ef484f51d71e20", + "rev": "b56f456975d82ebcb9c7ca964148307d7a6b67d9", "type": "github" }, "original": { @@ -489,7 +337,6 @@ "root": { "inputs": { "digga": "digga", - "helix": "helix", "home": "home", "naersk": "naersk", "nixos": "nixos", @@ -498,25 +345,6 @@ "nixpkgsWayland": "nixpkgsWayland", "rnixLsp": "rnixLsp" } - }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1634869268, - "narHash": "sha256-RVAcEFlFU3877Mm4q/nbXGEYTDg/wQNhzmXGMTV6wBs=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c02c2d86354327317546501af001886fbb53d374", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cf65dae..f3d02d7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,6 @@ { description = "A highly structured configuration database."; - nixConfig.extra-experimental-features = "nix-command flakes ca-references"; - nixConfig.extra-substituters = "https://nrdxp.cachix.org https://nix-community.cachix.org"; - nixConfig.extra-trusted-public-keys = "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; - inputs = { nixos.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -28,12 +24,12 @@ inputs.nixpkgs.follows = "nixos"; inputs.utils.follows = "digga/flake-utils"; }; - helix = { + /*helix = { url = "https://github.com/helix-editor/helix.git"; type = "git"; submodules = true; inputs.nixpkgs.follows = "nixos"; - }; + };*/ nixosPersistence.url = "github:nix-community/impermanence"; nixpkgsWayland = { url = "github:colemickens/nixpkgs-wayland"; @@ -50,7 +46,7 @@ , nixosPersistence , nixpkgsWayland , rnixLsp - , helix + #, helix , ... } @ inputs: digga.lib.mkFlake @@ -65,9 +61,9 @@ overlays = [ #nixpkgsWayland.overlay (_: prev: { - helix = helix.packages.${prev.system}.helix; - helix-src = prev.helix.src; - rnix-lsp = rnixLsp.packages.${prev.system}.rnix-lsp; + #helix = helix.packages.${prev.system}.helix; + #helix-src = prev.helix.src; + #rnix-lsp = rnixLsp.packages.${prev.system}.rnix-lsp; }) ./pkgs/default.nix ]; diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix index ed940eb..54d671b 100644 --- a/hosts/lungmen.nix +++ b/hosts/lungmen.nix @@ -227,7 +227,7 @@ in }; }; virtualisation = { - podman.enable = false; + podman.enable = true; libvirtd.enable = false; }; diff --git a/profiles/cachix/default.nix b/profiles/cachix/default.nix index d88a3f7..1ddf562 100644 --- a/profiles/cachix/default.nix +++ b/profiles/cachix/default.nix @@ -6,6 +6,6 @@ let imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); in { - inherit imports; + #inherit imports; nix.binaryCaches = [ "https://cache.nixos.org/" ]; } diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 0c75888..e75882c 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -563,7 +563,7 @@ in ''; shellAliases = nixosConfig.environment.shellAliases // { harmony-ssh = '' - ${pkgs.mosh}/bin/mosh yusuf@chat.harmonyapp.io + ${pkgs.mosh}/bin/mosh root@chat.harmonyapp.io ''; }; }; diff --git a/users/profiles/direnv/default.nix b/users/profiles/direnv/default.nix index d345e2d..2b51c9d 100644 --- a/users/profiles/direnv/default.nix +++ b/users/profiles/direnv/default.nix @@ -1,9 +1,6 @@ { programs.direnv = { enable = true; - nix-direnv = { - enable = true; - enableFlakes = true; - }; + nix-direnv.enable = true; }; }