From 5010c61a0a6bd06a8cb79e09d99b745256e52537 Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Thu, 13 Jul 2023 16:44:07 +0200 Subject: [PATCH] niksos -> niks --- flake.lock | 266 ++++++++---------- hosts/default.nix | 6 +- hosts/{niksos => niks}/configuration.nix | 1 - hosts/{niksos => niks}/default.nix | 0 .../hardware-configuration.nix | 0 5 files changed, 128 insertions(+), 145 deletions(-) rename hosts/{niksos => niks}/configuration.nix (98%) rename hosts/{niksos => niks}/default.nix (100%) rename hosts/{niksos => niks}/hardware-configuration.nix (100%) diff --git a/flake.lock b/flake.lock index a57e3c65..211a72f6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,13 +1,85 @@ { "nodes": { + "conduit": { + "inputs": { + "crane": "crane", + "fenix": "fenix", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689084705, + "narHash": "sha256-FKIqKmXml0vNy8BcS95OdVnIFwGbGF3pgu+raj51cv4=", + "owner": "famedly", + "repo": "conduit", + "rev": "3c6ffd88bf298d61df244c17c14557b646a14e6c", + "type": "gitlab" + }, + "original": { + "owner": "famedly", + "repo": "conduit", + "type": "gitlab" + } + }, + "crane": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "conduit", + "flake-utils" + ], + "nixpkgs": [ + "conduit", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1686621798, + "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=", + "owner": "ipetkov", + "repo": "crane", + "rev": "75f7d715f8088f741be9981405f6444e2d49efdd", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "conduit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1687004852, + "narHash": "sha256-wRSUs+v8xtIJaFlWO5NLFQjkq5+eYhxHHXnZKsZ9DpQ=", + "owner": "nix-community", + "repo": "fenix", + "rev": "df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -21,11 +93,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -54,27 +126,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixneovim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688552611, - "narHash": "sha256-pV/1/AU1l5CNFeKmdJ1jofcaKHhtKAbxY4gazeCyoSo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b23c7501f7e0a001486c9a5555a6c53ac7b08e85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -178,71 +229,6 @@ "type": "github" } }, - "nix-flake-tests": { - "locked": { - "lastModified": 1677844186, - "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=", - "owner": "antifuchs", - "repo": "nix-flake-tests", - "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb", - "type": "github" - }, - "original": { - "owner": "antifuchs", - "repo": "nix-flake-tests", - "type": "github" - } - }, - "nixneovim": { - "inputs": { - "flake-utils": "flake-utils", - "home-manager": "home-manager_2", - "nix-flake-tests": "nix-flake-tests", - "nixneovimplugins": "nixneovimplugins", - "nixpkgs": "nixpkgs_3", - "nmd": "nmd", - "nmt": "nmt" - }, - "locked": { - "lastModified": 1688653494, - "narHash": "sha256-BVOOhT8hx/8QoowVEAdWxP2W/UgoZMbbTsj1xBglYlo=", - "owner": "nixneovim", - "repo": "nixneovim", - "rev": "218db8db7435d893dfeb3267a3a44e0fee8ecb06", - "type": "github" - }, - "original": { - "owner": "nixneovim", - "repo": "nixneovim", - "type": "github" - } - }, - "nixneovimplugins": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "nixneovim", - "flake-utils" - ], - "nixpkgs": [ - "nixneovim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688371914, - "narHash": "sha256-jq43Ke9HThX0NG1qO08GgezjPkCwBX8pzvsixYjLQIs=", - "owner": "nixneovim", - "repo": "nixneovimplugins", - "rev": "f7ce3c7d9bbf50dc1d25921fa2c74e03c23bb541", - "type": "github" - }, - "original": { - "owner": "nixneovim", - "repo": "nixneovimplugins", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1688500189, @@ -276,22 +262,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1688590700, "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", @@ -307,45 +277,57 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1687627428, - "narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=", - "owner": "~rycee", - "repo": "nmd", - "rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1683843030, - "narHash": "sha256-2K9tFpypgSORyUTRAL7MFRKCXU4GykmhIDrrIydtPdI=", - "owner": "jooooscha", - "repo": "nmt", - "rev": "f30b96093eb056f1bcc60199545344b4e4a72c5a", - "type": "github" - }, - "original": { - "owner": "jooooscha", - "repo": "nmt", - "type": "github" - } - }, "root": { "inputs": { + "conduit": "conduit", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "nixneovim": "nixneovim", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1686936697, + "narHash": "sha256-mCoPr1nNWKpsoGMBFaK/sswkLloRCZuoWi2a+OKs3vk=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "conduit", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "conduit", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685759304, + "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { diff --git a/hosts/default.nix b/hosts/default.nix index 53c48197..f3893b3b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -8,11 +8,12 @@ home-manager = inputs.home-manager.nixosModules.home-manager; home-configs = import ../homes; in { - niksos = lib.nixosSystem { + niks = lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit lib inputs self;}; modules = [ - ./niksos + {networking.hostName = "niks";} + ./niks ] ++ [ # this list includes an alias for the home-manager module, and another for the global home-manager configuration directory @@ -24,6 +25,7 @@ in { system = "x86_86-linux"; specialArgs = {inherit lib inputs self;}; modules = [ + {networking.hostName = "chmura";} ./chmura ]; }; diff --git a/hosts/niksos/configuration.nix b/hosts/niks/configuration.nix similarity index 98% rename from hosts/niksos/configuration.nix rename to hosts/niks/configuration.nix index 396b6f67..273e8ea4 100644 --- a/hosts/niksos/configuration.nix +++ b/hosts/niks/configuration.nix @@ -20,7 +20,6 @@ in boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; - networking.hostName = "niksos"; networking.networkmanager.enable = true; time.timeZone = "Europe/Warsaw"; diff --git a/hosts/niksos/default.nix b/hosts/niks/default.nix similarity index 100% rename from hosts/niksos/default.nix rename to hosts/niks/default.nix diff --git a/hosts/niksos/hardware-configuration.nix b/hosts/niks/hardware-configuration.nix similarity index 100% rename from hosts/niksos/hardware-configuration.nix rename to hosts/niks/hardware-configuration.nix