From e8280b4fbec0efc2d48c47a74d52bba537796db7 Mon Sep 17 00:00:00 2001 From: Sense T Date: Thu, 28 Sep 2023 05:36:53 +0000 Subject: [PATCH] update --- flake.lock | 119 ++++++++++++++++++++++++++++++--------------------- flake.nix | 10 ++--- home.nix | 8 ++-- programs.nix | 7 ++- 4 files changed, 87 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index a82842c..e0e847f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,11 +25,11 @@ ] }, "locked": { - "lastModified": 1693895999, - "narHash": "sha256-yN1XVFltQxiwle833KCqWkZNfBuRLWkXyEnOD+ljoYY=", + "lastModified": 1695738267, + "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c0e381fef63e4fbc6c3292c9e9cbcf479c01794", + "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", "type": "github" }, "original": { @@ -20,34 +38,36 @@ "type": "github" } }, - "naersk": { + "nil": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ - "rnix-lsp", "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1655042882, - "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", - "owner": "nix-community", - "repo": "naersk", - "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "lastModified": 1691372739, + "narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=", + "owner": "oxalica", + "repo": "nil", + "rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "naersk", + "owner": "oxalica", + "ref": "2023-08-09", + "repo": "nil", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1693663421, - "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e56990880811a451abd32515698c712788be5720", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "type": "github" }, "original": { @@ -57,47 +77,50 @@ "type": "github" } }, - "rnix-lsp": { - "inputs": { - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1669555118, - "narHash": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=", - "owner": "nix-community", - "repo": "rnix-lsp", - "rev": "95d40673fe43642e2e1144341e86d0036abd95d9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "rnix-lsp", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "rnix-lsp": "rnix-lsp" + "nil": "nil", + "nixpkgs": "nixpkgs" } }, - "utils": { + "rust-overlay": { + "inputs": { + "flake-utils": [ + "nil", + "flake-utils" + ], + "nixpkgs": [ + "nil", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "lastModified": 1688783586, + "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "7a29283cc242c2486fc67f60b431ef708046d176", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", "type": "github" } } diff --git a/flake.nix b/flake.nix index a2e98ce..adcd6c4 100644 --- a/flake.nix +++ b/flake.nix @@ -8,20 +8,20 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - rnix-lsp = { - url = "github:nix-community/rnix-lsp"; + nil = { + url = "github:oxalica/nil/2023-08-09"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { nixpkgs, home-manager, rnix-lsp, ... }: + outputs = { nixpkgs, home-manager, nil, ... }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { homeConfigurations."coder" = home-manager.lib.homeManagerConfiguration { inherit pkgs; - + # Specify your home configuration modules here, for example, # the path to your home.nix. modules = [ @@ -32,7 +32,7 @@ # Optionally use extraSpecialArgs # to pass through arguments to home.nix extraSpecialArgs = { - rnix-lsp = rnix-lsp.packages.${system}; + nil = nil.packages.${system}; }; }; }; diff --git a/home.nix b/home.nix index 91c2edc..33b751b 100644 --- a/home.nix +++ b/home.nix @@ -1,5 +1,4 @@ -{ config, pkgs, rnix-lsp, ... }: - +{ pkgs, ... }: { # Home Manager needs a bit of information about you and the paths it should # manage. @@ -18,6 +17,8 @@ # The home.packages option allows you to install Nix packages into your # environment. home.packages = with pkgs; [ + openssl.dev + pkg-config direnv procps bat @@ -35,7 +36,7 @@ less openssh openssl - rnix-lsp.rnix-lsp + nil qemu gcc9 ]; @@ -79,4 +80,5 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; + targets.genericLinux.enable = true; } diff --git a/programs.nix b/programs.nix index abc7086..5b4830d 100644 --- a/programs.nix +++ b/programs.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: { +{ programs = { ssh = { enable = true; @@ -6,6 +6,11 @@ "git-ssh.sense-t.eu.org" = { hostname = "gitea.default"; }; + "nas" = { + hostname = "192.168.1.25"; + user = "rouji"; + port = 2334; + }; }; };