diff --git a/home/default.nix b/home/default.nix index 2101617..bf49f7d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -8,6 +8,7 @@ imports = [ ./modules ./system.nix + ./host.nix ]; home.username = "xqtc"; home.homeDirectory = diff --git a/home/host.nix b/home/host.nix new file mode 100644 index 0000000..dd48ec8 --- /dev/null +++ b/home/host.nix @@ -0,0 +1,6 @@ +{lib, ...}: { + options.host = lib.mkOption { + type = lib.types.str; + default = "generic"; + }; +} diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index 3ee372f..eac4b32 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -52,6 +52,8 @@ in { ++ (with pkgs; [ nh + bat + ncspot wakatime-cli diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index 30305e9..cca0b62 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -35,7 +35,7 @@ }; }; plugins = { -neorg = { + neorg = { enable = true; modules = { "core.defaults" = { @@ -51,17 +51,16 @@ neorg = { "core.concealer" = { __empty = null; }; - "core.export" = { - __empty = null; - }; - "core.export.markdown" = { - __empty = null; - }; + "core.export" = { + __empty = null; + }; + "core.export.markdown" = { + __empty = null; + }; }; }; gitblame.enable = true; - lspkind.enable = true; persistence = { enable = true; diff --git a/home/modules/shell.nix b/home/modules/shell.nix index c3c9fb6..48fb348 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -18,8 +18,14 @@ }; initExtraFirst = if !(config.os == "linux") - then "export PATH=$PATH:~/.cargo/bin/\n${pkgs.pfetch-rs}/bin/pfetch" - else "${pkgs.pfetch-rs}/bin/pfetch\n"; + then "export PATH=$PATH:~/.cargo/bin/\n${pkgs.pfetch-rs}/bin/pfetch\n" + else + "${pkgs.pfetch-rs}/bin/pfetch\n" + + ( + if config.host == "asmodeus" + then "comin status\n" + else "" + ); plugins = [ { name = "zsh-autocomplete"; @@ -36,8 +42,8 @@ enable = true; enableNushellIntegration = true; settings = { - style = "compact"; - inline_height = 10; + style = "compact"; + inline_height = 10; }; }; eza.enable = true; diff --git a/hosts/x86_64-linux/beleth/factorio.nix b/hosts/x86_64-linux/beleth/factorio.nix index 6f3d734..ddb4c46 100644 --- a/hosts/x86_64-linux/beleth/factorio.nix +++ b/hosts/x86_64-linux/beleth/factorio.nix @@ -1,9 +1,14 @@ -{pkgs, config, lib, ...}: { +{ + pkgs, + config, + lib, + ... +}: { services.factorio = { enable = true; openFirewall = true; # extraSettingsFile = /etc/factorio_settings.json; - admins = [ "frottingqueen" ]; + admins = ["frottingqueen"]; }; sops.secrets.factorio_server_settings = { diff --git a/hosts/x86_64-linux/beleth/unfree-predicate.nix b/hosts/x86_64-linux/beleth/unfree-predicate.nix deleted file mode 100644 index e69de29..0000000 diff --git a/modules/home-manager.nix b/modules/home-manager.nix index 735ee2d..dd7e9e2 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -1,6 +1,7 @@ { lib, inputs, + config, ... }: let dwl-source = inputs.dwl-source; @@ -11,7 +12,7 @@ in { config = { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.backupFileExtension = "hm_bak"; + home-manager.backupFileExtension = "hm_bak"; home-manager.extraSpecialArgs = { inherit inputs; @@ -19,6 +20,7 @@ in { }; home-manager.users.xqtc = {...}: { imports = [ + {config.host = config.networking.hostName;} ../home inputs.nixvim.homeManagerModules.nixvim inputs.sops-nix.homeManagerModules.sops