From 4c9ecbc3ae6b7152e9848ef257393d48bafa309b Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 3 Apr 2021 11:25:07 +0300 Subject: [PATCH] too lazy --- flake.lock | 24 ++++++++++++------------ hosts/default.nix | 1 + hosts/lungmen.nix | 5 +++++ profiles/core.nix | 3 ++- profiles/network/default.nix | 16 ++++++++-------- users/patriot/home.nix | 24 +++++++++++++----------- 6 files changed, 41 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 131b90c..af16110 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cachix": { "locked": { - "lastModified": 1616305499, - "narHash": "sha256-WArUDrAuqq9jNLNJI0hBClleALaCysA40WBbQHQlqLg=", + "lastModified": 1617042094, + "narHash": "sha256-c8w5/Dz+r8gHIGZs1BHJPSzpP3Sga/BYebRkqBoDANY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b8530e3721fc008bacac61b6c50a29712ee2f2f", + "rev": "310885ec804f9fa0db5c705c7f5d35d415f50564", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1616724076, - "narHash": "sha256-SwbPXLjN2sLy4NL/GhodiJrdkIVZwGGTGiCN3JxH1cU=", + "lastModified": 1617220862, + "narHash": "sha256-nLka+S6Vww8hTF3ZkzK/BezvgAo1Z433/L6TR1SiXyM=", "owner": "nix-community", "repo": "home-manager", - "rev": "fedfd430f96695997b3eaf8d7e82ca79406afa23", + "rev": "ad04237d5142f53dcba258942b78e2d2bbf210c8", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1616527350, - "narHash": "sha256-VkMevY2WLU+K7T/P4wVj18Ms8zyeRfp05ILf556m5Y8=", + "lastModified": 1617082367, + "narHash": "sha256-W0cQPGjc4IVzryaGycuoS8KZkXafS1P23w/fcKLoD5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3f7e969b9860fb80750147aeb56dab1c730e756", + "rev": "04a2b269d8921505a2969fc9ec25c1f517f2b307", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1616432821, - "narHash": "sha256-dOUdRvpiMZ5rEmvcOzymhKJ73n6dJ/W02zuiM3SpK1U=", + "lastModified": 1617091432, + "narHash": "sha256-L501OfMSE3OadQaEAPTPPJCWdgn3R5hXWzP6EBTGAos=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "af1894dceaf8ba472750a37cb601a9d935b1ae9c", + "rev": "c56fca9357685dea173d81a9be67f7e1375758e3", "type": "github" }, "original": { diff --git a/hosts/default.nix b/hosts/default.nix index 0d70e33..daf0b0d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -13,6 +13,7 @@ let usr = { inherit utils; }; util = utils; nixosPersistence = "${impermanence}/nixos.nix"; + nixpkgsFlake = nixpkgs; }; modules = diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix index db04ba4..f2737df 100644 --- a/hosts/lungmen.nix +++ b/hosts/lungmen.nix @@ -167,6 +167,11 @@ in networking.interfaces.enp6s0.useDHCP = true; services = { + ipfs = { + enable = true; + enableGC = true; + autoMount = true; + }; flatpak.enable = true; xserver = { videoDrivers = [ "amdgpu" ]; diff --git a/profiles/core.nix b/profiles/core.nix index 34eb83f..e0f28b7 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, util, ... }: +{ config, lib, pkgs, util, nixpkgsFlake, ... }: let inherit (util) pkgBin; inherit (lib) fileContents mkIf; @@ -94,6 +94,7 @@ in extraOptions = '' experimental-features = nix-command flakes ca-references ''; + registry.nixpkgs.flake = nixpkgsFlake; }; # security = { diff --git a/profiles/network/default.nix b/profiles/network/default.nix index b519eb0..8e4c084 100644 --- a/profiles/network/default.nix +++ b/profiles/network/default.nix @@ -11,13 +11,13 @@ /*systemd.network = { enable = true; networks = { - internet0 = { - matchConfig = { Name = "enp6s0"; }; - networkConfig = { - Address = "192.168.1.33"; - Gateway = "192.168.1.255"; - }; - }; + internet0 = { + matchConfig = { Name = "enp6s0"; }; + networkConfig = { + Address = "192.168.1.33"; + Gateway = "192.168.1.255"; }; - };*/ + }; + }; + };*/ } diff --git a/users/patriot/home.nix b/users/patriot/home.nix index 120bd49..484584a 100644 --- a/users/patriot/home.nix +++ b/users/patriot/home.nix @@ -183,26 +183,26 @@ in /*gtk = { enable = false; font = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans 12"; + package = pkgs.dejavu_fonts; + name = "DejaVu Sans 12"; }; iconTheme = { - package = pkgs.papirus-icon-theme; - name = "Papirus Dark"; + package = pkgs.papirus-icon-theme; + name = "Papirus Dark"; }; theme = { - package = pkgs.numix-gtk-theme; - name = "Numix Dark"; + package = pkgs.numix-gtk-theme; + name = "Numix Dark"; + }; }; - }; - qt = { + qt = { enable = false; style = { - package = pkgs.adwaita-qt; - name = "adwaita-dark"; + package = pkgs.adwaita-qt; + name = "adwaita-dark"; }; - };*/ + };*/ fonts.fontconfig.enable = true; home = { @@ -245,6 +245,8 @@ in musikcube qt5ct phantomstyle + papirus-icon-theme + pcmanfm-qt ] ++ kideDeps; };