From c7291705a47eb00e0b29ae7fdba4937cfcc4908f Mon Sep 17 00:00:00 2001 From: Sebastian Moser Date: Fri, 5 Apr 2024 22:25:14 +0200 Subject: [PATCH] some stuff --- flake.lock | 8 ++++---- flake.nix | 2 +- programs/bash.nix | 1 + programs/lf/default.nix | 9 ++++++--- programs/ssh.nix | 11 +++++++++-- users/me/gui-home.nix | 14 +++++++++----- 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 768c775..c6d9e53 100644 --- a/flake.lock +++ b/flake.lock @@ -485,7 +485,7 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705270732, + "lastModified": 1712189778, "narHash": "sha256-0e3gIDBHxmhAB5euNqOuf4i2LfWqKRSXPDX/HxaCJIs=", "path": "/home/me/work/log/new", "type": "path" @@ -774,11 +774,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1712122226, + "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cf183f8..ebf6c92 100644 --- a/flake.nix +++ b/flake.nix @@ -119,7 +119,7 @@ system = "x86_64-linux"; modules = [ ./hosts/main.nix - ./hardware/my-hp-laptop.nix + ./hardware/hpm-laptop.nix ]; }; diff --git a/programs/bash.nix b/programs/bash.nix index 0874888..06ff582 100644 --- a/programs/bash.nix +++ b/programs/bash.nix @@ -44,6 +44,7 @@ }; shellAliases = { + ports = "${pkgs.lsof}/bin/lsof -i -P -n"; losetup = "${pkgs.util-linux}/bin/losetup"; log = let log = pkgs.writeShellApplication { diff --git a/programs/lf/default.nix b/programs/lf/default.nix index 3ddfb60..569e0d3 100644 --- a/programs/lf/default.nix +++ b/programs/lf/default.nix @@ -1,4 +1,4 @@ -{ pkgs, self, confDir, ... }@params: +{ pkgs, self, confDir, system, inputs, ... }@params: { home.file.".config/lf/icons".source = "${self}/programs/lf/icons"; programs.lf = let @@ -28,7 +28,10 @@ ]; text = builtins.readFile "${self}/programs/lf/previewer"; }; - mylfWrapper = pkgs.writeShellApplication { + # use newest version of ueberzug from nixpkgs unstable because: https://github.com/ueber-devel/ueberzug/issues/15 + # mylfWrapper = let myUeberzug = inputs.nixpkgs-unstable.legacyPackages.${system}.ueberzug; + mylfWrapper = let myUeberzug = pkgs.ueberzug.overrideAttrs (final: prev: { version = "18.2.2"; }); + in pkgs.writeShellApplication { name = "lf"; #runtimeInputs = with pkgs; [ curl w3m ]; @@ -66,7 +69,7 @@ [ -d "''${XDG_CACHE_HOME}/lf" ] || mkdir -p "''${XDG_CACHE_HOME}/lf" export FIFO_UEBERZUG="''${XDG_CACHE_HOME}/lf/ueberzug-$$" mkfifo "$FIFO_UEBERZUG" - ${pkgs.ueberzug}/bin/ueberzug layer -s < "$FIFO_UEBERZUG" -p json & + ${myUeberzug}/bin/ueberzug layer -s < "$FIFO_UEBERZUG" -p json & exec 3> "$FIFO_UEBERZUG" trap cleanup HUP INT QUIT TERM PWR EXIT ${mylf}/bin/lf "$@" 3>&- diff --git a/programs/ssh.nix b/programs/ssh.nix index ea9e5f3..61b9855 100644 --- a/programs/ssh.nix +++ b/programs/ssh.nix @@ -64,14 +64,21 @@ hostname = "140.238.213.48"; user = "ubuntu"; }; - + hec-builder = { + hostname = "10.5.5.56"; + user = "root"; + }; + storage = { + hostname = "10.5.5.50"; + user = "root"; + }; }; }; home.file.".ssh/known_hosts".force = true; home.file.".ssh/known_hosts".text = '' hpm ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ+FpaNOf+ao6RCa6e43vAHFcQZTGu45rIqAG3Vx0/M8 - lush ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFevbQp0XTZOVFZTDMKzgsZn4NNEIN+SFMqUhSbF5WFo + lush ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNQClF4DQhO1jSkVWhusp1wfxadSsDclg0TbFGbR+Gy github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl rpi ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOX+6B6Axx7AqgCm1H1rrou/3yOLeOLcTd8s0In0mOIY files ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOX+6B6Axx7AqgCm1H1rrou/3yOLeOLcTd8s0In0mOIY diff --git a/users/me/gui-home.nix b/users/me/gui-home.nix index 1cc65ce..da7d259 100755 --- a/users/me/gui-home.nix +++ b/users/me/gui-home.nix @@ -81,6 +81,7 @@ # use signal from unstable, because the app itself says it would to update to be usable self.inputs.nixpkgs-unstable.legacyPackages.x86_64-linux.signal-desktop + self.inputs.nixpkgs-unstable.legacyPackages.x86_64-linux.ticktick element-desktop discord wireshark @@ -103,9 +104,9 @@ rustc #localPacketTracer8 - (ciscoPacketTracer8.overrideAttrs (prev: final: { - src = /home/me/work/software/CiscoPacketTracer_821_Ubuntu_64bit.deb; - })) + #(ciscoPacketTracer8.overrideAttrs (prev: final: { + #src = /home/me/work/software/CiscoPacketTracer_821_Ubuntu_64bit.deb; + #})) #ciscoPacketTracer8 @@ -142,7 +143,7 @@ if fields[1] != '00000000' or not int(fields[3], 16) & 2: # If not default route or not RTF_GATEWAY, skip it continue - if fields[0] != "wlp2s0": + if fields[0] != "wlo1": # only check on wlan interface continue @@ -217,7 +218,7 @@ continue # do arp scan - ips = subprocess.run(["sudo", "${pkgs.arp-scan}/bin/arp-scan", "-l", "-x", "-I", "wlp2s0"], capture_output=True) + ips = subprocess.run(["sudo", "${pkgs.arp-scan}/bin/arp-scan", "-l", "-x", "-I", "wlo1"], capture_output=True) for line in ips.stdout.decode("utf-8").split("\n"): #print("arp-scan line:", line) try: @@ -250,6 +251,9 @@ with open("/etc/current_hosts", "w") as file: lines = [] for key, val in old.items(): + if val is None: + print(f"val for {key} was None, skipping") + continue lines.append(val + " " + key) file.write("\n".join(lines) + "\n")