From a54e7d96733a38080618b20895f73f2b1402057f Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 31 Jul 2023 16:32:50 +1200 Subject: [PATCH] fixing my ape like code --- flake.lock | 106 +++++++++++++++++++++++ flake.nix | 4 +- system/common/global/default.nix | 2 +- system/common/global/locale.nix | 1 - system/common/global/security.nix | 2 +- system/common/user/ooks/default.nix | 6 +- system/ooksx1/hardware-configuration.nix | 4 +- system/ooksx1/ooksx1.nix | 2 +- 8 files changed, 117 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 7cb15f5..9462c37 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,74 @@ { "nodes": { + "base16-schemes": { + "flake": false, + "locked": { + "lastModified": 1680729003, + "narHash": "sha256-M9LHTL24/W4oqgbYRkz0B2qpNrkefTs98pfj3MxIXnU=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "dc048afa066287a719ddbab62b3e19e4b5110cf0", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-schemes", + "type": "github" + } + }, + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1690776143, + "narHash": "sha256-QwcKl+CuyGhXw/Y4j1Uf2KF/xpjIEsfQm9eKv0QPk9Y=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "9e6f194e234bc929624d7bd72111e469b8af60d6", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "hardware": { + "locked": { + "lastModified": 1690704397, + "narHash": "sha256-sgIWjcz0e+x87xlKg324VtHgH55J5rIuFF0ZWRDvQoE=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "96e5a0a0e8568c998135ea05575a9ed2c87f5492", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixos-hardware", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -20,6 +89,25 @@ "type": "github" } }, + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1682108218, + "narHash": "sha256-tMr7BbxualFQlN+XopS8rMMgf2XR9ZfRuwIZtjsWmfI=", + "owner": "misterio77", + "repo": "nix-colors", + "rev": "b92df8f5eb1fa20d8e09810c03c9dc0d94ef2820", + "type": "github" + }, + "original": { + "owner": "misterio77", + "repo": "nix-colors", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1690031011, @@ -36,9 +124,27 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1680397293, + "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "root": { "inputs": { + "firefox-addons": "firefox-addons", + "hardware": "hardware", "home-manager": "home-manager", + "nix-colors": "nix-colors", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index f372b28..f23e029 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ }; - outputs = { self, nixpkgs, home-manager, ... }: + outputs = { self, nixpkgs, home-manager, ... }@inputs: let inherit (self) outputs; system = "x86_64-linux"; @@ -28,7 +28,7 @@ nixosConfigurations = { # X1 Carbon ooksx1 = lib.nixosSystem { - modules = [ ./system/ooksx1 ]; + modules = [ ./system/ooksx1/ooksx1.nix ]; specialArgs = { inherit inputs outputs; }; }; }; diff --git a/system/common/global/default.nix b/system/common/global/default.nix index 65babec..9130a5f 100644 --- a/system/common/global/default.nix +++ b/system/common/global/default.nix @@ -8,7 +8,7 @@ ./systemdboot.nix ./pipewire.nix # ./auto-upgrade.nix # still needs some work - ] ++ (builtins.attrValues outputs.nixosModules); + ]; home-manager.extraSpecialArgs = { inherit inputs outputs; }; diff --git a/system/common/global/locale.nix b/system/common/global/locale.nix index 73c7221..cd24d78 100644 --- a/system/common/global/locale.nix +++ b/system/common/global/locale.nix @@ -1,7 +1,6 @@ { lib, ... }: { i18n = { defaultLocale = lib.mkDefault "en_US.UTF-8"; - }; supportedLocales = lib.mkDefault [ "en_US.UTF-8/UTF-8" ]; diff --git a/system/common/global/security.nix b/system/common/global/security.nix index a0cbe19..0dc669a 100644 --- a/system/common/global/security.nix +++ b/system/common/global/security.nix @@ -20,7 +20,7 @@ extraConfig = '' ooks ALL=(ALL) NOPASSWD:ALL ''; - } + }; }; systemd = { diff --git a/system/common/user/ooks/default.nix b/system/common/user/ooks/default.nix index 66fd176..f7af369 100644 --- a/system/common/user/ooks/default.nix +++ b/system/common/user/ooks/default.nix @@ -3,7 +3,7 @@ let ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config. in { users.users.ooks = { - isNormalUser = true + isNormalUser = true; shell = pkgs.fish; extraGroups = [ "wheel" @@ -19,6 +19,8 @@ in packages = [ pkgs.home-manager ]; }; - home-manager.users.ooks = import ../../../../home/ooks/${config.networking.hostName} + home-manager.users.ooks = import ../../../../home/ooks/${config.networking.hostName}.nix; + + services.geoclue2.enable = true; } diff --git a/system/ooksx1/hardware-configuration.nix b/system/ooksx1/hardware-configuration.nix index 1cc2b75..c852b24 100644 --- a/system/ooksx1/hardware-configuration.nix +++ b/system/ooksx1/hardware-configuration.nix @@ -41,10 +41,10 @@ fsType = "vfat"; }; - swapDevices = [ + swapDevices = [{ device = "/swap/swapfile"; size = 8196; - ]; + }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/system/ooksx1/ooksx1.nix b/system/ooksx1/ooksx1.nix index 68d663e..434f21a 100644 --- a/system/ooksx1/ooksx1.nix +++ b/system/ooksx1/ooksx1.nix @@ -16,7 +16,7 @@ ./hardware-configuration.nix ../common/user/ooks - ../common/global/ + ../common/global ../common/opt/bluetooth.nix ];