local stuff

3 files changed, 67 insertions, 60 deletions

diff --git a/hosts/local/ohira/configuration.nix b/hosts/local/ohira/configuration.nix
index 480926a..1144f48 100644
--- a/hosts/local/ohira/configuration.nix
+++ b/hosts/local/ohira/configuration.nix
@@ -1,11 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     # Include the results of the hardware scan.
     ../../base.nix
@@ -70,6 +66,7 @@
 
   i18n = {
     inputMethod = {
+      enable = true;
       type = "fcitx5";
       fcitx5.addons = with pkgs; [fcitx5-mozc];
     };
@@ -111,21 +108,30 @@
   # services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
+  programs.fish = {
+    enable = true;
+    shellAliases = {
+      l = "lsd -lAh";
+      la = "lsd -lAh";
+      ports = "sudo lsof -i -P -n | grep LISTEN";
+      gco = "git checkout";
+      gcob = "git checkout -b";
+      v = "nvim";
+      sv = "sudo nvim";
+      dotsin = "sh ~/dotfiles/commit.sh";
+      sourceit = ". (sed 's/^/export /' .env | psub)";
+      sqlite = "rlwrap sqlite3";
+      # rsyn = "rsync -zuvaP --filter=':- .gitignore'"
+    };
+  };
+
   users.users.y = {
+    shell = pkgs.fish;
     isNormalUser = true;
     description = "y";
     extraGroups = ["networkmanager" "wheel"];
     packages = with pkgs; [
-      # firefox
-      #  thunderbird
-    ];
-  };
-  users.users.leo2 = {
-    isNormalUser = true;
-    description = "leo2";
-    extraGroups = ["networkmanager" "wheel"];
-    packages = with pkgs; [
-      # firefox
+      firefox
       #  thunderbird
     ];
   };
@@ -206,7 +212,7 @@
       #   font-awesome
       #   inconsolata # monospaced
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts-emoji
       noto-fonts-extra
       #   powerline-fonts
diff --git a/hosts/local/s15/configuration.nix b/hosts/local/s15/configuration.nix
index ed159df..a326dd4 100644
--- a/hosts/local/s15/configuration.nix
+++ b/hosts/local/s15/configuration.nix
@@ -40,56 +40,56 @@ in {
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "24.05"; # Did you read the comment?
 
-  systemd.services.periodic-http-request = {
-    description = "Periodic HTTP Request Service";
+  # systemd.services.periodic-http-request = {
+  #   description = "Periodic HTTP Request Service";
 
-    # Run every 15 minutes
-    startAt = "*:0/30";
+  #   # Run every 15 minutes
+  #   startAt = "*:0/30";
 
-    # Service configuration
-    serviceConfig = {
-      Type = "oneshot";
-      User = "nobody"; # Run as unprivileged user
-      DynamicUser = true;
-      PrivateTmp = true;
-      ProtectSystem = "strict";
-      ProtectHome = true;
-      NoNewPrivileges = true;
-    };
+  #   # Service configuration
+  #   serviceConfig = {
+  #     Type = "oneshot";
+  #     User = "nobody"; # Run as unprivileged user
+  #     DynamicUser = true;
+  #     PrivateTmp = true;
+  #     ProtectSystem = "strict";
+  #     ProtectHome = true;
+  #     NoNewPrivileges = true;
+  #   };
 
-    path = [pkgs.curl];
+  #   path = [pkgs.curl];
 
-    script = ''
-      TOKEN="1993620520:AAE-RACWzn8YuQOkBfDxbkuKBigZQb-w9wE"
-      URL="https://api.telegram.org/bot$TOKEN/sendMessage"
+  #   script = ''
+  #     TOKEN="1993620520:AAE-RACWzn8YuQOkBfDxbkuKBigZQb-w9wE"
+  #     URL="https://api.telegram.org/bot$TOKEN/sendMessage"
 
-      get_public_ipv4() {
-        # Try ipify first
-        IP=$(curl -s https://api.ipify.org)
-        if [ -n "$IP" ]; then
-          echo "$IP"
-          return
-        fi
+  #     get_public_ipv4() {
+  #       # Try ipify first
+  #       IP=$(curl -s https://api.ipify.org)
+  #       if [ -n "$IP" ]; then
+  #         echo "$IP"
+  #         return
+  #       fi
 
-        # Fallback to icanhazip
-        IP=$(curl -s https://ipv4.icanhazip.com)
-        if [ -n "$IP" ]; then
-          echo "$IP"
-          return
-        fi
+  #       # Fallback to icanhazip
+  #       IP=$(curl -s https://ipv4.icanhazip.com)
+  #       if [ -n "$IP" ]; then
+  #         echo "$IP"
+  #         return
+  #       fi
 
-        # Last resort: ipecho
-        curl -s https://ipecho.net/plain
-      }
+  #       # Last resort: ipecho
+  #       curl -s https://ipecho.net/plain
+  #     }
 
-      curl -s -X POST "$URL" \
-      -H "User-Agent: NixOS-Periodic-Request" \
-      -H 'Content-Type: application/json' \
-       -d "{\"chat_id\": \"547865560\", \"text\": \"s15 reporting for duty $(get_public_ipv4)\"}" \
-      --retry 3 \
-      --retry-delay 5 \
-      --max-time 30 \
-      -o /dev/null
-    '';
-  };
+  #     curl -s -X POST "$URL" \
+  #     -H "User-Agent: NixOS-Periodic-Request" \
+  #     -H 'Content-Type: application/json' \
+  #      -d "{\"chat_id\": \"547865560\", \"text\": \"s15 reporting for duty $(get_public_ipv4)\"}" \
+  #     --retry 3 \
+  #     --retry-delay 5 \
+  #     --max-time 30 \
+  #     -o /dev/null
+  #   '';
+  # };
 }
diff --git a/update.sh b/update.sh
new file mode 100644
index 0000000..d25b443
--- /dev/null
+++ b/update.sh
@@ -0,0 +1 @@
+NIX_CONFIG="access-tokens = github.com=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" nix flake update