chore: bump flake inputs

feat: add nix-update
fix: add completion for tailscale
2024-03-06 18:52:08 +01:00 · 2024-03-06 18:51:49 +01:00 · 2024-03-06 18:51:29 +01:00 · 2024-03-06 18:50:48 +01:00 · 2024-03-06 18:47:35 +01:00 · 2024-03-06 18:47:05 +01:00
14 changed files with 120 additions and 69 deletions
--- a/flake.lock
+++ b/flake.lock
@ -14,11 +14,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1703433843,
-        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
+        "lastModified": 1707830867,
+        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
+        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
        "type": "github"
      },
      "original": {
@ -38,11 +38,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1704875591,
-        "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=",
+        "lastModified": 1708091384,
+        "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b",
+        "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790",
        "type": "github"
      },
      "original": {
@ -97,11 +97,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1706830856,
-        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+        "lastModified": 1709336216,
+        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
        "type": "github"
      },
      "original": {
@ -166,11 +166,11 @@
    },
    "master": {
      "locked": {
-        "lastModified": 1707219153,
-        "narHash": "sha256-eX89KCMTsy26GaHOxTqgj1ecdUYEhuOKrrVzKrLAbbQ=",
+        "lastModified": 1709741673,
+        "narHash": "sha256-0NBKiVhTdJqMcrcMtVgPw5WcRdhvuk8zXeZeh8IQLeI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "919cb864b1d7a4bee3d88c801f71daede4be5aec",
+        "rev": "fc3cc21d2a4e708cd1974b2fa44b670f1fc3fdbd",
        "type": "github"
      },
      "original": {
@ -187,11 +187,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706833576,
-        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
+        "lastModified": 1709554374,
+        "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
+        "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7",
        "type": "github"
      },
      "original": {
@ -219,11 +219,11 @@
    },
    "nixos-flake": {
      "locked": {
-        "lastModified": 1705990839,
-        "narHash": "sha256-Gb0bvp7BiHBn2PkssT4CiBhD7lVWqSHEBfiai/RFfSQ=",
+        "lastModified": 1708785992,
+        "narHash": "sha256-0gEsD/EpKrbLuLcYT9CXIVEY6ChmVvVTZJDAsqBXDhg=",
        "owner": "srid",
        "repo": "nixos-flake",
-        "rev": "244072b1f9088833627046d703d7973b90fe7843",
+        "rev": "50203d68b305abff2f29e555992eb55ddeffbcd5",
        "type": "github"
      },
      "original": {
@ -234,11 +234,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1707211557,
-        "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",
+        "lastModified": 1709410583,
+        "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",
+        "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
        "type": "github"
      },
      "original": {
@ -249,11 +249,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1707091808,
-        "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
+        "lastModified": 1709569716,
+        "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
+        "rev": "617579a787259b9a6419492eaac670a5f7663917",
        "type": "github"
      },
      "original": {
@ -266,11 +266,11 @@
    "nixpkgs-lib": {
      "locked": {
        "dir": "lib",
-        "lastModified": 1706550542,
-        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+        "lastModified": 1709237383,
+        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
        "type": "github"
      },
      "original": {
@ -393,11 +393,11 @@
    },
    "unstable": {
      "locked": {
-        "lastModified": 1707092692,
-        "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
+        "lastModified": 1709479366,
+        "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
+        "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -10,7 +10,7 @@
    unstable.url = "github:nixos/nixpkgs/nixos-unstable";
    master.url = "github:nixos/nixpkgs/master";

-    #fork.url = "github:teutat3s/nixpkgs/signal-desktop-6.42";
+    #fork.url = "github:teutat3s/nixpkgs/backport-droidcam";

    flake-compat.url = "github:edolstra/flake-compat";
    flake-compat.flake = false;
--- a/modules/desktop-extended/default.nix
+++ b/modules/desktop-extended/default.nix
@ -26,6 +26,7 @@ in {
    nix-tree
    nvd
    nixpkgs-review
+    nix-update
    nix-search-cli
  ];

--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@ -94,7 +94,7 @@ in {
      gnome.yelp
      hicolor-icon-theme
      keepassxc
-      qMasterPassword-wayland
+      qMasterPassword
      libnotify
      vlc
    ];
--- a/modules/graphical/sway/config/config.d/systemd.conf
+++ b/modules/graphical/sway/config/config.d/systemd.conf
@ -5,4 +5,5 @@
 # https://github.com/swaywm/sway/wiki/Systemd-integration
 # Also, import the most important environment variables into the D-Bus and systemd
 # user environments (e.g. required for screen sharing and Pinentry prompts):
-exec "systemctl --user import-environment; systemctl --user start sway-session.target; exec dbus-update-activation-environment --systemd $IMPORT_ENVIRONMENT_ENV_LIST DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemd-cat --identifier=sway sway"
+exec "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemctl --user start sway-session.target; dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP"
+exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@ -11,11 +11,23 @@
    "brscan5"
    "brscan5-etc-files"
    "facetimehd-firmware"
+    "nomad"
    "slack"
    "veracrypt"
    "zoom"
  ];

+  system.activationScripts.diff-closures = {
+    text =''
+      if [[ -e /run/current-system ]]; then
+        ${config.nix.package}/bin/nix store diff-closures \
+          /run/current-system "$systemConfig" \
+          --extra-experimental-features nix-command
+      fi
+    '';
+    supportsDryActivation = true;
+  };
+
  nix = {
    # Use default version alias for nix package
    package = pkgs.nix;
--- a/modules/terminal-life/bash/default.nix
+++ b/modules/terminal-life/bash/default.nix
@ -13,7 +13,7 @@ in {

  # Run when initializing a login shell
  profileExtra = ''
-    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
+    [ "$(tty)" = "/dev/tty1" ] && exec systemd-cat --identifier=sway ${pkgs.sway}/bin/sway
  '';

  # Run when initializing an interactive shell
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@ -47,6 +47,10 @@ in {
      watson
    ];

+    # Get completion for system packages
+    # https://nix-community.github.io/home-manager/options.xhtml#opt-programs.bash.enableCompletion
+    environment.pathsToLink = [ "/share/bash-completion" ];
+
    home-manager.users."${psCfg.user.name}" = {
      xdg.dataFile."scripts/base16.sh".source = .local/share/scripts/base16.sh;

--- a/modules/user/session-variables.nix
+++ b/modules/user/session-variables.nix
@ -99,21 +99,11 @@
    in
      BLK + CHR + DIR + EXE + REG + HARDLINK + SYMLINK + MISSING + ORPHAN + FIFO + SOCK + OTHER;
  };
-
-  envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;
-
-  # Here we merge an extra variable into the attrset called FULL_ENV_LIST.
-  # It's a list of the variable names defined above.
-  # We can use this to tell `systemctl import-environment` to import the full list above.
-  variablesWithMeta = lib.attrsets.zipAttrsWith (name: values: builtins.head values) [
-    variables
-    {IMPORT_ENVIRONMENT_ENV_LIST = lib.lists.foldl (a: b: a + " " + b) "IMPORT_ENVIRONMENT_ENV_LIST" envListNames;}
-  ];
 in {
-  home-manager.users."${psCfg.user.name}" = {
-    home.sessionVariables = variablesWithMeta;
-    systemd.user.sessionVariables = variablesWithMeta;
-  };
+  environment.variables = variables;

-  environment.variables = variablesWithMeta;
+  home-manager.users."${psCfg.user.name}" = {
+    home.sessionVariables = variables;
+    systemd.user.sessionVariables = variables;
+  };
 }
--- a/overlays/blesh.nix
+++ b/overlays/blesh.nix
@ -3,17 +3,33 @@ final: prev: {
    inherit (prev.sources.blesh-nvfetcher) version src;

    dontBuild = false;
-    buildInputs = [prev.git];
+    buildInputs = [
+      prev.gitMinimal
+    ];
+
    patchPhase = ''
      substituteInPlace GNUmakefile \
        --replace "git submodule update --init --recursive" ""
    '';
-    nativeCheckInputs = oldAttrs.nativeCheckInputs ++ [prev.busybox];
+
+    installFlags = [
+      "PREFIX=$(out)"
+    ];

    installPhase = ''
-      runHook preInstall
+      source $stdenv/setup
+      installPhase
+    '';

-      mkdir -p "$out/share/blesh/lib"
+    postInstall = ''
+      mkdir -p "$out/bin"
+      cat <<EOF >"$out/bin/blesh-share"
+      #!${prev.runtimeShell}
+      # Run this script to find the ble.sh shared folder
+      # where all the shell scripts are living.
+      echo "$out/share/blesh"
+      EOF
+      chmod +x "$out/bin/blesh-share"

      cat <<EOF >"$out/share/blesh/lib/_package.sh"
      _ble_base_package_type=nix
@ -23,10 +39,6 @@ final: prev: {
        return 1
      }
      EOF
-
-      make install INSDIR=$out/share/blesh
-
-      runHook postInstall
    '';
  });
 }
--- a/overlays/default.nix
+++ b/overlays/default.nix
@ -25,8 +25,6 @@
          {
            direnv = unstable.direnv;
            nix-direnv = unstable.nix-direnv;
-            qMasterPassword-wayland = unstable.qMasterPassword-wayland;
-            slack = unstable.slack;
            _1password = unstable._1password;
            _1password-cli = unstable._1password-cli;
            wlvncc = unstable.wlvncc;
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -14,7 +14,6 @@ with prev; {
  psos-docs = import ./psos-docs.nix final;
  s = writeShellScriptBin "s" (import ./s.nix final);
  sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
-  sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
  swaylock-bg = writeShellScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
  toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
  wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
--- a/pkgs/sway-service.nix
+++ b/pkgs/sway-service.nix
@ -1,7 +0,0 @@
-self:
-with self; ''
-  # first import environment variables from the login manager
-  systemctl --user import-environment;
-  # then start the service
-  exec systemctl --wait --user start sway.service
-''
--- a/users/teutat3s/home.nix
+++ b/users/teutat3s/home.nix
@ -72,7 +72,7 @@ in {
        ifmetric
        ipmitool
        #keybase-gui
-        nomad_1_4
+        nomad
        thunderbird
        vault
        veracrypt
@ -86,8 +86,49 @@ in {
        source ${config.age.secrets.environment-secrets.path}
        source ${flake.inputs.tritonshell.packages.${pkgs.system}.triton-utils}/bin/ttp.sh

+        _tailscale()
+        {
+        	local cur prev words cword
+        	_init_completion -n = || return
+
+        	if [[ $cword -eq 1 ]]; then
+        		SUBCOMMANDS=$(tailscale --help 2>&1 | awk '/SUBCOMMANDS/{ f = 1; next } /FLAGS/{ f = 0 } f{print $1}')
+        		SUBCOMMANDS="$SUBCOMMANDS debug"
+        		FLAGS="-h --help --socket"
+        		COMPREPLY=( $(compgen -W "$SUBCOMMANDS $FLAGS" -- "$cur" ))
+        		return
+        	else
+        		subcmd="''${COMP_WORDS[1]}"
+        		if [[ "$cur" = *=* ]]; then
+        			COMPREPLY=( $(compgen -W 'false' -- "''${cur#*=}") )
+        			return
+        		elif [[ "$cur" = -* ]]; then
+        			FLAGS=$(tailscale "$subcmd" --help 2>&1 | awk '/FLAGS/{ f = 1; next } f'  | grep -oE -- '--[^ ]+[=]?' | tr -d ',')
+        			FLAGS="$FLAGS --help"
+        			COMPREPLY=( $(compgen -W "$FLAGS" -- "$cur" ))
+        			return
+        		else
+        			case "$subcmd" in
+        				"ping"|"ssh")
+        					IP_AND_HOSTNAME=$(tailscale status 2>&1  | awk '{print $1"\n"$2}')
+        					COMPREPLY=( $(compgen -W "$IP_AND_HOSTNAME" -- "$cur" ))
+        				;;
+        				"debug")
+        					SUBCOMMANDS=""
+        					if [[ $cword -eq 2 ]]; then
+        						SUBCOMMANDS=$(tailscale "$subcmd" --help 2>&1 | awk '/SUBCOMMANDS/{ f = 1; next } /FLAGS/{ f = 0 } f{print $1}')
+        					fi
+        					FLAGS=$(tailscale "$subcmd" --help 2>&1 | awk '/FLAGS/{ f = 1; next } f'  | grep -oE -- '--[^ ]+[=]?' | tr -d ',')
+        					COMPREPLY=( $(compgen -W "$SUBCOMMANDS $FLAGS" -- "$cur" ))
+        				;;
+        			esac
+        		fi
+        	fi
+        }
+
+        complete -F _tailscale tailscale
        complete -C ${pkgs.consul}/bin/consul consul
-        complete -C ${pkgs.nomad_1_4}/bin/nomad nomad
+        complete -C ${pkgs.nomad}/bin/nomad nomad
        complete -C ${pkgs.vault}/bin/vault vault
        complete -C ${flake.inputs.nixos-22-05.legacyPackages.${pkgs.system}.terraform}/bin/terraform terraform
        complete -C ${pkgs.waypoint}/bin/waypoint waypoint
Author	SHA1	Message	Date
teutat3s	6891f77bd2	chore: bump flake inputs	2024-03-06 18:52:08 +01:00
teutat3s	270ef4f452	feat: add nix-update	2024-03-06 18:51:49 +01:00
teutat3s	b79ef12b4e	fix: add completion for tailscale	2024-03-06 18:51:29 +01:00
teutat3s	c3094c4b76	fix: use unfree nomad, add activation script to show closure diffs	2024-03-06 18:50:48 +01:00
teutat3s	f6c5fef2fe	bash: get completion for system packages	2024-03-06 18:47:35 +01:00
teutat3s	97a05c4456	fix: improve ble.sh build	2024-03-06 18:47:05 +01:00
teutat3s	9b48362f41	fix: use qMasterPassword, slack from nixos-23.11	2024-03-06 18:46:31 +01:00
teutat3s	82d88a3f23	Revert "fix: firefox uses wayland by default now, no more" This reverts commit `b0aa120073`.	2024-03-06 18:45:20 +01:00
teutat3s	fa7812b21f	feat: don't start sway as a systemd service	2024-03-06 18:42:25 +01:00
teutat3s	b0aa120073	fix: firefox uses wayland by default now, no more need to use firefox-wayland pkg	2024-02-08 17:44:11 +01:00
teutat3s	54ae646335	chore: bump flake.lock • Updated input 'master': 'github:nixos/nixpkgs/2d41313f3e332e69d663553e522aabededed91b0' (2024-02-07) → 'github:nixos/nixpkgs/7a473abcc9616edb0311ed0116ef79a3f7782998' (2024-02-08) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e' (2024-02-05) → 'github:nixos/nixpkgs/fb0c047e30b69696acc42e669d02452ca1b55755' (2024-02-06)	2024-02-08 16:36:25 +01:00