summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/nix-on-droid/home.nix165
-rw-r--r--modules/nix-on-droid/nix-on-droid.nix5
-rw-r--r--modules/nixos/networking/networks/109-199-104-83.nix32
-rw-r--r--modules/nixos/phoenix.nix45
4 files changed, 31 insertions, 216 deletions
diff --git a/modules/nix-on-droid/home.nix b/modules/nix-on-droid/home.nix
deleted file mode 100644
index c545105..0000000
--- a/modules/nix-on-droid/home.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-{
- config,
- lib,
- pkgs,
- ...
-}: {
- home = {
- username = "andromeda";
- homeDirectory = "/home/${config.home.username}";
- stateVersion = "26.05";
- packages = [
- pkgs.brush
- pkgs.dust
- pkgs.fzf
- pkgs.glow
- pkgs.nix-output-monitor
- pkgs.ranger
- pkgs.rip2
- pkgs.ripgrep
- pkgs.tree
- pkgs.zoxide
- ];
- };
- programs = {
- bash = {
- enable = true;
- shellAliases = {
- neofetch = "fastfetch";
- ls = lib.mkForce "lsd";
- ll = lib.mkForce "lsd -l";
- l = "lsd -la";
- cd = "z";
- gg = "git log --oneline --abbrev-commit --all --graph --decorate --color";
- md = "glow";
- };
- bashrcExtra = ''
- PS1="\u@\h:\w$"
- eval "$(zoxide init bash)"
- '';
- };
- btop = {
- enable = true;
- settings = {
- theme_background = false;
- vim_keys = true;
- rounded_corners = false;
- graph_symbol = "braille";
- update_ms = 150;
- proc_sorting = "cpu lazy";
- proc_gradient = false;
- proc_left = true;
- cpu_single_graph = true;
- cpu_bottom = true;
- clock_format = "/user@/host:/uptime@%H:%M";
- background_update = true;
- mem_graphs = false;
- mem_below_net = true;
- show_swap = false;
- only_physical = true;
- show_io_stat = true;
- io_mode = false;
- io_graph_combined = false;
- };
- };
- fastfetch.enable = true;
- git = {
- enable = true;
- settings = {
- user = {
- name = config.home.username;
- email = "${config.home.username}@android";
- };
- init.defaultBranch = "master";
- };
- };
- home-manager.enable = true;
- lsd.enable = true;
- nvf = {
- enable = true;
- settings.vim = {
- autocomplete.nvim-cmp.enable = false;
- formatter.conform-nvim = {
- enable = true;
- setupOpts.format_on_save = {
- lsp_format = "fallback";
- timeout_ms = 5000;
- };
- };
- lsp.otter-nvim.enable = true;
- git.enable = true;
- keymaps = [
- {
- key = "<Down>";
- mode = ["i" "n" "v" "c"];
- action = "<NOP>";
- }
- {
- key = "<Up>";
- mode = ["i" "n" "v" "c"];
- action = "<NOP>";
- }
- {
- key = "<Left>";
- mode = ["i" "n" "v" "c"];
- action = "<NOP>";
- }
- {
- key = "<Right>";
- mode = ["i" "n" "v" "c"];
- action = "<NOP>";
- }
- {
- key = "jj";
- mode = ["i"];
- action = "<Esc>";
- }
- {
- key = "kk";
- mode = ["i"];
- action = "<Esc>";
- }
- {
- key = "jk";
- mode = ["i"];
- action = "<Esc>";
- }
- {
- key = "kj";
- mode = ["i"];
- action = "<Esc>";
- }
- {
- key = "<Esc>";
- mode = ["i"];
- action = "<Nop>";
- }
- ];
- languages = {
- nix = {
- enable = true;
- format.enable = true;
- lsp.enable = true;
- };
- haskell = {
- enable = true;
- lsp.enable = true;
- };
- };
- lineNumberMode = "relative";
- options = {
- tabstop = 2;
- shiftwidth = 2;
- expandtab = true;
- smarttab = true;
- foldmethod = "indent";
- number = true;
- colorcolumn = "80";
- };
- statusline.lualine.enable = true;
- syntaxHighlighting = true;
- };
- };
- ssh.enable = true;
- };
-}
diff --git a/modules/nix-on-droid/nix-on-droid.nix b/modules/nix-on-droid/nix-on-droid.nix
deleted file mode 100644
index 5e1b9b1..0000000
--- a/modules/nix-on-droid/nix-on-droid.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
- environment.packages = [pkgs.git];
- system.stateVersion = "26.05";
- nix.settings.experimentalFeatures = ["nix-command" "flakes"];
-}
diff --git a/modules/nixos/networking/networks/109-199-104-83.nix b/modules/nixos/networking/networks/109-199-104-83.nix
index ad599b1..9064e2f 100644
--- a/modules/nixos/networking/networks/109-199-104-83.nix
+++ b/modules/nixos/networking/networks/109-199-104-83.nix
@@ -1,6 +1,6 @@
{
networking = {
- useDHCP = false;
+ useNetworkd = true;
hostName = "109-199-104-83";
firewall = {
enable = true;
@@ -8,6 +8,36 @@
allowedUDPPorts = [80 443];
};
};
+
+ # the following is from nixos-bite
+
+ # netif=$(ip -6 route show default | sed -r 's|.*default.+?dev ([a-z0-9]+).*|\1|' | head -n1)
+ # netifx=enx$(ip link show dev "$netif" | grep link/ether | sed -r 's|.*link/ether ([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}).*|\1\2\3\4\5\6|')
+ # netip6=$(ip -6 address show dev "$netif" scope global | sed -z -r 's|.*inet6 ([0-9a-f:]+)/([0-9]+).*|"\1/\2"|')
+ # netgw6=$(ip -6 route show dev "$netif" default | sed -r 's|.*default.+?via ([0-9a-f:]+).*|"\1"|' | head -n1)
+ # netip4=$(ip -4 address show dev "$netif" scope global | sed -z -r 's|.*inet ([0-9.]+)/([0-9]+).*|"\1/\2"|')
+ # netgw4=$(ip -4 route show dev "$netif" default | sed -r 's|.*default.+?via ([0-9.]+).*|"\1"|' | head -n1)
+
+ # route=""
+ # [[ -n "${netgw4}" ]] && route="$route { Gateway = $netgw4; GatewayOnLink = true; }"
+ # [[ -n "${netgw6}" ]] && route="$route { Gateway = $netgw6; }"
+
+ # dns='"2620:fe::fe" "9.9.9.9"'
+
+ # systemd.network = {
+ # enable = true;
+ # networks."40-wan" = {
+ # matchConfig.name = "enx0050565f4fff";
+ # address = ["2a02:c207:2299:8419::1/64" "109.199.104.83/20"];
+ # routes = [
+ # {
+ # Gateway = ["109.199.96.1" "fe80::1"];
+ # GatewayOnLink = true;
+ # }
+ # ];
+ # dns = ["9.9.9.9" "2620:fe::fe"];
+ # };
+ # };
services.cloud-init = {
enable = true;
network.enable = true;
diff --git a/modules/nixos/phoenix.nix b/modules/nixos/phoenix.nix
deleted file mode 100644
index a656f7f..0000000
--- a/modules/nixos/phoenix.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- pkgs,
- config,
- lib,
- ...
-}: {
- options.programs.firefox.phoenix = {
- enable =
- lib.mkEnableOption "Enable privacy & security hardening of Firefox using the Phoenix configs"
- // {
- default = true;
- };
- firefoxPackages = lib.mkOption {
- type = lib.types.listOf lib.types.str;
- default = ["firefox"];
- description = "The name of Firefox packages of current pkgs to patch with phoenix config and policy.";
- };
- };
- config = let
- cfg = config.programs.firefox.phoenix;
- in
- lib.mkIf cfg.enable {
- assertions = [
- {
- assertion = !pkgs.stdenv.isDarwin;
- message = "Phoenix module has not been ported to nix-darwin yet. Contributions welcomed.";
- }
- ];
- environment.etc."firefox/defaults/pref/phoenix-desktop.js".source = "${pkgs.phoenix}/pref/phoenix-desktop.js";
- environment.etc."firefox/phoenix/userjs".source = "${pkgs.phoenix}/userjs";
- environment.etc."firefox/phoenix/configs".source = "${pkgs.phoenix}/configs";
- environment.etc."firefox/phoenix/assets".source = "${pkgs.phoenix}/assets";
- programs.firefox.policies =
- (builtins.fromJSON (builtins.readFile "${pkgs.phoenix}/policies.json")).policies;
- nixpkgs.overlays = [
- (import ../../overlays/phoenix.nix)
- (
- final: prev:
- builtins.listToAttrs (
- map (p: lib.nameValuePair p (final.withPhoenix prev.${p})) cfg.firefoxPackages
- )
- )
- ];
- };
-}
generated by cgit v1.3 (git 2.53.0) at 2026-05-07 01:47:20 +0000